nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-12-17 13:41:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix some buttons

Browse source
This commit is contained in:
brantje 2016-10-07 13:14:49 +02:00
parent 3694ce7f14
commit a8ce34b29b
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
js/app/controllers/credential.js
View file

@ -213,16 +213,16 @@ angular.module('passmanApp')
} }
_credential.delete_time = new Date().getTime() / 1000; _credential.delete_time = new Date().getTime() / 1000;
for (var i = 0; i < $scope.credentials.length; i++) { for (var i = 0; i < $scope.active_vault.credentials.length; i++) {
if ($scope.credentials[i].credential_id == credential.credential_id) { if ($scope.active_vault.credentials[i].credential_id == credential.credential_id) {
$scope.credentials[i].delete_time = _credential.delete_time; $scope.active_vault.credentials[i].delete_time = _credential.delete_time;
} }
} }
$scope.closeSelected(); $scope.closeSelected();
if (notification) { if (notification) {
NotificationService.hideNotification(notification); NotificationService.hideNotification(notification);
} }
notification = NotificationService.showNotification('Credential deleted <a class="undoDelete" data-item-id="' + credential.credential_id + '">[Undo]</a>', 5000, notification = NotificationService.showNotification('Credential deleted', 5000,
function () { function () {
CredentialService.updateCredential(_credential).then(function (result) { CredentialService.updateCredential(_credential).then(function (result) {
if (result.delete_time > 0) { if (result.delete_time > 0) {
@ -241,9 +241,9 @@ angular.module('passmanApp')
} catch (e) { } catch (e) {
} }
for (var i = 0; i < $scope.credentials.length; i++) { for (var i = 0; i < $scope.active_vault.credentials.length; i++) {
if ($scope.credentials[i].credential_id == credential.credential_id) { if ($scope.active_vault.credentials[i].credential_id == credential.credential_id) {
$scope.credentials[i].delete_time = 0; $scope.active_vault.credentials[i].delete_time = 0;
} }
} }
_credential.delete_time = 0; _credential.delete_time = 0;
@ -251,7 +251,7 @@ angular.module('passmanApp')
if (notification) { if (notification) {
NotificationService.hideNotification(notification); NotificationService.hideNotification(notification);
} }
NotificationService.showNotification('Credential recovered <a class="undoRestore" data-item-id="' + credential.credential_id + '">[Undo]</a>', 5000, NotificationService.showNotification('Credential recovered', 5000,
function () { function () {
CredentialService.updateCredential(_credential).then(function (result) { CredentialService.updateCredential(_credential).then(function (result) {
notification = false; notification = false;
@ -264,9 +264,9 @@ angular.module('passmanApp')
$scope.destroyCredential = function (credential) { $scope.destroyCredential = function (credential) {
var _credential = angular.copy(credential); var _credential = angular.copy(credential);
CredentialService.destroyCredential(_credential.credential_id).then(function (result) { CredentialService.destroyCredential(_credential.credential_id).then(function (result) {
for (var i = 0; i < $scope.credentials.length; i++) { for (var i = 0; i < $scope.active_vault.credentials.length; i++) {
if ($scope.credentials[i].credential_id == credential.credential_id) { if ($scope.active_vault.credentials[i].credential_id == credential.credential_id) {
$scope.credentials.splice(i, 1); $scope.active_vault.credentials.splice(i, 1);
NotificationService.showNotification('Credential destroyed', 5000); NotificationService.showNotification('Credential destroyed', 5000);
break; break;
} }
@ -287,11 +287,13 @@ angular.module('passmanApp')
$scope.filtered_credentials = []; $scope.filtered_credentials = [];
$scope.$watch('[selectedtags, filterOptions, delete_time, active_vault.credentials]', function(){ $scope.$watch('[selectedtags, filterOptions, delete_time, active_vault.credentials]', function(){
var credentials = angular.copy($scope.active_vault.credentials); if($scope.active_vault.credentials) {
var filtered_credentials = $filter('credentialSearch')(credentials,$scope.filterOptions); var credentials = angular.copy($scope.active_vault.credentials);
filtered_credentials = $filter('tagFilter')(filtered_credentials,$scope.selectedtags); var filtered_credentials = $filter('credentialSearch')(credentials, $scope.filterOptions);
filtered_credentials = $filter('filter')(filtered_credentials, {hidden: 0}); filtered_credentials = $filter('tagFilter')(filtered_credentials, $scope.selectedtags);
$scope.filtered_credentials = filtered_credentials; filtered_credentials = $filter('filter')(filtered_credentials, {hidden: 0});
$scope.filtered_credentials = filtered_credentials;
}
}, true); }, true);
$scope.selectedtags = []; $scope.selectedtags = [];