diff --git a/Makefile b/Makefile index 43e581c1a..64712958d 100644 --- a/Makefile +++ b/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 \ diff --git a/install.sh b/install.sh index e0f0ee887..e17dc1525 100755 --- a/install.sh +++ b/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. diff --git a/main/rest/_annotation_query.py b/main/rest/_annotation_query.py index d06783205..866c328e0 100644 --- a/main/rest/_annotation_query.py +++ b/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): diff --git a/main/static/js/components/inputs/feature/checkbox-set.js b/main/static/js/components/inputs/feature/checkbox-set.js index 69ab51902..3a86d6e29 100644 --- a/main/static/js/components/inputs/feature/checkbox-set.js +++ b/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; diff --git a/main/static/js/project-settings/type-form.js b/main/static/js/project-settings/type-form.js index ac1c1895c..0ac6561e3 100644 --- a/main/static/js/project-settings/type-form.js +++ b/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()); }