Merge branch 'master' into calendar

Author: patriknordlen

.travis.yml

@@ -56,8 +56,8 @@ notifications:
   slack:
     rooms:
       secure: nPXwHnPcf37yGkCkLimx5UmY9LTtOHL0lw88cAQeXCNNjeZuhS2jS5xGUOwwp3SrsYE4tZhD0WuVEHGDcyIhmBZh9Qqk3NHKz+tQDD/e0GE/8uTTfR1Eh+pq1YOIcLYzzKA2khmJSeHqqDriVZZoWpn67oHtrui9FYesapZ8AX0=
-    on_success: change
-    on_failure: always
+    on_success: never
+    on_failure: never
     on_start: never
 addons:
   firefox: "45.0"

docs/upgrading.rst

@@ -71,3 +71,27 @@ The following needs to be added to settings.py: ::
     ]
 
 Once all these steps are completed your installation of DefectDojo will be running under Django 1.11
+
+
+July 6th 2017 - New location for system settings
+================================================
+
+Pull request #313 moves a number of system settings previously located in the application's settings.py
+to a model that can be used and changed within the web application under "Configuration -> System Settings". 
+
+If you're using a custom ``URL_PREFIX`` you will need to set this in the model after upgrading by
+editing ``dojo/fixtures/system_settings.json`` and setting your URL prefix in the ``url_prefix`` value there. 
+Then issue the command ``./manage.py loaddata system_settings.json`` to load your settings into the database.
+
+If you're not using a custom ``URL_PREFIX``, after upgrading simply go to the System Settings page and review
+which values you want to set for each setting, as they're not automatically migrated from settings.py. 
+
+If you like you can then remove the following settings from settings.py to avoid confusion:
+
+* ``ENABLE_DEDUPLICATION``
+* ``ENABLE_JIRA``
+* ``S_FINDING_SEVERITY_NAMING``
+* ``URL_PREFIX``
+* ``TIME_ZONE``
+* ``TEAM_NAME``
+

dojo/templates/dojo/closed_findings.html

@@ -46,7 +46,7 @@ <h3 class="has-filters">
                                 <td class="">{{ finding.mitigated.date }}</td>
                                 <td>{{ finding.age }}</td>
                                 <td>
-                                    <p class="label severity severity-{{ finding.severity|safe }}">
+                                    <p class="label severity severity-{{ finding.severity }}">
                                         {{ finding.severity_display }}
                                     </p>
                                 </td>

dojo/templates/dojo/view_eng.html

@@ -650,7 +650,7 @@ <h4> Findings</h4>
                                 <tr class="{% if finding.active %}active_finding{% else %}inactive_finding{% endif %}">
                                     <td><a href="{% url 'view_finding' finding.id %}">{{ finding.title }}</a></td>
                                     <td>
-                                        <span class="label severity severity-{{ finding.severity|safe }}">
+                                        <span class="label severity severity-{{ finding.severity }}">
                                             {{ finding.severity_display }}
                                         </span>
                                     </td>

dojo/templates/dojo/view_test.html

@@ -242,7 +242,7 @@ <h4 class="pull-left"> Findings &nbsp;&nbsp;</h4>
                         <td>{{ finding.reporter.username }}</td>
                         <td>{{ finding.mitigated }}</td>
                         <td>
-                            <span class="label severity severity-{{ finding.severity|safe }}">
+                            <span class="label severity severity-{{ finding.severity }}">
                                 {{ finding.severity_display }}
                             </span>
                         </td>

dojo/urls.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.conf.urls import include, url
+from django.conf.urls.static import static
 from django.contrib import admin
 from tastypie.api import Api
 
@@ -100,8 +101,5 @@
     url(r'^%s' % get_system_setting('url_prefix'), include(ur)),
 ]
 
-
-# if settings.DEBUG:
-#     urlpatterns += patterns('django.views.static',
-#                             (r'media/(?P<path>.*)', 'serve', {
-#                                 'document_root': settings.MEDIA_ROOT}))
+if settings.DEBUG:
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)