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

cannot create item in collection.

Browse Source 
set collection after share.
This commit is contained in:
Kyle Spearrin 2018-03-24 20:44:51 -04:00
parent 6282fabf98
commit 5fbc09b135
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,8 +309,9 @@
} }
}); });
modal.result.then(function (orgId) { modal.result.then(function (returned) {
cipher.organizationId = orgId; cipher.organizationId = returned.orgId;
cipher.collectionIds = returned.collectionIds || [];
}); });
}; };

7
src/app/vault/vaultShareCipherController.js
View File

@ -141,6 +141,7 @@
} }
} }
var returnedCollectionIds = null;
$scope.submitPromise = $q.all(attachmentSharePromises).then(function () { $scope.submitPromise = $q.all(attachmentSharePromises).then(function () {
if (errorOnUpload) { if (errorOnUpload) {
return; return;
@ -159,11 +160,15 @@
} }
} }
returnedCollectionIds = request.collectionIds;
return apiService.ciphers.putShare({ id: cipherId }, request).$promise; return apiService.ciphers.putShare({ id: cipherId }, request).$promise;
}).then(function (response) { }).then(function (response) {
$analytics.eventTrack('Shared Cipher'); $analytics.eventTrack('Shared Cipher');
toastr.success('Item has been shared.'); toastr.success('Item has been shared.');
$uibModalInstance.close(model.organizationId); $uibModalInstance.close({
orgId: model.organizationId,
collectionIds: returnedCollectionIds
});
}); });
}; };

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

@ -73,7 +73,8 @@
<div class="box-body" ng-class="{'no-padding': filteredCiphers.length}"> <div class="box-body" ng-class="{'no-padding': filteredCiphers.length}">
<div ng-show="!filteredCiphers.length"> <div ng-show="!filteredCiphers.length">
<p>No items to list.</p> <p>No items to list.</p>
<button type="button" ng-click="addCipher()" class="btn btn-default btn-flat"> <button type="button" ng-click="addCipher()" class="btn btn-default btn-flat"
ng-if="!selectedCollection">
Add an Item Add an Item
</button> </button>
</div> </div>