diff options
| author | fnuesse <felix.nuesse@t-online.de> | 2018-11-21 02:37:55 +0300 |
|---|---|---|
| committer | fnuesse <felix.nuesse@t-online.de> | 2018-11-21 19:34:49 +0300 |
| commit | 34917099bf6db3e01440e9c40dacc0636b8b9e5a (patch) | |
| tree | 987400b534a604985a4376669795768abdbb79b7 /js | |
| parent | e692cdba96ebcedbbf01dd5aa67da985600e49cb (diff) | |
Added default vault opening after logout to prevent confusion
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
Diffstat (limited to 'js')
| -rw-r--r-- | js/app/controllers/bookmarklet.js | 2 | ||||
| -rw-r--r-- | js/app/controllers/menu.js | 2 | ||||
| -rw-r--r-- | js/app/controllers/vault.js | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/js/app/controllers/bookmarklet.js b/js/app/controllers/bookmarklet.js index a95135d4..a1d292bd 100644 --- a/js/app/controllers/bookmarklet.js +++ b/js/app/controllers/bookmarklet.js @@ -44,6 +44,8 @@ } $scope.logout = function () { + //see vault.js:54 + $rootScope.override_default_vault=true; $scope.active_vault = false; }; if (SettingsService.getSetting('defaultVault') && SettingsService.getSetting('defaultVaultPass')) { diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js index 2b757fc2..312e9a7b 100644 --- a/js/app/controllers/menu.js +++ b/js/app/controllers/menu.js @@ -34,6 +34,8 @@ .controller('MenuCtrl', ['$scope', 'VaultService', '$location', '$rootScope', 'TagService','SettingsService', '$translate', function ($scope, VaultService, $location, $rootScope, TagService, SettingsService, $translate) { $rootScope.logout = function () { + //see vault.js:54 + $rootScope.override_default_vault=true; SettingsService.setSetting('defaultVaultPass', false); TagService.resetTags(); $rootScope.$broadcast('logout'); diff --git a/js/app/controllers/vault.js b/js/app/controllers/vault.js index de14b39a..cf724524 100644 --- a/js/app/controllers/vault.js +++ b/js/app/controllers/vault.js @@ -46,7 +46,11 @@ var vault = vaults[i]; if (vault.guid === default_vault.guid) { $scope.default_vault = true; - $scope.list_selected_vault = vault; + //This prevents the opening of the default vault if the user logs out + if(!$rootScope.override_default_vault){ + $scope.list_selected_vault = vault; + $rootScope.override_default_vault=false; + } SettingsService.setSetting('defaultVault', vault); if (SettingsService.getSetting('defaultVaultPass')) { $location.path('/vault/' + vault.guid); @@ -219,7 +223,8 @@ }; - $scope.createVault = function (vault_name, vault_key, vault_key2) { + + $scope.createVault = function (vault_name, vault_key, vault_key2) { if (vault_key !== vault_key2) { $scope.error = $translate.instant('password.do.not.match'); return; |