Skip to content

Commit 57f5a64

Browse files
authored
slicer cli owner fix (#228)
* slicer cli owner fix * slicer-cli disable/enable, editor fields list
1 parent 250d9c5 commit 57f5a64

4 files changed

Lines changed: 20 additions & 3 deletions

File tree

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dive-dsa",
3-
"version": "1.10.25",
3+
"version": "1.10.26",
44
"author": {
55
"name": "Kitware, Inc.",
66
"email": "Bryon.Lewis@kitware.com"

client/platform/web-girder/views/DIVEMetadataEdit.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@ export default defineComponent({
290290
:headers="metadataHeader"
291291
:items="formattedKeys"
292292
item-key="name"
293+
:items-per-page="-1"
294+
hide-default-footer
293295
>
294296
<template #item.visibility="{ item, index }">
295297
<v-icon :color="item.visible ? 'primary' : ''" @click="toggleVisibility(index)">

client/platform/web-girder/views/DIVEMetadataFilter.vue

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,19 @@ export default defineComponent({
248248
emit('updateFilters', { filter: currentFilter.value, sortVal: sortValue.value, sortDir: sortDir.value });
249249
};
250250
251+
const showSlicerCLI = computed(() => {
252+
if (props.displayConfig.slicerCLI === 'Disabled') {
253+
return false;
254+
}
255+
if (props.displayConfig.slicerCLI === 'Owner' && props.ownerAdmin) {
256+
return true;
257+
}
258+
if (props.displayConfig.slicerCLI === 'All Users') {
259+
return true;
260+
}
261+
return false;
262+
});
263+
251264
return {
252265
253266
pageList,
@@ -269,6 +282,7 @@ export default defineComponent({
269282
sortDir,
270283
toggleRegex,
271284
regEx,
285+
showSlicerCLI,
272286
};
273287
},
274288
});
@@ -314,7 +328,7 @@ export default defineComponent({
314328
</v-btn>
315329

316330
<v-spacer />
317-
<DIVEMetadataSlicerVue :filters="currentFilter" :metadata-root="id" class="pr-8" @job-complete="jobCompleted()" />
331+
<DIVEMetadataSlicerVue v-if="showSlicerCLI" :filters="currentFilter" :metadata-root="id" class="pr-8" @job-complete="jobCompleted()" />
318332
<v-chip><span class="pr-1">Filtered:</span>{{ filtered }} / {{ count }}</v-chip>
319333
<v-select
320334
v-model="sortValue"

server/dive_utils/metadata/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ def updateKey(self, folder, root, owner, key, value, categoricalLimit=50, force=
8080
)
8181
if not metadataKeys:
8282
raise Exception(f'Could not find the root metadataKeys with folderId: {folder["_id"]}')
83-
if (key not in metadataKeys['unlocked'] or metadataKeys['owner'] == str(owner['_id'])) and force is False:
83+
print(f'MetdataKeysOwner: {metadataKeys["owner"]} Owner: {str(owner["_id"])}')
84+
if (key not in metadataKeys['unlocked'] and metadataKeys['owner'] != str(owner['_id'])) and force is False:
8485
raise Exception(f'Key {key} is not unlocked for this metadata and cannot be modified')
8586
if metadataKeys['metadataKeys'][key]['category'] == 'numerical':
8687
existing['metadata'][key] = float(value)

0 commit comments

Comments
 (0)