From cae98cfa8dab9ea754ee0136ba5f9de1db91c215 Mon Sep 17 00:00:00 2001 From: binsky Date: Mon, 23 Aug 2021 15:37:54 +0200 Subject: fix icon style for productive nextcloud instances Signed-off-by: binsky --- js/app/directives/icon.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/app') diff --git a/js/app/directives/icon.js b/js/app/directives/icon.js index 646dec01..72efc923 100644 --- a/js/app/directives/icon.js +++ b/js/app/directives/icon.js @@ -32,7 +32,7 @@ angular.module('passmanApp').directive('credentialIcon', [ '$window', function($window) { return { - template: '', + template: '', restrict: 'E', scope: { credential: '=', @@ -55,4 +55,4 @@ } }; }]); -}()); \ No newline at end of file +}()); -- cgit v1.2.3 From 30f200caf2a835008b2c5da957d041fead6e9439 Mon Sep 17 00:00:00 2001 From: binsky Date: Tue, 24 Aug 2021 14:02:42 +0200 Subject: fixed cooperation of the filter options Signed-off-by: binsky --- js/app/controllers/credential.js | 104 ++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 44 deletions(-) (limited to 'js/app') diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 21121cf3..8c709b28 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -345,25 +345,33 @@ $scope.filtered_credentials = []; $scope.$watch('[selectedtags, filterOptions, delete_time, active_vault.credentials]', function () { - if (!$scope.active_vault) { - return; - } - if ($scope.active_vault.credentials) { - var credentials = angular.copy($scope.active_vault.credentials); - var filtered_credentials = $filter('credentialSearch')(credentials, $scope.filterOptions); - filtered_credentials = $filter('tagFilter')(filtered_credentials, $scope.selectedtags); - filtered_credentials = $filter('filter')(filtered_credentials, {hidden: 0}); - $scope.filtered_credentials = filtered_credentials; - $scope.filterOptions.selectedtags = angular.copy($scope.selectedtags); - for (var i = 0; i < $scope.active_vault.credentials.length; i++) { - var _credential = $scope.active_vault.credentials[i]; - if (_credential.tags) { - TagService.addTags(_credential.tags); - } - } - } + $scope.applyUserFilters(true); }, true); + $scope.applyUserFilters = function(noFilterReset) { + if (!$scope.active_vault) { + return; + } + if ($scope.active_vault.credentials) { + var credentials = angular.copy($scope.active_vault.credentials); + if ($scope.active_vault.credentials.length > 0) { + $scope.filterSpecialCredentials(noFilterReset); + credentials = angular.copy($scope.filtered_credentials); + } + var filtered_credentials = $filter('credentialSearch')(credentials, $scope.filterOptions); + filtered_credentials = $filter('tagFilter')(filtered_credentials, $scope.selectedtags); + filtered_credentials = $filter('filter')(filtered_credentials, {hidden: 0}); + $scope.filtered_credentials = filtered_credentials; + $scope.filterOptions.selectedtags = angular.copy($scope.selectedtags); + for (var i = 0; i < $scope.active_vault.credentials.length; i++) { + var _credential = $scope.active_vault.credentials[i]; + if (_credential.tags) { + TagService.addTags(_credential.tags); + } + } + } + }; + $scope.no_credentials_label=[]; $scope.no_credentials_label.all=true; $scope.no_credentials_label.s_good=false; @@ -379,34 +387,40 @@ $scope.no_credentials_label.expired=false; }; + $scope.currentSpecialFilter = "all"; + //watch for special tags $scope.$on('filterSpecial', function(event, args) { - - $scope.disableAllLabels(); - switch (args) { - case "strength_good": - $scope.filterStrength(3,1000); - $scope.no_credentials_label.s_good=true; - break; - case "strength_medium": - $scope.filterStrength(2,3); - $scope.no_credentials_label.s_medium=true; - break; - case "strength_low": - $scope.filterStrength(0,1); - $scope.no_credentials_label.s_low=true; - break; - case "expired": - $scope.filterExpired(); - $scope.no_credentials_label.expired=true; - break; - case "all": - $scope.filterAll(); - $scope.no_credentials_label.all=true; - break; - } + $scope.currentSpecialFilter = args; + $scope.applyUserFilters(args !== "all"); }); + $scope.filterSpecialCredentials = function(noFilterReset) { + $scope.disableAllLabels(); + switch ($scope.currentSpecialFilter) { + case "strength_good": + $scope.filterStrength(3,1000); + $scope.no_credentials_label.s_good=true; + break; + case "strength_medium": + $scope.filterStrength(2,3); + $scope.no_credentials_label.s_medium=true; + break; + case "strength_low": + $scope.filterStrength(0,1); + $scope.no_credentials_label.s_low=true; + break; + case "expired": + $scope.filterExpired(); + $scope.no_credentials_label.expired=true; + break; + case "all": + $scope.filterAll(noFilterReset); + $scope.no_credentials_label.all=true; + break; + } + }; + $scope.getListSizes = function(){ var l = $scope.filtered_credentials; @@ -425,9 +439,11 @@ return result; }; - $scope.filterAll = function(){ - $scope.selectedtags=[]; - $scope.filterOptions.filterText=""; + $scope.filterAll = function(noFilterReset){ + if (noFilterReset == null || noFilterReset === false) { + $scope.filterOptions.filterText=""; + $scope.selectedtags=[]; + } var creds_filtered=[]; for (var i = 0; i < $scope.active_vault.credentials.length; i++) { -- cgit v1.2.3 From 4a1cfe3b7ae5759370de41c95c6348f13f19e473 Mon Sep 17 00:00:00 2001 From: binsky Date: Tue, 31 Aug 2021 17:50:54 +0200 Subject: fix showing deleted credentials Signed-off-by: binsky --- js/app/controllers/credential.js | 2 +- js/app/controllers/menu.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'js/app') diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 8c709b28..440af994 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -447,7 +447,7 @@ var creds_filtered=[]; for (var i = 0; i < $scope.active_vault.credentials.length; i++) { - if($scope.active_vault.credentials[i].delete_time===0){ + if($scope.active_vault.credentials[i].delete_time===0 || $scope.delete_time > 0){ creds_filtered.push($scope.active_vault.credentials[i]); } } diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index 0c1ed6b2..edf57b9f 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -134,7 +134,9 @@ if(string !== "nav_trashbin"){ $scope.delete_time=0; $rootScope.$broadcast('set_delete_time', $scope.delete_time); - } + } else { + string = "all"; + } $scope.selectedTags =[]; $rootScope.$broadcast('filterSpecial',string); -- cgit v1.2.3