update for r5161

git-svn-id: file:///home/svn/omero/trunk@5165 05709c45-44f0-0310-885b-81a1db45b4a6
melissalinkert · Sep 30, 2009 · 68a23a5 · 68a23a5
1 parent 4fe1f59
commit 68a23a5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 17 deletions.
diff --git a/components/tools/OmeroWeb/omeroweb/extlib/gateway.py b/components/tools/OmeroWeb/omeroweb/extlib/gateway.py
@@ -2355,21 +2355,30 @@ def getDateAsTimestamp(self):
     # from metadata service
     def getMicroscopInstruments(self):
         meta_serv = self._conn.getMetadataService()
-        for inst in meta_serv.loadInstrument(self._obj.instrument.id.val):
-            if isinstance(inst, InstrumentI):
-                yield ImageInstrumentWrapper(self._conn, inst)
+        if self._obj.instrument is None:
+            yield None
+        else:
+            for inst in meta_serv.loadInstrument(self._obj.instrument.id.val):
+                if isinstance(inst, InstrumentI):
+                    yield ImageInstrumentWrapper(self._conn, inst)
 
     def getMicroscopDetectors(self):
         meta_serv = self._conn.getMetadataService()
-        for inst in meta_serv.loadInstrument(self._obj.instrument.id.val):
-            if isinstance(inst, DetectorI):
-                yield ImageDetectorWrapper(self._conn, inst)
+        if self._obj.instrument is None:
+            yield None
+        else:
+            for inst in meta_serv.loadInstrument(self._obj.instrument.id.val):
+                if isinstance(inst, DetectorI):
+                    yield ImageDetectorWrapper(self._conn, inst)
 
     def getMicroscopFilters(self):
         meta_serv = self._conn.getMetadataService()
-        for inst in meta_serv.loadInstrument(self._obj.instrument.id.val):
-            if isinstance(inst, FilterI):
-                yield ImageFilterWrapper(self._conn, inst)
+        if self._obj.instrument is None:
+            yield None
+        else:
+            for inst in meta_serv.loadInstrument(self._obj.instrument.id.val):
+                if isinstance(inst, FilterI):
+                    yield ImageFilterWrapper(self._conn, inst)
 
     # from model
     def getImagingEnvironment(self):

diff --git a/components/tools/OmeroWeb/omeroweb/webclient/views.py b/components/tools/OmeroWeb/omeroweb/webclient/views.py
@@ -639,14 +639,24 @@ def manage_data(request, whos, o1_type=None, o1_id=None, o2_type=None, o2_id=Non
         if manager.image.getStageLabel() is not None:
             form_stageLabel = MetadataStageLabelForm(initial={'image': manager.image })
 
-        filters = list(manager.image.getMicroscopFilters())
-        for f in filters:
-            form_filter = MetadataFilterForm(initial={'filter': f, 'types':list(conn.getEnumerationEntries("FilterTypeI"))})
-            form_filters.append(form_filter)
-        detectors = list(manager.image.getMicroscopDetectors())
-        for d in detectors:
-            form_detector = MetadataDetectorForm(initial={'detector': d, 'types':list(conn.getEnumerationEntries("DetectorTypeI"))})
-            form_detectors.append(form_detector)
+        try:
+            if manager.image.getMicroscopFilters().next() is not None:
+                filters = list(manager.image.getMicroscopFilters())
+        except StopIteration:
+            pass
+        else:
+            for f in filters:
+                form_filter = MetadataFilterForm(initial={'filter': f, 'types':list(conn.getEnumerationEntries("FilterTypeI"))})
+                form_filters.append(form_filter)
+        try:
+            if manager.image.getMicroscopDetectors().next() is not None:
+                detectors = list(manager.image.getMicroscopDetectors())
+        except StopIteration:
+            pass
+        else:
+            for d in detectors:
+                form_detector = MetadataDetectorForm(initial={'detector': d, 'types':list(conn.getEnumerationEntries("DetectorTypeI"))})
+                form_detectors.append(form_detector)
 
     template = None
     if o3_type and o3_id: