Merge pull request #385 from will-moore/show_fileset_id

Show fileset ID
ome · Aug 6, 2022 · 8eabad0 · 8eabad0
2 parents 1523a77 + b757d16
commit 8eabad0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/omeroweb/webclient/templates/webclient/annotations/includes/toolbar.html b/omeroweb/webclient/templates/webclient/annotations/includes/toolbar.html
@@ -355,7 +355,7 @@
     {% if not share %}
     {% if image.showOriginalFilePaths %}
       <!-- show original file paths -->
-      <button id="show_fs_files_btn" class="btn silver btn_fspath" title="Show file paths on server">
+      <button id="show_fs_files_btn" class="btn silver btn_fspath" title="Show Fileset ID and file paths on server">
         <span></span>
       </button>
     {% endif %}

diff --git a/omeroweb/webclient/templates/webclient/annotations/metadata_general.html b/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
@@ -149,11 +149,14 @@
                                 var repo = data.repo,
                                     client = data.client,
                                     html = "";
-                                $panel_title.html(repo.length + " Image file" + (repo.length>1 ? "s:" : ":"));
+                                $panel_title.html("Fileset Info");
+
+                                html += `<p>Fileset ID: <strong>${data.fileset.id}</strong></p>`
+
+                                html += `<p>File count: <strong>${repo.length}</strong></p>`
 
                                 if (importTransfer) {
-                                    html += "<p>Imported with <strong>--transfer="+ importTransfer;
-                                    html += "</strong></p><hr/>";
+                                    html += "<p>Imported with: <strong>--transfer="+ importTransfer + "</strong></p>";
                                 }
 
                                 html += "<p>Imported from:</p>";

diff --git a/omeroweb/webgateway/views.py b/omeroweb/webgateway/views.py
@@ -2686,7 +2686,12 @@ def original_file_paths(request, iid, conn=None, **kwargs):
     if image is None:
         raise Http404
     paths = image.getImportedImageFilePaths()
-    return {"repo": paths["server_paths"], "client": paths["client_paths"]}
+    fileset_id = image.fileset.id.val
+    return {
+        "repo": paths["server_paths"],
+        "client": paths["client_paths"],
+        "fileset": {"id": fileset_id},
+    }
 
 
 @login_required()