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

no edit/del of "no folder"

Browse Source
This commit is contained in:
Kyle Spearrin 2018-03-20 15:58:00 -04:00
parent 39471d0421
commit c3be8195fd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,10 @@
}; };
$scope.editFolder = function (folder) { $scope.editFolder = function (folder) {
if (!folder.id) {
return;
}
var editModel = $uibModal.open({ var editModel = $uibModal.open({
animation: true, animation: true,
templateUrl: 'app/vault/views/vaultEditFolder.html', templateUrl: 'app/vault/views/vaultEditFolder.html',
@ -276,6 +280,10 @@
}; };
$scope.deleteFolder = function (folder) { $scope.deleteFolder = function (folder) {
if (!folder.id) {
return;
}
if (!confirm('Are you sure you want to delete this folder (' + folder.name + ')? ' + if (!confirm('Are you sure you want to delete this folder (' + folder.name + ')? ' +
'Any items will be moved to "No Folder".')) { 'Any items will be moved to "No Folder".')) {
return; return;

2
src/app/vault/views/vault.html
View File

@ -50,7 +50,7 @@
{{selectedFolder ? selectedFolder.name : selectedCollection ? selectedCollection.name : selectedTitle}} {{selectedFolder ? selectedFolder.name : selectedCollection ? selectedCollection.name : selectedTitle}}
<small ng-pluralize count="filteredCiphers.length" when="{'1': '{} item', 'other': '{} items'}"></small> <small ng-pluralize count="filteredCiphers.length" when="{'1': '{} item', 'other': '{} items'}"></small>
</h3> </h3>
<div class="box-tools" ng-if="selectedFolder"> <div class="box-tools" ng-if="selectedFolder && selectedFolder.id">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-cog"></i> <span class="caret"></span> <i class="fa fa-cog"></i> <span class="caret"></span>