From 403dd2d662056eb2c7400eb6cacc873f0930af51 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Sun, 26 Feb 2017 03:28:16 +0100
Subject: [PATCH] Make todos internal
---
parser.py | 10 ++++++++++
server.py | 2 +-
templates/layout.html | 2 ++
templates/protocol-show.html | 2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/parser.py b/parser.py
index edebf90..ec8dd56 100644
--- a/parser.py
+++ b/parser.py
@@ -193,16 +193,24 @@ class Tag:
if self.name == "url":
return r"\url{{{}}}".format(self.values[0])
elif self.name == "todo":
+ if not show_private:
+ return ""
return self.todo.render_latex(current_protocol=protocol)
return r"\textbf{{{}:}} {}".format(escape_tex(self.name.capitalize()), escape_tex(self.values[0]))
elif render_type == RenderType.plaintext:
if self.name == "url":
return self.values[0]
+ elif self.name == "todo":
+ if not show_private:
+ return ""
+ return self.values[0]
return "{}: {}".format(self.name.capitalize(), self.values[0])
elif render_type == RenderType.wikitext:
if self.name == "url":
return "[{0} {0}]".format(self.values[0])
elif self.name == "todo":
+ if not show_private:
+ return ""
return self.todo.render_wikitext(current_protocol=protocol)
return "'''{}:''' {}".format(self.name.capitalize(), self.values[0])
else:
@@ -303,6 +311,8 @@ class Fork(Element):
def render(self, render_type, show_private, level, protocol=None):
name_line = self.name if self.name is not None and len(self.name) > 0 else ""
+ if level == 0 and self.name == "Todos" and not show_private:
+ return ""
if render_type == RenderType.latex:
begin_line = r"\begin{itemize}"
end_line = r"\end{itemize}"
diff --git a/server.py b/server.py
index 827e063..029eeda 100755
--- a/server.py
+++ b/server.py
@@ -687,8 +687,8 @@ def _get_page():
return 0
@app.route("/todos/list")
+@login_required
def list_todos():
- is_logged_in = check_login()
user = current_user()
protocoltype = None
protocoltype_id = None
diff --git a/templates/layout.html b/templates/layout.html
index 57520e3..d06902a 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -30,7 +30,9 @@
<li><a href="{{url_for("new_protocol")}}">Neues Protokoll</a></li>
{% endif %}
<li><a href="{{url_for("list_protocols")}}">Protokolle</a></li>
+ {% if check_login() %}
<li><a href="{{url_for("list_todos")}}">Todos</a></li>
+ {% endif %}
<li><a href="{{url_for("list_decisions")}}">Beschlüsse</a></li>
{% if check_login() %}
<li><a href="{{url_for("list_types")}}">Typen</a></li>
diff --git a/templates/protocol-show.html b/templates/protocol-show.html
index af65a7b..d9f7586 100644
--- a/templates/protocol-show.html
+++ b/templates/protocol-show.html
@@ -68,7 +68,7 @@
{% endif %}
</div>
<div id="right-column" class="col-lg-6">
- {% if protocol.is_done() %}
+ {% if protocol.is_done() and has_public_view_right and logged_in %}
<h3>Todos dieser Sitzung <a href="{{url_for("list_todos")}}">Aktuelle Todos</a></h3>
<ul>
{% if protocol.get_originating_todos()|length > 0 %}
--
GitLab