devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

resolve issues with id on api calls

This commit is contained in:
Kyle Spearrin 2017-05-10 14:20:45 -04:00
parent ea24d72f01
commit e03d4d52c4
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/organization/organizationCollectionsAddController.js
View File

@ -75,9 +75,9 @@
if ($scope.useGroups) { if ($scope.useGroups) {
collection.groupIds = []; collection.groupIds = [];
for (var id in $scope.selectedGroups) { for (var groupId in $scope.selectedGroups) {
if ($scope.selectedGroups.hasOwnProperty(id)) { if ($scope.selectedGroups.hasOwnProperty(groupId)) {
collection.groupIds.push(id); collection.groupIds.push(groupId);
} }
} }
} }

11
src/app/organization/organizationCollectionsEditController.js
View File

@ -88,14 +88,17 @@
if ($scope.useGroups) { if ($scope.useGroups) {
collection.groupIds = []; collection.groupIds = [];
for (var id in $scope.selectedGroups) { for (var groupId in $scope.selectedGroups) {
if ($scope.selectedGroups.hasOwnProperty(id)) { if ($scope.selectedGroups.hasOwnProperty(groupId)) {
collection.groupIds.push(id); collection.groupIds.push(groupId);
} }
} }
} }
$scope.submitPromise = apiService.collections.put({ orgId: $state.params.orgId }, collection, function (response) { $scope.submitPromise = apiService.collections.put({
orgId: $state.params.orgId,
id: id
}, collection, function (response) {
$analytics.eventTrack('Edited Collection'); $analytics.eventTrack('Edited Collection');
var decCollection = cipherService.decryptCollection(response, $state.params.orgId, true); var decCollection = cipherService.decryptCollection(response, $state.params.orgId, true);
$uibModalInstance.close(decCollection); $uibModalInstance.close(decCollection);

11
src/app/organization/organizationGroupsEditController.js
View File

@ -67,14 +67,17 @@
if (!group.accessAll) { if (!group.accessAll) {
group.collectionIds = []; group.collectionIds = [];
for (var id in $scope.selectedCollections) { for (var collId in $scope.selectedCollections) {
if ($scope.selectedCollections.hasOwnProperty(id)) { if ($scope.selectedCollections.hasOwnProperty(collId)) {
group.collectionIds.push(id); group.collectionIds.push(collId);
} }
} }
} }
$scope.submitPromise = apiService.groups.put({ orgId: $state.params.orgId }, group, function (response) { $scope.submitPromise = apiService.groups.put({
orgId: $state.params.orgId,
id: id
}, group, function (response) {
$analytics.eventTrack('Edited Group'); $analytics.eventTrack('Edited Group');
$uibModalInstance.close({ $uibModalInstance.close({
id: response.Id, id: response.Id,

20
src/app/organization/organizationPeopleEditController.js
View File

@ -84,14 +84,18 @@
} }
} }
$scope.submitPromise = apiService.organizationUsers.put({ orgId: $state.params.orgId, id: id }, { $scope.submitPromise = apiService.organizationUsers.put(
type: $scope.type, {
collections: collections, orgId: $state.params.orgId,
accessAll: $scope.accessAll id: id
}, function () { }, {
$analytics.eventTrack('Edited User'); type: $scope.type,
$uibModalInstance.close(); collections: collections,
}).$promise; accessAll: $scope.accessAll
}, function () {
$analytics.eventTrack('Edited User');
$uibModalInstance.close();
}).$promise;
}; };
$scope.close = function () { $scope.close = function () {