Skip to content

Show fileset ID #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshmoore merged 4 commits into from
Aug 6, 2022
Merged

Show fileset ID #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95bfb34
Add Fileset.id to original_file_paths JSON
will-moore Jul 22, 2022
cf814d0
Show Fileset ID in 'file paths' panel
will-moore Jul 22, 2022
767faa0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 22, 2022
b757d16
Re-format fileset info
will-moore Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion omeroweb/webclient/templates/webclient/annotations/includes/toolbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
9 changes: 6 additions & 3 deletions omeroweb/webclient/templates/webclient/annotations/metadata_general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>";
Expand Down
7 changes: 6 additions & 1 deletion omeroweb/webgateway/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down