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

Merge branch 'new_motion'

Browse Source
This commit is contained in:
Oskar Hahn 2013-02-06 11:12:24 +01:00
commit e0a68c4fe0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openslides/motion/models.py
View File

@ -121,7 +121,7 @@ class Motion(SlideMixin, models.Model):
else: else:
new_data = False new_data = False
need_new_version = config['motion_create_new_version'] == 'ALLWASY_CREATE_NEW_VERSION' need_new_version = config['motion_create_new_version'] == 'ALLWASY_CREATE_NEW_VERSION' # TODO: Tippfehler
if hasattr(self, '_new_version') or (new_data and need_new_version): if hasattr(self, '_new_version') or (new_data and need_new_version):
version = self.new_version version = self.new_version
del self._new_version del self._new_version
@ -374,7 +374,7 @@ class Motion(SlideMixin, models.Model):
def get_agenda_title(self): def get_agenda_title(self):
"""Return a title for the Agenda.""" """Return a title for the Agenda."""
return self.last_version.title return self.last_version.title # TODO: nutze active_version
## def get_agenda_title_supplement(self): ## def get_agenda_title_supplement(self):
## number = self.number or '<i>[%s]</i>' % ugettext('no number') ## number = self.number or '<i>[%s]</i>' % ugettext('no number')
@ -410,7 +410,7 @@ class Motion(SlideMixin, models.Model):
} }
actions['delete'] = actions['edit'] # TODO: Only if the motion has no number actions['delete'] = actions['edit'] # TODO: Only if the motion has no number
actions['unsupport'] = actions['support'] actions['unsupport'] = actions['support']
actions['reset_state'] = 'change_state' actions['reset_state'] = actions['change_state']
return actions return actions
def write_log(self, message, person=None): def write_log(self, message, person=None):
@ -553,7 +553,7 @@ class MotionLog(models.Model):
motion = models.ForeignKey(Motion, related_name='log_messages') motion = models.ForeignKey(Motion, related_name='log_messages')
"""The motion to witch the object belongs.""" """The motion to witch the object belongs."""
message = models.CharField(max_length=255) message = models.CharField(max_length=255) # TODO: arguments in message, not translatable
"""The log message. """The log message.
Should be in english. Should be in english.

4
openslides/motion/views.py
View File

@ -195,7 +195,7 @@ class VersionPermitView(GetVersionMixin, SingleObjectMixin, QuestionMixin, Redir
def case_yes(self): def case_yes(self):
"""Activate the version, if the user chooses 'yes'.""" """Activate the version, if the user chooses 'yes'."""
self.object.activate_version(self.object.version) self.object.activate_version(self.object.version) # TODO: Write log message
self.object.save() self.object.save()
version_permit = VersionPermitView.as_view() version_permit = VersionPermitView.as_view()
@ -221,7 +221,7 @@ class VersionRejectView(GetVersionMixin, SingleObjectMixin, QuestionMixin, Redir
def case_yes(self): def case_yes(self):
"""Reject the version, if the user chooses 'yes'.""" """Reject the version, if the user chooses 'yes'."""
self.object.reject_version(self.object.version) self.object.reject_version(self.object.version) # TODO: Write log message
self.object.save() self.object.save()
version_reject = VersionRejectView.as_view() version_reject = VersionRejectView.as_view()

2
openslides/motion/workflow.py
View File

@ -45,7 +45,7 @@ class State(object):
self.create_poll = create_poll self.create_poll = create_poll
self.support = support self.support = support
self.edit_as_submitter = edit_as_submitter self.edit_as_submitter = edit_as_submitter
self.version_permission = version_permission self.version_permission = version_permission # Rename to auto_activate_version
def __unicode__(self): def __unicode__(self):
"""Return the name of the state.""" """Return the name of the state."""