talk: Make diagnosis page available for admins only

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/templates/modules/menu.html b/templates/modules/menu.html
index deba533980419a0bc32c78af39c906ac9d48e76a..35735cf994b27c87cce59a9023fcd7eb2f7d1ce2 100644 (file)
--- a/templates/modules/menu.html
+++ b/templates/modules/menu.html
@@ -62,9 +62,11 @@
                        </a>
                </li>
 
-               <li>
-                       <a href="/diagnosis">{{ _("Diagnosis") }}</a>
-               </li>
+               {% if current_user.is_admin() %}
+                       <li>
+                               <a href="/diagnosis">{{ _("Diagnosis") }}</a>
+                       </li>
+               {% end %}
        {% end %}
 </ul>
 

diff --git a/templates/talk/diagnosis.html b/templates/talk/diagnosis.html
index 2a5486d308deddcd27ca3445429149136f47bd92..dc7ea86e5da6adc4de45457ded3379791cdc2976 100644 (file)
--- a/templates/talk/diagnosis.html
+++ b/templates/talk/diagnosis.html
@@ -7,29 +7,7 @@
                <h2>{{ _("Diagnosis") }}</h2>
        </div>
 
-       <section id="test-call">
-               <h3>{{ _("Test Call") }}</h3>
+       {% module TalkOngoingCalls() %}
 
-               <ul class="list-unstyled">
-                       <li>
-                               <span class="glyphicon glyphicon-earphone text-success"></span>
-                               <a href="/call/991">991<span class="text-muted">@ipfire.org</span></a>
-                               - {{ _("Echo Test") }}
-                       </li>
-
-                       <li>
-                               <span class="glyphicon glyphicon-earphone text-success"></span>
-                               <a href="/call/992">992<span class="text-muted">@ipfire.org</span></a>
-                               - {{ _("A music playing service") }}
-                       </li>
-               </ul>
-       </section>
-
-       {% if current_user.is_admin() %}
-               {% module TalkOngoingCalls() %}
-
-               <section id="lines">
-                       {% module TalkLines(show_account=True) %}
-               </section>
-       {% end %}
+       {% module TalkLines(show_account=True) %}
 {% end block %}

diff --git a/webapp/handlers_talk.py b/webapp/handlers_talk.py
index ece823b0a508a53e923c8ba6cae1bbc0db06435c..89486bdf3c4999c336f403a851ca377fbb522a55 100644 (file)
--- a/webapp/handlers_talk.py
+++ b/webapp/handlers_talk.py
@@ -35,6 +35,10 @@ class TalkPhonebookAccountHandler(BaseHandler):
 class TalkDiagnosisHandler(BaseHandler):
        @tornado.web.authenticated
        def get(self):
+                # Access only allowed for admins
+                if not self.current_user.is_admin():
+                        raise tornado.web.HTTPError(403)
+
                return self.render("talk/diagnosis.html")