From 5c70b4a044e27771883b89e30c2139e414452b11 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 11 Mar 2013 16:56:56 +0100 Subject: [PATCH] Update after comments: Removed user context var. Removed condition in unupport state check. --- openslides/motion/models.py | 1 - openslides/motion/templates/motion/motion_detail.html | 2 +- openslides/motion/views.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/openslides/motion/models.py b/openslides/motion/models.py index b5b6a1303..f6479c22e 100644 --- a/openslides/motion/models.py +++ b/openslides/motion/models.py @@ -394,7 +394,6 @@ class Motion(SlideMixin, models.Model): not self.is_supporter(person)), 'unsupport': (self.state.allow_support and - config['motion_min_supporters'] > 0 and not self.is_submitter(person) and self.is_supporter(person)), diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html index a82796a36..a9de961b6 100644 --- a/openslides/motion/templates/motion/motion_detail.html +++ b/openslides/motion/templates/motion/motion_detail.html @@ -253,7 +253,7 @@ {{ motion.version.creation_time }} - {% if allowed_actions.wit and user in motion.submitters %} + {% if allowed_actions.wit and user in motion.submitters %}

{% trans 'Withdraw motion' %} diff --git a/openslides/motion/views.py b/openslides/motion/views.py index 7ac10ba4d..808e91a7e 100644 --- a/openslides/motion/views.py +++ b/openslides/motion/views.py @@ -75,7 +75,6 @@ class MotionDetailView(GetVersionMixin, DetailView): context = super(MotionDetailView, self).get_context_data(**kwargs) context['allowed_actions'] = self.object.get_allowed_actions(self.request.user) context['min_supporters'] = int(config['motion_min_supporters']) - context['user'] = self.request.user return context motion_detail = MotionDetailView.as_view()