mirror of
https://github.com/bitwarden/browser.git
synced 2024-08-31 00:01:03 +02:00
cannot create item in collection.
set collection after share.
This commit is contained in:
parent
6282fabf98
commit
5fbc09b135
|
@ -309,8 +309,9 @@
|
|||
}
|
||||
});
|
||||
|
||||
modal.result.then(function (orgId) {
|
||||
cipher.organizationId = orgId;
|
||||
modal.result.then(function (returned) {
|
||||
cipher.organizationId = returned.orgId;
|
||||
cipher.collectionIds = returned.collectionIds || [];
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -141,6 +141,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
var returnedCollectionIds = null;
|
||||
$scope.submitPromise = $q.all(attachmentSharePromises).then(function () {
|
||||
if (errorOnUpload) {
|
||||
return;
|
||||
|
@ -159,11 +160,15 @@
|
|||
}
|
||||
}
|
||||
|
||||
returnedCollectionIds = request.collectionIds;
|
||||
return apiService.ciphers.putShare({ id: cipherId }, request).$promise;
|
||||
}).then(function (response) {
|
||||
$analytics.eventTrack('Shared Cipher');
|
||||
toastr.success('Item has been shared.');
|
||||
$uibModalInstance.close(model.organizationId);
|
||||
$uibModalInstance.close({
|
||||
orgId: model.organizationId,
|
||||
collectionIds: returnedCollectionIds
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -73,7 +73,8 @@
|
|||
<div class="box-body" ng-class="{'no-padding': filteredCiphers.length}">
|
||||
<div ng-show="!filteredCiphers.length">
|
||||
<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
|
||||
</button>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue
Block a user