From 70286599d51e0abb5a43ba594384749da5b325e6 Mon Sep 17 00:00:00 2001
From: Ian Ross <iross@cadasta.org>
Date: Mon, 11 Jul 2016 23:35:27 +0200
Subject: [PATCH] Fix #331: display user name if no full name

---
 .../tests/test_views_default_organizations.py             | 1 +
 cadasta/templates/core/base.html                          | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cadasta/organization/tests/test_views_default_organizations.py b/cadasta/organization/tests/test_views_default_organizations.py
index 95bea3c2a..1e865389d 100644
--- a/cadasta/organization/tests/test_views_default_organizations.py
+++ b/cadasta/organization/tests/test_views_default_organizations.py
@@ -693,6 +693,7 @@ def test_get_with_authorized_user(self):
         context['organization'] = self.org
         context['form'] = forms.EditOrganizationMemberForm(
             None, self.org, self.member)
+        context['user'] = self.member
 
         expected = render_to_string(
             'organization/organization_members_edit.html',
diff --git a/cadasta/templates/core/base.html b/cadasta/templates/core/base.html
index 250cce56f..7b2f935ec 100644
--- a/cadasta/templates/core/base.html
+++ b/cadasta/templates/core/base.html
@@ -37,7 +37,13 @@
               <button type="button" class="btn btn-user dropdown-toggle" data-toggle="dropdown"
               aria-haspopup="true" aria-expanded="false">
                 <img src="/static/img/avatar.jpg" class="avatar thumbnail">
-                <span class="visible-sm-inline visible-md-inline visible-lg-inline">{{ user.full_name }}</span>
+                <span class="visible-sm-inline visible-md-inline visible-lg-inline">
+                  {% if user.full_name %}
+                  {{ user.full_name }}
+                  {% else %}
+                  {{ user.username }}
+                  {% endif %}
+                </span>
                 <span class="caret"></span>
               </button>
               <ul class="dropdown-menu">