Merge pull request #128 from will-moore/final_fixes

Final bug fixes

static/figure/3rdparty/shape-editor.js

@@ -1,4 +1,4 @@
-//! Built on 2015-11-04
+//! Built on 2015-11-14
 //! GPL License. www.openmicroscopy.org
 
 //!  DO NOT EDIT THIS FILE! - Edit under src/js/*.js
@@ -501,6 +501,9 @@ var CreateArrow = function CreateArrow(options) {
             strokeWidth = this.manager.getStrokeWidth(),
             zoom = this.manager.getZoom();
 
+        this.startX = startX;
+        this.startY = startY;
+
         this.line = new Arrow({
             'manager': this.manager,
             'paper': this.paper,

views.py

@@ -402,18 +402,20 @@ def list_web_figures(request, conn=None, **kwargs):
 
         rsp.append(figFile)
 
-    # remove image Ids if images deleted (to prevent 404 for thumbnails)
-    params = omero.sys.ParametersI()
-    params.addIds(list(thumbIds))
-    query = "select i.id from Image i where i.id in (:ids)"
-    rslt = conn.getQueryService().projection(query, params, conn.SERVICE_OPTS)
-    ids = [unwrap(r)[0] for r in rslt]
-    for fig in rsp:
-        if 'description' in fig:
-            desc = fig['description']
-            if 'imageId' in desc:
-                if desc['imageId'] not in ids and 'baseUrl' not in desc:
-                    desc['imageId'] = -1
+    if len(thumbIds) > 0:
+        # remove image Ids if images deleted (to prevent 404 for thumbnails)
+        params = omero.sys.ParametersI()
+        params.addIds(list(thumbIds))
+        query = "select i.id from Image i where i.id in (:ids)"
+        qs = conn.getQueryService()
+        rslt = qs.projection(query, params, conn.SERVICE_OPTS)
+        ids = [unwrap(r)[0] for r in rslt]
+        for fig in rsp:
+            if 'description' in fig:
+                desc = fig['description']
+                if 'imageId' in desc:
+                    if desc['imageId'] not in ids and 'baseUrl' not in desc:
+                        desc['imageId'] = -1
 
     return HttpResponse(json.dumps(rsp), content_type='json')