Commit 08c93906 authored by Robin Sonnabend's avatar Robin Sonnabend
Browse files

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

parents 3375ec28 75e36eb0
......@@ -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))
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment