nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2024-12-26 09:34:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

Little fixes in revision controller

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

18
js/app/controllers/revision.js
View file

@ -13,28 +13,18 @@ angular.module('passmanApp')
if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
if (!$scope.active_vault) {
$location.path('/')
// $location.path('/')
}
} else {
if (SettingsService.getSetting('defaultVault') && SettingsService.getSetting('defaultVaultPass')) {
var _vault = angular.copy(SettingsService.getSetting('defaultVault'));
_vault.vaultKey = SettingsService.getSetting('defaultVaultPass');
VaultService.setActiveVault(_vault);
VaultService.getVault(_vault).then(function (vault) {
vault.vaultKey = SettingsService.getSetting('defaultVaultPass');
VaultService.setActiveVault(vault);
$scope.active_vault = vault;
$scope.$parent.selectedVault = true;
$scope.vault_settings.pwSettings = VaultService.getVaultSetting('pwSettings',
{
'length': 12,
'useUppercase': true,
'useLowercase': true,
'useDigits': true,
'useSpecialChars': true,
'minimumDigitCount': 3,
'avoidAmbiguousCharacters': false,
'requireEveryCharType': true,
'generateOnCreate': true
})
})
}
}
@ -46,6 +36,7 @@ angular.module('passmanApp')
var getRevisions = function () {
CredentialService.getRevisions($scope.storedCredential.credential_id).then(function (revisions) {
console.log(revisions)
$scope.revisions = revisions;
})
};
@ -86,6 +77,7 @@ angular.module('passmanApp')
$scope.restoreRevision = function (revision) {
var _revision = angular.copy(revision);
var _credential = _revision.credential_data;
//@TODO make sure the shared key doesn't get restored
_credential.revision_created = $filter('date')(_revision.created * 1000 , "dd-MM-yyyy @ HH:mm:ss");
CredentialService.updateCredential(_credential).then(function (result) {
SettingsService.setSetting('revision_credential', null);