Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-08 09:43:42 +01:00
Code Issues Projects Releases Wiki Activity

no folder items on main vault page when no colls

Browse Source
This commit is contained in:
Kyle Spearrin 2017-12-20 16:24:45 -05:00
parent f77e3b09ea
commit e6b0032933
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/popup/app/vault/vaultController.js
View File

@ -30,6 +30,10 @@ angular
}
else {
$scope.favoriteCiphers = $filter('filter')($rootScope.vaultCiphers, { favorite: true });
if (!$rootScope.vaultCollections || !$rootScope.vaultCollections.length) {
$scope.noFolderCiphers = $filter('filter')($rootScope.vaultCiphers, { folderId: null });
}
}
if (!$rootScope.vaultFolders) {
@ -37,6 +41,7 @@ angular
delayLoad = false;
$scope.loaded = false;
}
if (!$rootScope.vaultCollections) {
$rootScope.vaultCollections = [];
delayLoad = false;
@ -75,6 +80,14 @@ angular
$rootScope.vaultCiphers = decCiphers;
$scope.favoriteCiphers = $filter('filter')($rootScope.vaultCiphers, { favorite: true });
if (!$rootScope.vaultCollections || !$rootScope.vaultCollections.length) {
$scope.noFolderCiphers = $filter('filter')($rootScope.vaultCiphers, { folderId: null });
if ($rootScope.vaultFolders && $rootScope.vaultFolders.length && !$rootScope.vaultFolders[0].id) {
$rootScope.vaultFolders = $rootScope.vaultFolders.slice(1);
}
}
if ($scope.showGroupingCounts) {
var folderCounts = { 'none': 0 };
var collectionCounts = {};

24
src/popup/app/vault/views/vault.html
View File

@ -10,7 +10,7 @@
</div>
<div class="content content-tabs">
<!-- Grouping List -->
<div ng-if="vaultCiphers.length && vaultFolders.length && (!searchText || searchText.length < 2)">
<div ng-if="vaultCiphers.length && (!searchText || searchText.length < 2)">
<div class="list">
<div class="list-section" ng-if="favoriteCiphers.length">
<div class="list-section-header">
@ -32,7 +32,7 @@
</a>
</div>
</div>
<div class="list-section">
<div class="list-section" ng-if="vaultFolders.length">
<div class="list-section-header">
{{::i18n.folders}}
<span>{{vaultFolders.length}}</span>
@ -75,6 +75,26 @@
</a>
</div>
</div>
<div class="list-section" ng-if="noFolderCiphers && noFolderCiphers.length">
<div class="list-section-header">
{{::i18n.noneFolder}}
<span>{{noFolderCiphers.length}}</span>
</div>
<div class="list-section-items">
<a href="#" stop-click ng-click="viewCipher(cipher)" class="list-section-item condensed"
title="{{::i18n.view}}"
ng-repeat="cipher in noFolderCiphers | orderBy: ['name', 'subTitle'] track by $index">
<action-buttons cipher="cipher"></action-buttons>
<icon cipher="cipher"></icon>
<span class="text">
{{cipher.name}}
<i class="fa fa-share-alt text-muted" ng-if="cipher.organizationId" title="{{::i18n.shared}}"></i>
<i class="fa fa-paperclip text-muted" ng-if="cipher.attachments" title="{{::i18n.attachments}}"></i>
</span>
<span class="detail">{{cipher.subTitle}}</span>
</a>
</div>
</div>
</div>
</div>
<!-- Search Results List -->