diff --git a/assets/app/app/analysis/patternmatching/index.js b/assets/app/app/analysis/patternmatching/index.js index 4658eefe..2918ba20 100644 --- a/assets/app/app/analysis/patternmatching/index.js +++ b/assets/app/app/analysis/patternmatching/index.js @@ -241,7 +241,7 @@ angular.module('a2.analysis.patternmatching', [ if (a2UserPermit.isSuper()) { return $scope.openExportPopup(exportReport) } - if (!a2UserPermit.can('manage pattern matchings') || (a2UserPermit.can('manage pattern matchings') && a2UserPermit.getUserRole() !== 'User')) { + if (!a2UserPermit.can('manage pattern matchings') || (a2UserPermit.can('manage pattern matchings') && a2UserPermit.getUserRole() === 'User')) { return notify.error('You do not have permission to export data'); } $scope.openExportPopup(exportReport) @@ -676,7 +676,7 @@ angular.module('a2.analysis.patternmatching', [ exportPmReport: function ($event) { $event.stopPropagation(); if (a2UserPermit.isSuper()) return this.setupExportUrl() - if (!a2UserPermit.can('manage pattern matchings') || (a2UserPermit.can('manage pattern matchings') && a2UserPermit.getUserRole() !== 'User')) { + if (!a2UserPermit.can('manage pattern matchings') || (a2UserPermit.can('manage pattern matchings') && a2UserPermit.getUserRole() === 'User')) { return notify.error('You do not have permission to export Pattern Matching data'); } else return this.setupExportUrl() }, diff --git a/assets/app/app/visualizer/layers/templates.js b/assets/app/app/visualizer/layers/templates.js index fe2263ca..9a995045 100644 --- a/assets/app/app/visualizer/layers/templates.js +++ b/assets/app/app/visualizer/layers/templates.js @@ -29,6 +29,7 @@ angular.module('a2.visualizer.layers.templates', [ self.toggleSpeciesAdd = false; self.toggleSpeciesSelect = false; self.toggleSongtypeSelect = false; + self.resetSearch = false; self.userSearch = ''; self.allSpecies = []; self.songtypes = []; @@ -48,16 +49,22 @@ angular.module('a2.visualizer.layers.templates', [ self.getClasses(); - self.onSpeciesExists = function(search) { - console.log('[onSpeciesExists] search', search) - if (!search) { + self.onSpeciesExists = function($select) { + console.log('[onSpeciesExists] search', $select.search) + if (!$select.search) { self.userSearch = ''; return; } - self.userSearch = search; + if (self.resetSearch) { + $select.search = ''; + self.userSearch = ''; + self.resetSearch = false; + return; + } + self.userSearch = $select.search; const classes = self.project_classes ? self.project_classes.filter(function(cl) { const species = cl.species_name.toLowerCase() - const searchFormatted = search.toLowerCase() + const searchFormatted = $select.search.toLowerCase() if (species.indexOf(searchFormatted) != -1) { return true; } else return false; @@ -135,6 +142,7 @@ angular.module('a2.visualizer.layers.templates', [ .success(function(result) { notify.log(self.classToAdd.species + ' ' + self.classToAdd.songtype + " added to the project"); self.toggleSongtypeSelect = false; + self.resetSearch = true; self.userSearch = ''; // Reload the validations list on the Species Presence. $scope.$broadcast('a2-persisted', { diff --git a/assets/app/app/visualizer/spectrogram-layer/templates.html b/assets/app/app/visualizer/spectrogram-layer/templates.html index 832c9946..136aa3ff 100644 --- a/assets/app/app/visualizer/spectrogram-layer/templates.html +++ b/assets/app/app/visualizer/spectrogram-layer/templates.html @@ -78,7 +78,7 @@