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

Remove redundant keyword for the SupportView class

Browse Source
This commit is contained in:
Oskar Hahn 2012-10-25 10:25:59 +02:00
parent 2e41dcdefe
commit 1002ecc6e6
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/motion/urls.py
View File

@ -99,12 +99,12 @@ urlpatterns = patterns('openslides.motion.views',
),
url(r'^(?P<motion_id>\d+)/support/$',
SupportView.as_view(unsupport=False, answer_url='support/'),
SupportView.as_view(support=True),
name='motion_support',
),
url(r'^(?P<motion_id>\d+)/unsupport/$',
SupportView.as_view(unsupport=True, answer_url='unsupport/'),
SupportView.as_view(support=False),
name='motion_unsupport',
),

18
openslides/motion/views.py
View File

@ -371,11 +371,10 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
permission_required = 'motion.can_support_motion'
model = Motion
pk_url_kwarg = 'motion_id'
unsupport = False # Must be given in SupportView.as_view()
answer_url = None # Must be given in SupportView.as_view()
support = True
def get_question(self):
if not self.unsupport:
if self.support:
return _('Do you really want to support this motion?')
else:
return _('Do you really want to unsupport this motion?')
@ -385,7 +384,7 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
allowed_actions = motion.get_allowed_actions(request.user)
if not self.get_answer().lower() == 'yes':
return
if not self.unsupport:
if self.support:
if 'support' in allowed_actions:
motion.support(person=request.user)
messages.success(
@ -405,12 +404,19 @@ class SupportView(SingleObjectMixin, QuestionMixin, RedirectView):
else:
messages.error(
request,
_('You can not support this motion.'))
_('You can not unsupport this motion.'))
def get_redirect_url(self, **kwargs):
return reverse('motion_view', args=[kwargs[self.pk_url_kwarg]])
def get_answer_url(self):
if self.support:
answer_url = 'motion_support'
else:
answer_url = 'motion_unsupport'
return reverse(answer_url, args=[self.kwargs[self.pk_url_kwarg]])
@permission_required('motion.can_manage_motion')
@template('motion/view.html')
def gen_poll(request, motion_id):