bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-13 06:43:31 +00:00
Code Issues Releases Wiki Activity

force vault refresh upon importing

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-21 14:24:24 -04:00
parent e010995b19
commit d61b6c2faa
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/config.js
View File

@@ -77,7 +77,10 @@ angular
url: '^/vault', url: '^/vault',
templateUrl: 'app/vault/views/vault.html', templateUrl: 'app/vault/views/vault.html',
controller: 'vaultController', controller: 'vaultController',
data: { pageTitle: 'My Vault' } data: { pageTitle: 'My Vault' },
params: {
refreshFromServer: false
}
}) })
.state('backend.user.subvaults', { .state('backend.user.subvaults', {
url: '^/subvaults', url: '^/subvaults',

2
src/app/tools/toolsImportController.js
View File

@@ -239,7 +239,7 @@
folderRelationships: folderRelationships folderRelationships: folderRelationships
}, function () { }, function () {
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');
$state.go('backend.user.vault').then(function () { $state.go('backend.user.vault', { refreshFromServer: true }).then(function () {
$analytics.eventTrack('Imported Data', { label: $scope.model.source }); $analytics.eventTrack('Imported Data', { label: $scope.model.source });
toastr.success('Data has been successfully imported into your vault.', 'Import Success'); toastr.success('Data has been successfully imported into your vault.', 'Import Success');
}); });

6
src/app/vault/vaultController.js
View File

@@ -2,11 +2,15 @@
.module('bit.vault') .module('bit.vault')
.controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr, .controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr,
cipherService, $q, $localStorage, $timeout, $rootScope) { cipherService, $q, $localStorage, $timeout, $rootScope, $state) {
$scope.loading = true; $scope.loading = true;
$scope.logins = []; $scope.logins = [];
$scope.favoriteCollapsed = $localStorage.collapsedFolders && 'favorite' in $localStorage.collapsedFolders; $scope.favoriteCollapsed = $localStorage.collapsedFolders && 'favorite' in $localStorage.collapsedFolders;
if ($state.params.refreshFromServer) {
$rootScope.vaultFolders = $rootScope.vaultLogins = null;
}
$scope.$on('$viewContentLoaded', function () { $scope.$on('$viewContentLoaded', function () {
if ($rootScope.vaultFolders && $rootScope.vaultLogins) { if ($rootScope.vaultFolders && $rootScope.vaultLogins) {
$scope.loading = false; $scope.loading = false;