fixed trashbin-navigation behaviour

Signed-off-by: fnuesse <felix.nuesse@t-online.de>

2 files changed, 16 insertions, 2 deletions

diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index 22f92f0a..2a12d5b8 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -380,9 +380,11 @@
                         case "strength_low": $scope.filterStrength(0,1); break;
                         case "expired": $scope.filterExpired(); break;
                         case "all": $scope.filterAll(); break;
-
                     }
 
+                    $scope.delete_time=0;
+                    $rootScope.$broadcast('release_trashbin', $scope.delete_time);
+
                 });
 
 
@@ -403,7 +405,15 @@
                 $scope.filterAll = function(){
                     $scope.selectedtags=[];
                     $scope.filterOptions.filterText="";
-                    $scope.filtered_credentials=$scope.filterHidden($scope.active_vault.credentials);
+                    var creds_filtered=[];
+
+                    for (var i = 0; i < $scope.active_vault.credentials.length; i++) {
+                        if($scope.active_vault.credentials[i].delete_time>0){
+                            creds_filtered.push($scope.active_vault.credentials[i]);
+                        }
+                    }
+
+					$scope.filtered_credentials=$scope.filterHidden(creds_filtered);
                 };
 
                 $scope.filterStrength = function(strength_min, strength_max){
diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js
index ce453255..97288bfa 100644
--- a/js/app/controllers/menu.js
+++ b/js/app/controllers/menu.js
@@ -152,6 +152,10 @@
 					$scope.available_tags = TagService.getTags();
 				}, true);
 
+                $scope.$on('release_trashbin', function(event, args) {
+                    $scope.delete_time=args;
+				});
+
 				$scope.toggleDeleteTime = function () {
 					if ($scope.delete_time > 0) {
 						$scope.delete_time = 0;