Display 'active_user' in Group/User dropdown. Closes #8873

will-moore · May 21, 2012 · cce24c9 · cce24c9
1 parent 5cce462
commit cce24c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...ls/OmeroWeb/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown.html b/...ls/OmeroWeb/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown.html
@@ -60,7 +60,7 @@
                     src="{% static "webclient/image/personal16.png" %}"
                 {% endif %}
             {% endif %} />
-			<span>{{ active_group.name }}</span><span>{{ ome.user.getFullName }}</span>
+			<span>{{ active_group.name }}</span><span>{{ active_user.getFullName }}</span>
         </div>
 
         <ul id="groupList" class="sub_menu dropdown">

diff --git a/components/tools/OmeroWeb/omeroweb/webclient/views.py b/components/tools/OmeroWeb/omeroweb/webclient/views.py
@@ -368,6 +368,7 @@ def load_template(request, menu, conn=None, url=None, **kwargs):
     context['active_group'] = conn.getObject("ExperimenterGroup", long(active_group))
     for g in context['groups']:
         g.groupSummary()    # load leaders / members
+    context['active_user'] = conn.getObject("Experimenter", long(user_id))
 
     context['isLeader'] = conn.isLeader()
     context['template'] = template