From 54172c441fb1a3922dc1cd0375651881d2294c0a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 27 Apr 2017 15:36:18 -0400 Subject: [PATCH] rename AccessAllCollections => AccessAll --- .../organizationCollectionsUsersController.js | 2 +- .../organization/organizationPeopleController.js | 2 +- .../organizationPeopleEditController.js | 6 +++--- .../organizationPeopleInviteController.js | 4 ++-- .../views/organizationCollectionsUsers.html | 2 +- src/app/organization/views/organizationPeople.html | 4 ++-- .../organization/views/organizationPeopleEdit.html | 14 +++++++------- .../views/organizationPeopleInvite.html | 14 +++++++------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/app/organization/organizationCollectionsUsersController.js b/src/app/organization/organizationCollectionsUsersController.js index 30967da2af7..004d52dd6ea 100644 --- a/src/app/organization/organizationCollectionsUsersController.js +++ b/src/app/organization/organizationCollectionsUsersController.js @@ -27,7 +27,7 @@ type: userList.Data[i].Type, status: userList.Data[i].Status, readOnly: userList.Data[i].ReadOnly, - accessAllCollections: userList.Data[i].AccessAllCollections + accessAll: userList.Data[i].AccessAll }); } $scope.users = users; diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js index 308a95e9f92..1f9f0b1f4b6 100644 --- a/src/app/organization/organizationPeopleController.js +++ b/src/app/organization/organizationPeopleController.js @@ -94,7 +94,7 @@ email: list.Data[i].Email, status: list.Data[i].Status, type: list.Data[i].Type, - accessAllCollections: list.Data[i].AccessAllCollections + accessAll: list.Data[i].AccessAll }; users.push(user); diff --git a/src/app/organization/organizationPeopleEditController.js b/src/app/organization/organizationPeopleEditController.js index 69efd333731..3b6c13ff0e3 100644 --- a/src/app/organization/organizationPeopleEditController.js +++ b/src/app/organization/organizationPeopleEditController.js @@ -27,7 +27,7 @@ } $scope.email = user.Email; $scope.type = user.Type; - $scope.accessAllCollections = user.AccessAllCollections; + $scope.accessAll = user.AccessAll; $scope.selectedCollections = collections; }); }); @@ -76,7 +76,7 @@ $scope.submitPromise = null; $scope.submit = function (model) { var collections = []; - if (!$scope.accessAllCollections) { + if (!$scope.accessAll) { for (var collectionId in $scope.selectedCollections) { if ($scope.selectedCollections.hasOwnProperty(collectionId)) { collections.push($scope.selectedCollections[collectionId]); @@ -87,7 +87,7 @@ $scope.submitPromise = apiService.organizationUsers.put({ orgId: $state.params.orgId, id: id }, { type: $scope.type, collections: collections, - accessAllCollections: $scope.accessAllCollections + accessAll: $scope.accessAll }, function () { $analytics.eventTrack('Edited User'); $uibModalInstance.close(); diff --git a/src/app/organization/organizationPeopleInviteController.js b/src/app/organization/organizationPeopleInviteController.js index d8ad5c98019..f0b0e2e63ad 100644 --- a/src/app/organization/organizationPeopleInviteController.js +++ b/src/app/organization/organizationPeopleInviteController.js @@ -64,7 +64,7 @@ $scope.submit = function (model) { var collections = []; - if (!model.accessAllCollections) { + if (!model.accessAll) { for (var collectionId in $scope.selectedCollections) { if ($scope.selectedCollections.hasOwnProperty(collectionId)) { collections.push($scope.selectedCollections[collectionId]); @@ -76,7 +76,7 @@ email: model.email, type: model.type, collections: collections, - accessAllCollections: model.accessAllCollections + accessAll: model.accessAll }, function () { $analytics.eventTrack('Invited User'); $uibModalInstance.close(); diff --git a/src/app/organization/views/organizationCollectionsUsers.html b/src/app/organization/views/organizationCollectionsUsers.html index f7bfcc9e92d..aaba7f52ef5 100644 --- a/src/app/organization/views/organizationCollectionsUsers.html +++ b/src/app/organization/views/organizationCollectionsUsers.html @@ -43,7 +43,7 @@
{{user.name}}
- + diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html index 8e4cb2cb8f4..8034b74f898 100644 --- a/src/app/organization/views/organizationPeople.html +++ b/src/app/organization/views/organizationPeople.html @@ -64,8 +64,8 @@ {{user.email}} - +
{{user.name}}
diff --git a/src/app/organization/views/organizationPeopleEdit.html b/src/app/organization/views/organizationPeopleEdit.html index 3cdb05c9ab5..39f35c582f1 100644 --- a/src/app/organization/views/organizationPeopleEdit.html +++ b/src/app/organization/views/organizationPeopleEdit.html @@ -31,22 +31,22 @@ -

Collection Access

+

Access

-
+
Loading collections...
diff --git a/src/app/organization/views/organizationPeopleInvite.html b/src/app/organization/views/organizationPeopleInvite.html index cc06d4bafee..2c949b3137e 100644 --- a/src/app/organization/views/organizationPeopleInvite.html +++ b/src/app/organization/views/organizationPeopleInvite.html @@ -39,22 +39,22 @@
-

Collection Access

+

Access

-
+
Loading collections...