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

show collection and folder groupings together

Browse Source
This commit is contained in:
Kyle Spearrin
2017-11-22 12:08:31 -05:00
parent 7f0d8c99e3
commit d42e6ca3fd
12 changed files with 147 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/config.js
View File

@@ -124,12 +124,6 @@ angular
refreshFromServer: false
}
})
.state('backend.user.shared', {
url: '^/shared',
templateUrl: 'app/vault/views/vaultShared.html',
controller: 'vaultSharedController',
data: { pageTitle: 'Shared' }
})
.state('backend.user.settings', {
url: '^/settings',
templateUrl: 'app/settings/views/settings.html',
@@ -375,7 +369,7 @@ angular
// user is guaranteed to be authenticated becuase of previous check
if (toState.name.indexOf('backend.org.') > -1 && toParams.orgId) {
// clear vault rootScope when visiting org admin section
$rootScope.vaultCiphers = $rootScope.vaultFolders = null;
$rootScope.vaultCiphers = $rootScope.vaultGroupings = null;
authService.getUserProfile().then(function (profile) {
var orgs = profile.organizations;