Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-30 13:03:53 +01:00
Code Issues Projects Releases Wiki Activity

rename AccessAllCollections => AccessAll

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/organization/organizationCollectionsUsersController.js
View File

@ -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;

2
src/app/organization/organizationPeopleController.js
View File

@ -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);

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

@ -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();

4
src/app/organization/organizationPeopleInviteController.js
View File

@ -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();

2
src/app/organization/views/organizationCollectionsUsers.html
View File

@ -43,7 +43,7 @@
<div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
</td>
<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>
</td>
<td style="width: 100px;">

4
src/app/organization/views/organizationPeople.html
View File

@ -64,8 +64,8 @@
</td>
<td>
<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"
title="Can Access All Collections"></i>
<i class="fa fa-unlock text-muted" ng-show="user.accessAll"
title="Can Access All Items"></i>
<div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
</td>
<td style="width: 100px;">

14
src/app/organization/views/organizationPeopleEdit.html
View File

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

14
src/app/organization/views/organizationPeopleInvite.html
View File

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