From 3a8e85bc2abfe38262ecc9a94b605d791e43cc6b Mon Sep 17 00:00:00 2001
From: Vanderhaegen Cedrik <cedrik.vanderhaegen@geosolutions.be>
Date: Wed, 4 Mar 2015 14:26:12 +0100
Subject: [PATCH] refactor code so userid is not requested when not logged in

---
 pyoes/templates/pyoes/header.jinja2 | 35 ++++++++++++++---------------
 pyoes/templates/pyoes/layout.jinja2 |  1 -
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/pyoes/templates/pyoes/header.jinja2 b/pyoes/templates/pyoes/header.jinja2
index b47a44bb..5dd3f883 100644
--- a/pyoes/templates/pyoes/header.jinja2
+++ b/pyoes/templates/pyoes/header.jinja2
@@ -69,29 +69,28 @@
 
       {% set login_nav = login_nav|default(default_login_nav) -%}
       {% set login_sub_nav = login_sub_nav|default(default_login_sub_nav) -%}
-      {% set login_user = login_user|default(request.user.userid) -%}
 
-      {% if not request.user %}
-      <ul class="right">
-           {% for caption, href in login_nav %}
-            <li><a href="{{ href }}">{{ caption }}</a></li>
-           {% endfor %}
-      </ul>
-
-      {% else %}
-      <ul class="right">
-        {% if not login_user == ' ' %}
-        <li class="has-dropdown">
-            <a href="#">{{ login_user }}</a>
-            <ul class="dropdown">
-               {% for caption, href in login_sub_nav %}
+      {% if login_nav|length > 0 %}
+        {% if not request.user %}
+          <ul class="right">
+               {% for caption, href in login_nav %}
                 <li><a href="{{ href }}">{{ caption }}</a></li>
                {% endfor %}
-            </ul>
-        </li>
+          </ul>
+        {% else %}
+          <ul class="right">
+            <li class="has-dropdown">
+              <a href="#">{{ request.user.userid }}</a>
+              <ul class="dropdown">
+                 {% for caption, href in login_sub_nav %}
+                  <li><a href="{{ href }}">{{ caption }}</a></li>
+                 {% endfor %}
+              </ul>
+            </li>
+          </ul>
         {% endif %}
-      </ul>
       {% endif %}
+
     </section>
   </nav>
 {% endblock %}
diff --git a/pyoes/templates/pyoes/layout.jinja2 b/pyoes/templates/pyoes/layout.jinja2
index 349f96f0..35bea5fb 100644
--- a/pyoes/templates/pyoes/layout.jinja2
+++ b/pyoes/templates/pyoes/layout.jinja2
@@ -11,7 +11,6 @@
 {% set login_sub_nav = login_sub_nav -%}
 {% set service_nav = service_nav -%}
 {% set home_link = home_link -%}
-{% set login_user = login_user -%}
 
 {% set default_footer_nav = [
 	('Toegankelijkheid', '/toegankelijkheid'),