Merge pull request #5832 from sbesson/populate_dataset_webclient

Populate dataset webclient
ome · Sep 3, 2018 · 5ae3059 · 5ae3059
2 parents 040837b + 572c319
commit 5ae3059
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/...s/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html b/...s/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
@@ -349,7 +349,10 @@
                     {% elif manager.image %}
                     var screenQuery = "{% url 'webgateway_object_table_query' 'Screen.plateLinks.child.wells.wellSamples.image' manager.image.id %}";
                     var plateQuery = "{% url 'webgateway_object_table_query' 'Plate.wells.wellSamples.image' manager.image.id %}";
+                    var projectQuery = "{% url 'webgateway_object_table_query' 'Project.datasetLinks.child.imageLinks.child' manager.image.id %}";
+                    var datasetQuery = "{% url 'webgateway_object_table_query' 'Dataset.imageLinks.child' manager.image.id %}";
                     var query = "Image-{{ manager.image.id }}";
+                    var query2 = "image-{{ manager.image.id }}";
                     {% endif %}
 
                     var showBulkAnnTooltip = function(data) {
@@ -387,6 +390,12 @@
                         if (expanded && $("#bulk_annotations_table").is(":empty")) {
                             loadBulkAnnotations(screenQuery, query, showBulkAnnTooltip);
                             loadBulkAnnotations(plateQuery, query, showBulkAnnTooltip);
+                            {% if manager.image %}
+                                loadBulkAnnotations(projectQuery, query, showBulkAnnTooltip);
+                                loadBulkAnnotations(datasetQuery, query, showBulkAnnTooltip);
+                                loadBulkAnnotations(projectQuery, query2, showBulkAnnTooltip);
+                                loadBulkAnnotations(datasetQuery, query2, showBulkAnnTooltip);
+                            {% endif %}
                         }
                     });
 
@@ -398,6 +407,12 @@
                         if ($("#bulk_annotations_table").is(":empty")) {
                             loadBulkAnnotations(screenQuery, query, showBulkAnnTooltip);
                             loadBulkAnnotations(plateQuery, query, showBulkAnnTooltip);
+                            {% if manager.image %}
+                                loadBulkAnnotations(projectQuery, query, showBulkAnnTooltip);
+                                loadBulkAnnotations(datasetQuery, query, showBulkAnnTooltip);
+                                loadBulkAnnotations(projectQuery, query2, showBulkAnnTooltip);
+                                loadBulkAnnotations(datasetQuery, query2, showBulkAnnTooltip);
+                            {% endif %}
                         }
                     }