diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index ea4d6ce8..fa04360f 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -9,8 +9,8 @@
*/
angular.module('passmanApp')
.controller('CredentialCtrl', ['$scope', 'VaultService', 'SettingsService', '$location', 'CredentialService',
- '$rootScope', 'FileService', 'EncryptService', 'TagService', '$timeout', 'NotificationService', 'CacheService', 'ShareService', 'SharingACL', '$interval',
- function ($scope, VaultService, SettingsService, $location, CredentialService, $rootScope, FileService, EncryptService, TagService, $timeout, NotificationService, CacheService, ShareService, SharingACL, $interval) {
+ '$rootScope', 'FileService', 'EncryptService', 'TagService', '$timeout', 'NotificationService', 'CacheService', 'ShareService', 'SharingACL', '$interval', '$filter',
+ function ($scope, VaultService, SettingsService, $location, CredentialService, $rootScope, FileService, EncryptService, TagService, $timeout, NotificationService, CacheService, ShareService, SharingACL, $interval, $filter) {
$scope.active_vault = VaultService.getActiveVault();
if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
if (!$scope.active_vault) {
@@ -86,6 +86,7 @@ angular.module('passmanApp')
}
}
angular.merge($scope.active_vault.credentials, _credentials);
+ $scope.filtered_credentials = angular.copy($scope.active_vault.credentials);
$scope.show_spinner = false;
});
});
@@ -283,6 +284,14 @@ angular.module('passmanApp')
fields: ['label', 'username', 'email', 'password', 'custom_fields']
};
+
+ $scope.filtered_credentials = [];
+ $scope.$watch('[selectedtags, filterOptions, delete_time]', function(){
+ var credentials = angular.copy($scope.active_vault.credentials);
+ var filtered_credentials = $filter('credentialSearch')(credentials,$scope.filterOptions);
+ filtered_credentials = $filter('tagFilter')(filtered_credentials,$scope.selectedtags);
+ $scope.filtered_credentials = filtered_credentials;
+ }, true);
$scope.selectedtags = [];
var to;
$rootScope.$on('selected_tags_updated', function (evt, _sTags) {
diff --git a/js/templates.js b/js/templates.js
index 06bdddeb..8760c9c3 100644
--- a/js/templates.js
+++ b/js/templates.js
@@ -113,7 +113,7 @@ angular.module('views/share_credential.html', []).run(['$templateCache', functio
angular.module('views/show_vault.html', []).run(['$templateCache', function($templateCache) {
'use strict';
$templateCache.put('views/show_vault.html',
- '
{{filtered_credentials}} {{ ::credential.label}} {{ ::tag.text}} |
');
+ ' {{ ::credential.label}} {{ ::tag.text}} |
');
}]);
angular.module('views/vaults.html', []).run(['$templateCache', function($templateCache) {
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html
index 89aef51a..1acd7541 100644
--- a/templates/views/show_vault.html
+++ b/templates/views/show_vault.html
@@ -31,7 +31,6 @@
-{{filtered_credentials}}