Merge branch 'new_motion'

openslides/motion/models.py

@@ -121,7 +121,7 @@ class Motion(SlideMixin, models.Model):
         else:
             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):
             version = self.new_version
             del self._new_version
@@ -374,7 +374,7 @@ class Motion(SlideMixin, models.Model):
 
     def get_agenda_title(self):
         """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):
         ## 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['unsupport'] = actions['support']
-        actions['reset_state'] = 'change_state'
+        actions['reset_state'] = actions['change_state']
         return actions
 
     def write_log(self, message, person=None):
@@ -553,7 +553,7 @@ class MotionLog(models.Model):
     motion = models.ForeignKey(Motion, related_name='log_messages')
     """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.
 
     Should be in english.

openslides/motion/views.py

@@ -195,7 +195,7 @@ class VersionPermitView(GetVersionMixin, SingleObjectMixin, QuestionMixin, Redir
 
     def case_yes(self):
         """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()
 
 version_permit = VersionPermitView.as_view()
@@ -221,7 +221,7 @@ class VersionRejectView(GetVersionMixin, SingleObjectMixin, QuestionMixin, Redir
 
     def case_yes(self):
         """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()
 
 version_reject = VersionRejectView.as_view()

openslides/motion/workflow.py

@@ -45,7 +45,7 @@ class State(object):
         self.create_poll = create_poll
         self.support = support
         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):
         """Return the name of the state."""