Merge pull request tobami#267 from tobami/use-newer-middleware-settings

Use newer middleware settings

Author: tobami

codespeed/templates/codespeed/base.html

@@ -51,6 +51,6 @@ <h2>{% block page_title %}SPEED CENTER{% endblock page_title %}</h2>
 
   <script type="text/javascript" src="{% static 'js/jquery-1.12.3.min.js' %}"></script>
   <script type="text/javascript" src="{% static 'js/codespeed.js' %}"></script>
-  {% block extra_body %}{% endblock %}
+  {% block extra_script %}{% endblock %}
 </body>
 </html>

codespeed/templates/codespeed/changes.html

@@ -65,7 +65,7 @@
 </div>
 {% endblock %}
 
-{% block extra_body %}
+{% block extra_script %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'js/jquery.tablesorter.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/changes.js' %}"></script>

codespeed/templates/codespeed/comparison.html

@@ -80,7 +80,7 @@
 </div>
 {% endblock %}
 
-{% block extra_body %}
+{% block extra_script %}
 {{ block.super }}
 <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="{% static 'js/jqplot/excanvas.min.js' %}"></script><![endif]-->
 <script type="text/javascript" src="{% static 'js/jqplot/jquery.jqplot.min.js' %}"></script>

codespeed/templates/codespeed/timeline.html

@@ -106,7 +106,7 @@
 </div>
 {% endblock %}
 
-{% block extra_body %}
+{% block extra_script %}
 {{ block.super }}
 <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="{% static 'js/jqplot/excanvas.min.js' %}"></script><![endif]-->
 <script type="text/javascript" src="{% static 'js/jquery.address-1.6.min.js' %}?autoUpdate=0"></script>

codespeed/views.py

@@ -678,7 +678,7 @@ def changes(request):
     for proj in Project.objects.filter(track=True):
         executables[proj] = Executable.objects.filter(project=proj)
         projectlist.append(proj)
-        branch = Branch.objects.filter(name=proj.default_branch, project=proj)
+        branch = Branch.objects.get(name=proj.default_branch, project=proj)
         revisionlists[proj.name] = list(Revision.objects.filter(
             branch=branch
         ).order_by('-date')[:revlimit])

sample_project/settings.py

@@ -39,7 +39,7 @@
 SECRET_KEY = 'as%n_m#)^vee2pe91^^@c))sl7^c6t-9r8n)_69%)2yt+(la2&'
 
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

sample_project/templates/home.html

@@ -28,19 +28,14 @@ <h2>Comparison</h2>
 </div>
 {% endblock body %}
 
-{% block extra_body %}
+{% block extra_script %}
 {{ block.super }}
 <script type="text/javascript">
-    function permalinkToChanges(permalink) {
-        window.location=permalink;
-    }
-
-    function updateTable() {
+    function updateReportTables() {
         //Add permalink events to table rows
         $("div#reports table tbody tr").each(function() {
             $(this).click(function () {
-                permalink_string = $(this).find("td:eq(0) label").text();
-                permalinkToChanges(permalink_string);
+                window.location = $(this).find("td:eq(0) label").text();
             });
         });
         //Add hover effect to rows
@@ -53,7 +48,7 @@ <h2>Comparison</h2>
 
     $(function() {
         $("#reports").html(getLoadText("Loading...", 0))
-            .load("{% url "reports" %}", function(responseText) { updateTable(); });
-  });
+            .load("{% url "reports" %}", function(responseText) { updateReportTables(); });
+    });
 </script>
 {% endblock %}