1
0
mirror of https://github.com/bitwarden/web synced 2025-12-06 00:03:28 +00:00

rename AccessAllCollections => AccessAll

This commit is contained in:
Kyle Spearrin
2017-04-27 15:36:18 -04:00
parent b5f8b1014e
commit 54172c441f
8 changed files with 24 additions and 24 deletions

View File

@@ -27,7 +27,7 @@
type: userList.Data[i].Type, type: userList.Data[i].Type,
status: userList.Data[i].Status, status: userList.Data[i].Status,
readOnly: userList.Data[i].ReadOnly, readOnly: userList.Data[i].ReadOnly,
accessAllCollections: userList.Data[i].AccessAllCollections accessAll: userList.Data[i].AccessAll
}); });
} }
$scope.users = users; $scope.users = users;

View File

@@ -94,7 +94,7 @@
email: list.Data[i].Email, email: list.Data[i].Email,
status: list.Data[i].Status, status: list.Data[i].Status,
type: list.Data[i].Type, type: list.Data[i].Type,
accessAllCollections: list.Data[i].AccessAllCollections accessAll: list.Data[i].AccessAll
}; };
users.push(user); users.push(user);

View File

@@ -27,7 +27,7 @@
} }
$scope.email = user.Email; $scope.email = user.Email;
$scope.type = user.Type; $scope.type = user.Type;
$scope.accessAllCollections = user.AccessAllCollections; $scope.accessAll = user.AccessAll;
$scope.selectedCollections = collections; $scope.selectedCollections = collections;
}); });
}); });
@@ -76,7 +76,7 @@
$scope.submitPromise = null; $scope.submitPromise = null;
$scope.submit = function (model) { $scope.submit = function (model) {
var collections = []; var collections = [];
if (!$scope.accessAllCollections) { if (!$scope.accessAll) {
for (var collectionId in $scope.selectedCollections) { for (var collectionId in $scope.selectedCollections) {
if ($scope.selectedCollections.hasOwnProperty(collectionId)) { if ($scope.selectedCollections.hasOwnProperty(collectionId)) {
collections.push($scope.selectedCollections[collectionId]); collections.push($scope.selectedCollections[collectionId]);
@@ -87,7 +87,7 @@
$scope.submitPromise = apiService.organizationUsers.put({ orgId: $state.params.orgId, id: id }, { $scope.submitPromise = apiService.organizationUsers.put({ orgId: $state.params.orgId, id: id }, {
type: $scope.type, type: $scope.type,
collections: collections, collections: collections,
accessAllCollections: $scope.accessAllCollections accessAll: $scope.accessAll
}, function () { }, function () {
$analytics.eventTrack('Edited User'); $analytics.eventTrack('Edited User');
$uibModalInstance.close(); $uibModalInstance.close();

View File

@@ -64,7 +64,7 @@
$scope.submit = function (model) { $scope.submit = function (model) {
var collections = []; var collections = [];
if (!model.accessAllCollections) { if (!model.accessAll) {
for (var collectionId in $scope.selectedCollections) { for (var collectionId in $scope.selectedCollections) {
if ($scope.selectedCollections.hasOwnProperty(collectionId)) { if ($scope.selectedCollections.hasOwnProperty(collectionId)) {
collections.push($scope.selectedCollections[collectionId]); collections.push($scope.selectedCollections[collectionId]);
@@ -76,7 +76,7 @@
email: model.email, email: model.email,
type: model.type, type: model.type,
collections: collections, collections: collections,
accessAllCollections: model.accessAllCollections accessAll: model.accessAll
}, function () { }, function () {
$analytics.eventTrack('Invited User'); $analytics.eventTrack('Invited User');
$uibModalInstance.close(); $uibModalInstance.close();

View File

@@ -43,7 +43,7 @@
<div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div> <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
</td> </td>
<td style="width: 60px;" class="text-right"> <td style="width: 60px;" class="text-right">
<i class="fa fa-share-alt" ng-show="user.accessAllCollections" title="Can Access All Collections"></i> <i class="fa fa-unlock" ng-show="user.accessAll" title="Can Access All Items"></i>
<i class="fa fa-pencil-square-o" ng-show="!user.readOnly" title="Can Edit"></i> <i class="fa fa-pencil-square-o" ng-show="!user.readOnly" title="Can Edit"></i>
</td> </td>
<td style="width: 100px;"> <td style="width: 100px;">

View File

@@ -64,8 +64,8 @@
</td> </td>
<td> <td>
<a href="javascript:void(0)" ng-click="edit(user.id)">{{user.email}}</a> <a href="javascript:void(0)" ng-click="edit(user.id)">{{user.email}}</a>
<i class="fa fa-share-alt text-muted" ng-show="user.accessAllCollections" <i class="fa fa-unlock text-muted" ng-show="user.accessAll"
title="Can Access All Collections"></i> title="Can Access All Items"></i>
<div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div> <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
</td> </td>
<td style="width: 100px;"> <td style="width: 100px;">

View File

@@ -31,22 +31,22 @@
</label> </label>
</div> </div>
</div> </div>
<h4>Collection Access</h4> <h4>Access</h4>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" ng-model="accessAllCollections" name="AccessAllCollections" <input type="radio" ng-model="accessAll" name="AccessAll"
ng-value="true" ng-checked="accessAllCollections"> ng-value="true" ng-checked="accessAll">
This user can access and modify items in <u>all</u> collections. This user can access and modify <u>all items</u>.
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" ng-model="accessAllCollections" name="AccessAllCollections" <input type="radio" ng-model="accessAll" name="AccessAll"
ng-value="false" ng-checked="!accessAllCollections"> ng-value="false" ng-checked="!accessAll">
This user can access only the selected collections. This user can access only the selected collections.
</label> </label>
</div> </div>
<div ng-show="!accessAllCollections"> <div ng-show="!accessAll">
<div ng-show="loading && !collections.length"> <div ng-show="loading && !collections.length">
Loading collections... Loading collections...
</div> </div>

View File

@@ -39,22 +39,22 @@
</label> </label>
</div> </div>
</div> </div>
<h4>Collection Access</h4> <h4>Access</h4>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" ng-model="model.accessAllCollections" name="AccessAllCollections" <input type="radio" ng-model="model.accessAll" name="AccessAll"
ng-value="true" ng-checked="model.accessAllCollections"> ng-value="true" ng-checked="model.accessAll">
This user can access and modify items in <u>all</u> collections. This user can access and modify <u>all items</u>.
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" ng-model="model.accessAllCollections" name="AccessAllCollections" <input type="radio" ng-model="model.accessAll" name="AccessAll"
ng-value="false" ng-checked="!model.accessAllCollections"> ng-value="false" ng-checked="!model.accessAll">
This user can access only the selected collections. This user can access only the selected collections.
</label> </label>
</div> </div>
<div ng-show="!model.accessAllCollections"> <div ng-show="!model.accessAll">
<div ng-show="loading && !collections.length"> <div ng-show="loading && !collections.length">
Loading collections... Loading collections...
</div> </div>