Merge branch 'master' into bugfix/orglogo

Cadasta · Jul 12, 2016 · f1c1936 · f1c1936
2 parents 143e299 + 61a1419
commit f1c1936
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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">