Merge branch 'master' of git.fsmpi.rwth-aachen.de:protokollsystem/proto3

models/database.py

@@ -610,7 +610,7 @@ class Todo(DatabaseModel):
     def render_template(self):
         parts = ["todo", self.who, self.description, self.state.get_name()]
         if self.state.needs_date():
-            parts.append(date_filter(self.state))
+            parts.append(date_filter(self.date))
         parts.append("id {}".format(self.get_id()))
         return "[{}]".format(";".join(parts))
 

views/tables.py

@@ -371,7 +371,7 @@ class DecisionsTable(Table):
         return [
             Table.link(url_for("show_protocol", protocol_id=decision.protocol.id), decision.protocol.get_identifier()),
             decision.content,
-            Table.link(url_for("print_decision", document_id=decision.document.id), "Drucken")
+            Table.link(url_for("print_decision", decisiondocument_id=decision.document.id), "Drucken")
                 if config.PRINTING_ACTIVE
                 and decision.protocol.protocoltype.has_modify_right(user)
                 and decision.document is not None