nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-10-10 05:25:51 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix credential counting (Fixes #253)

Browse source
This commit is contained in:
brantje 2017-02-18 00:14:51 +01:00
parent dca12aee07
commit 3dd9e84de7
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
js/app/directives/credentialcounter.js
View file

@ -35,7 +35,7 @@
replace: false, replace: false,
restrict: 'A', restrict: 'A',
scope: { scope: {
credentials: '=credentialCounter', filteredCredentials: '=credentialCounter',
deleteTime: '=', deleteTime: '=',
vault: '=', vault: '=',
filters: '=' filters: '='
@ -45,16 +45,24 @@
function countCredentials() { function countCredentials() {
var countedCredentials = 0; var countedCredentials = 0;
var total = 0; var total = 0;
angular.forEach(scope.credentials, function (credential) { angular.forEach(scope.vault.credentials, function (credential) {
total = (credential.hidden !== 1) ? total + 1 : total; var pos = scope.filteredCredentials.map(function(c) { return c.guid; }).indexOf(credential.guid);
if(credential.delete_time >= scope.deleteTime && credential.hidden === 0){
countedCredentials = countedCredentials+1; if (scope.deleteTime === 0 && credential.hidden === 0 && credential.delete_time === 0) {
total = total + 1;
countedCredentials = (pos !== -1) ? countedCredentials + 1 : countedCredentials;
} }
if (scope.deleteTime > 0 && credential.hidden === 0 && credential.delete_time > 0) {
total = total + 1;
countedCredentials = (pos !== -1) ? countedCredentials + 1 : countedCredentials;
}
}); });
scope.counter = countedCredentials; scope.counter = countedCredentials;
scope.total = total; scope.total = total;
} }
scope.$watch('[credentials, deleteTime, filters]', function () { scope.$watch('[filteredCredentials, deleteTime, filters]', function () {
countCredentials(); countCredentials();
}, true); }, true);
} }