no edit/del of "no folder"

bitwarden · Mar 20, 2018 · c3be819 · c3be819
1 parent 39471d0
commit c3be819
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
@@ -243,6 +243,10 @@
         };
 
         $scope.editFolder = function (folder) {
+            if (!folder.id) {
+                return;
+            }
+
             var editModel = $uibModal.open({
                 animation: true,
                 templateUrl: 'app/vault/views/vaultEditFolder.html',
@@ -276,6 +280,10 @@
         };
 
         $scope.deleteFolder = function (folder) {
+            if (!folder.id) {
+                return;
+            }
+
             if (!confirm('Are you sure you want to delete this folder (' + folder.name + ')? ' +
                 'Any items will be moved to "No Folder".')) {
                 return;

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