From 043233f79e0a3dd5c153c64be347bf43abfa44e5 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Mon, 6 Jun 2016 05:15:37 -0400
Subject: [PATCH] The UserEditView view add the "user" context variable and
 confuses the base.html template. Update the base template to use
 *request.user* instead of just *user* to access the currently logged user.
 GitLab issue #295.

---
 mayan/apps/appearance/templates/appearance/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html
index 6f09a6b7da..ad81f8e801 100644
--- a/mayan/apps/appearance/templates/appearance/base.html
+++ b/mayan/apps/appearance/templates/appearance/base.html
@@ -68,10 +68,10 @@
                             {% endfor %}
                         </ul>
                         <ul class="nav navbar-nav navbar-right">
-                            {% if not user.is_authenticated %}
+                            {% if not request.user.is_authenticated %}
                                 {% trans 'Anonymous' %}
                             {% else %}
-                                <li><a href="{% url 'common:current_user_details' %}" title="{% trans 'User details' %}">{{ user.get_full_name|default:user }} <i class="fa fa-user"></i></a></li>
+                                <li><a href="{% url 'common:current_user_details' %}" title="{% trans 'User details' %}">{{ request.user.get_full_name|default:request.user }} <i class="fa fa-user"></i></a></li>
                             {% endif %}
                         </ul>
                     </div>