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

Merge remote branch 'upstream/master'

Browse Source 
Conflicts:
	openslides/motion/models.py
This commit is contained in:
Emanuel Schuetze 2013-03-11 19:16:16 +01:00
commit 1b93cec209
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/motion/models.py
View File

@ -394,8 +394,8 @@ 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
not self.is_submitter(person) and not self.is_submitter(person) and
self.is_supporter(person)), self.is_supporter(person)),
'change_state': person.has_perm('motion.can_manage_motion'), 'change_state': person.has_perm('motion.can_manage_motion'),