Merge branch 'master' into stable

Makefile

@@ -352,7 +352,7 @@ FILES = \
     project-settings/leaf-type-edit.js \
     project-settings/state-type-edit.js \
     project-settings/membership-edit.js \
-    project-settings/version-edit.js \
+    project-settings/versions-edit.js \
     project-settings/project-settings.js \
     annotation/annotation-breadcrumbs.js \
     annotation/lock-button.js \

install.sh

@@ -124,6 +124,7 @@ echo "Installing pip packages."
 pip3 install --upgrade pip
 pip3 install setuptools
 pip3 install /tmp/*.whl pandas opencv-python pytest pyyaml playwright pytest-playwright
+export PATH=$PATH:$HOME/.local/bin:/snap/bin
 playwright install
 
 # Install tator.

main/rest/_annotation_query.py

@@ -190,15 +190,15 @@ def _get_annotation_psql_queryset(project, filter_ops, params, annotation_type):
     if after is not None:
         qs = qs.filter(pk__gt=after)
 
-    if exclude_parents:
-        parent_set = Localization.objects.filter(pk__in=Subquery(qs.values('parent')))
-        qs = qs.difference(parent_set)
-
     # TODO: Remove modified parameter
     qs = qs.exclude(modified=False)
 
     qs = get_attribute_psql_queryset(qs, params, filter_ops)
 
+    if exclude_parents:
+        parent_set = Localization.objects.filter(pk__in=Subquery(qs.values('parent')))
+        qs = qs.difference(parent_set)
+
     # Coalesce is a no-op that prevents PSQL from using the primary key index for small
     # LIMIT values (which results in slow queries).
     if exclude_parents or (stop is None):

main/static/js/components/inputs/feature/checkbox-set.js

@@ -68,8 +68,6 @@ class CheckboxSet extends TatorElement {
     }
 
     _newInput(item){
-      console.log(item.id);
-      console.log(item.name);
       let checkbox = document.createElement("checkbox-input");
       checkbox.setAttribute("name", `${item.name}`);
       if (this.type != undefined) {
@@ -151,7 +149,7 @@ class CheckboxSet extends TatorElement {
         this._inputs.splice(idx, 1);
         checkbox.remove()
         const inputWrapper = this._inputDiv.children[idx];
-        console.log(inputWrapper);
+        // console.log(inputWrapper);
         this._inputDiv.removeChild(inputWrapper);
 
         return true;

main/static/js/project-settings/type-form.js

@@ -18,6 +18,9 @@ class TypeForm extends TatorElement {
     // Loading spinner
     this.loading = new LoadingSpinner();
     this._shadow.appendChild(this.loading.getImg());
+
+    // Init hide attributes
+    this._hideAttributes = false;
   }
 
   _init({ data, modal, sidenav, versionListHandler, mediaListHandler }) {
@@ -79,7 +82,7 @@ class TypeForm extends TatorElement {
       const sectionForm = await this._getSectionForm(this.data);
       this.typeFormDiv.appendChild(sectionForm);
 
-      if (typeof this._hideAttributes !== "undefined" && !this._hideAttributes) {
+      if (typeof this._hideAttributes !== "undefined" && this._hideAttributes == false) {
         this.typeFormDiv.appendChild(this._getAttributeSection());
       }