ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update after comments: Removed user context var. Removed condition in unupport state check.

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-03-11 16:56:56 +01:00
parent ee0e599a6c
commit 5c70b4a044
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/motion/models.py
View File

@ -394,7 +394,6 @@ class Motion(SlideMixin, models.Model):
not self.is_supporter(person)), not self.is_supporter(person)),
'unsupport': (self.state.allow_support and 'unsupport': (self.state.allow_support and
config['motion_min_supporters'] > 0 and
not self.is_submitter(person) and not self.is_submitter(person) and
self.is_supporter(person)), self.is_supporter(person)),

2
openslides/motion/templates/motion/motion_detail.html
View File

@ -253,7 +253,7 @@
{{ motion.version.creation_time }} {{ motion.version.creation_time }}
<!-- Widthdraw button --> <!-- Widthdraw button -->
{% if allowed_actions.wit and user in motion.submitters %} {% if allowed_actions.wit and user in motion.submitters %}
<br><br> <br><br>
<a href="{% url 'motion_set_state' motion.id 'wit' %}" class="btn"> <a href="{% url 'motion_set_state' motion.id 'wit' %}" class="btn">
<span class="icon revert">{% trans 'Withdraw motion' %}</span> <span class="icon revert">{% trans 'Withdraw motion' %}</span>

1
openslides/motion/views.py
View File

@ -75,7 +75,6 @@ class MotionDetailView(GetVersionMixin, DetailView):
context = super(MotionDetailView, self).get_context_data(**kwargs) context = super(MotionDetailView, self).get_context_data(**kwargs)
context['allowed_actions'] = self.object.get_allowed_actions(self.request.user) context['allowed_actions'] = self.object.get_allowed_actions(self.request.user)
context['min_supporters'] = int(config['motion_min_supporters']) context['min_supporters'] = int(config['motion_min_supporters'])
context['user'] = self.request.user
return context return context
motion_detail = MotionDetailView.as_view() motion_detail = MotionDetailView.as_view()