From 97e16e9ef27230305bd7b415ee106d5e4d14977b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 1 Nov 2017 20:44:17 +0100 Subject: [PATCH 1/2] navionics loaded over https --- rowers/tests.py | 9 +++++++++ templates/basebase.html | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/rowers/tests.py b/rowers/tests.py index 96b2bb91..b481c5a1 100644 --- a/rowers/tests.py +++ b/rowers/tests.py @@ -29,6 +29,8 @@ from rowers.views import error500_view,error404_view,error400_view,error403_view from dataprep import delete_strokedata +from redis import StrictRedis +redis_connection = StrictRedis() @@ -299,6 +301,7 @@ class TestErrorPages(TestCase): class NewUserRegistrationTest(TestCase): def setUp(self): self.c = Client() + redis_connection.publish('tasks','KILL') def test_newuser(self): form_data = { @@ -323,6 +326,7 @@ class NewUserRegistrationTest(TestCase): class WorkoutTests(TestCase): def setUp(self): + redis_connection.publish('tasks','KILL') u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') @@ -342,6 +346,7 @@ class WorkoutTests(TestCase): class C2Tests(TestCase): def setUp(self): + redis_connection.publish('tasks','KILL') self.u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') @@ -359,6 +364,7 @@ class C2Tests(TestCase): class DataTest(TestCase): def setUp(self): + redis_connection.publish('tasks','KILL') u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') @@ -538,6 +544,7 @@ class DataTest(TestCase): class ViewTest(TestCase): def setUp(self): + redis_connection.publish('tasks','KILL') self.c = Client() self.u = User.objects.create_user('john', 'sander@ds.ds', @@ -1205,6 +1212,7 @@ class ViewTest(TestCase): class subroutinetests(TestCase): def setUp(self): + redis_connection.publish('tasks','KILL') u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') @@ -1229,6 +1237,7 @@ class subroutinetests(TestCase): class PlotTests(TestCase): def setUp(self): + redis_connection.publish('tasks','KILL') u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') diff --git a/templates/basebase.html b/templates/basebase.html index e072a4cb..6fe7b455 100644 --- a/templates/basebase.html +++ b/templates/basebase.html @@ -80,8 +80,8 @@ var current = null; js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.10&appId=694685920739849"; fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); - - + + {% analytical_head_bottom %} - + {% analytical_body_top %} {% block body_top %}{% endblock %}
From fbc8b4c5306845c75c934aa600f506698e0d9184 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 1 Nov 2017 21:02:25 +0100 Subject: [PATCH 2/2] https --- templates/basebase.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/basebase.html b/templates/basebase.html index 6fe7b455..ce7c99a0 100644 --- a/templates/basebase.html +++ b/templates/basebase.html @@ -101,7 +101,7 @@ var current = null; }(document, "script", "twitter-wjs")); {% analytical_head_bottom %} - + {% analytical_body_top %} {% block body_top %}{% endblock %}