Merge pull request #32 from jburel/12145-rnd-settings

12145 rnd settings
ome · May 14, 2014 · 0dbcd2d · 0dbcd2d
2 parents 7edacb4 + a9c266b
commit 0dbcd2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...nents/insight/SRC/org/openmicroscopy/shoola/agents/metadata/view/MetadataViewerModel.java b/...nents/insight/SRC/org/openmicroscopy/shoola/agents/metadata/view/MetadataViewerModel.java
@@ -913,8 +913,11 @@ void setViewedBy(Map viewedBy)
 				}
 			}
 		}
-		this.viewedBy = m; 
-		getEditor().getRenderer().loadRndSettings(true, null);
+		this.viewedBy = m;
+		Renderer rnd = getEditor().getRenderer();
+		if (rnd != null) {
+		    rnd.loadRndSettings(true, null);
+		}
 	}
 
 	/**

diff --git a/components/tools/OmeroPy/src/omero/gateway/__init__.py b/components/tools/OmeroPy/src/omero/gateway/__init__.py
@@ -6247,6 +6247,8 @@ def _prepareTB (self, _r=False):
                 rdid = None
         if rdid is None:
             if not has_rendering_settings:
+                if self._conn.canBeAdmin():
+                   ctx.setOmeroUser(self.details.owner.id.val)
                 try:
                     tb.resetDefaults(ctx)      # E.g. May throw Missing Pyramid Exception
                 except omero.ConcurrencyException, ce: