Merge pull request #1855 from cvisionai/dev/neg1_attribute_panel

1.3.15 forward ports to main
cvisionai · Nov 8, 2024 · 534fe70 · 534fe70
2 parents 876c8a6 + 4d2a1b3
commit 534fe70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/scripts/packages/tator-js b/scripts/packages/tator-js
diff --git a/ui/src/js/annotation/attribute-panel.js b/ui/src/js/annotation/attribute-panel.js
@@ -1239,6 +1239,9 @@ export class AttributePanel extends TatorElement {
     this._idWidget.setValue(values.id);
     this._elementalIdWidget.setValue(values.elemental_id);
     this._markWidget.setValue(values.mark);
+    if (values.mark == -1) {
+      this.permission = "Read Only";
+    }
     this._frameWidget.setValue(values.frame);
     this._typeWidget.setValue(
       `${this._dataType.name} (ID: ${this._dataType.id})`

diff --git a/ui/src/js/annotation/video-settings-dialog.js b/ui/src/js/annotation/video-settings-dialog.js
@@ -530,7 +530,7 @@ export class VideoSettingsDialog extends ModalDialog {
           resA.size === resB.size ||
           [...resA].every((value) => resB.has(value));
         if (!sameResolutions) {
-          Utilities.warningAlert("Videos do not have the same resolutions!");
+          console.warn("Videos do not have the same resolutions!");
           break;
         }
       }