Use group -1 in manage_action_containers()

ome · Apr 29, 2016 · 61a7965 · 61a7965
1 parent fc7aa3f
commit 61a7965
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/components/tools/OmeroWeb/omeroweb/webclient/controller/container.py b/components/tools/OmeroWeb/omeroweb/webclient/controller/container.py
@@ -173,6 +173,8 @@ def _get_object(self):
             return self.tag
         if self.file is not None:
             return self.file
+        if self.comment is not None:
+            return self.comment
 
     def obj_id(self):
         obj = self._get_object()

diff --git a/components/tools/OmeroWeb/omeroweb/webclient/views.py b/components/tools/OmeroWeb/omeroweb/webclient/views.py
@@ -2663,7 +2663,12 @@ def manage_action_containers(request, action, o_type=None, o_id=None,
         if o_type is not None and o_id > 0:
             kw[str(o_type)] = long(o_id)
         try:
+            conn.SERVICE_OPTS.setOmeroGroup('-1')
             manager = BaseContainer(conn, **kw)
+            obj = manager._get_object()
+            if obj is not None:
+                gid = obj.getDetails().group.id.val
+                conn.SERVICE_OPTS.setOmeroGroup(gid)
         except AttributeError, x:
             return handlerInternalError(request, x)
     elif o_type in ("share", "sharecomment", "chat"):