Merge pull request ome#5688 from will-moore/render_response_user_id

@render_response user_id
melissalinkert · Jul 3, 2018 · 846afb1 · 846afb1
2 parents 94eb816 + b6ea95e
commit 846afb1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/components/tools/OmeroWeb/omeroweb/webclient/decorators.py b/components/tools/OmeroWeb/omeroweb/webclient/decorators.py
@@ -130,7 +130,8 @@ def prepare_context(self, request, context, *args, **kwargs):
         context['ome']['eventContext'] = eventContextMarshal(
             conn.getEventContext())
         context['ome']['user'] = conn.getUser
-        context['ome']['user_id'] = request.session.get('user_id', None)
+        context['ome']['user_id'] = request.session.get('user_id',
+                                                        conn.getUserId())
         context['ome']['group_id'] = request.session.get('group_id', None)
         context['ome']['active_group'] = request.session.get(
             'active_group', conn.getEventContext().groupId)