From c34b407945405b3e0d1985f9611ce19ac75cf8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 19 Nov 2013 01:26:39 +0100 Subject: [PATCH] Fix templatetag, #1077. --- fabfile.py | 2 +- openslides/core/templatetags/tags.py | 12 ++++++------ tests/motion/test_views.py | 8 ++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/fabfile.py b/fabfile.py index 8cb5cdf66..916de3be6 100644 --- a/fabfile.py +++ b/fabfile.py @@ -25,7 +25,7 @@ def coverage_report_plain(): Runs all tests and prints the coverage report. """ test() - local('coverage report -m --fail-under=73') + local('coverage report -m --fail-under=75') def coverage(): diff --git a/openslides/core/templatetags/tags.py b/openslides/core/templatetags/tags.py index 1719bad68..a0e4d05d3 100644 --- a/openslides/core/templatetags/tags.py +++ b/openslides/core/templatetags/tags.py @@ -44,13 +44,13 @@ def absolute_url(model, link=None): Example: {{ motion|absolute_url:'delete' }} """ - if link is None: - url = model.get_absolute_url() - else: - try: + try: + if link is None: + url = model.get_absolute_url() + else: url = model.get_absolute_url(link) - except ValueError: - url = '' + except ValueError: + url = '' return url diff --git a/tests/motion/test_views.py b/tests/motion/test_views.py index 3876ec86d..4b9b1de3c 100644 --- a/tests/motion/test_views.py +++ b/tests/motion/test_views.py @@ -91,6 +91,14 @@ class TestMotionDetailView(MotionViewTestCase): response = self.staff_client.get('/motion/1/') self.assertContains(response, '100.00 %') + def test_deleted_supporter(self): + config['motion_min_supporters'] = 1 + self.motion1.support(self.registered) + self.assertContains(self.admin_client.get('/motion/1/'), 'registered') + self.registered.delete() + self.assertNotContains(self.admin_client.get('/motion/1/'), 'registered') + self.assertContains(self.admin_client.get('/motion/1/'), 'empty') + class TestMotionDetailVersionView(MotionViewTestCase): def test_get(self):