safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 06:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-932: Provide flag-based view for PermissionSets. Use ngModel instead of ngChecked for permission checkboxes in user edit UI.

Browse Source
This commit is contained in:
Michael Jumper
2014-12-23 01:40:23 -08:00
parent c26d5a77ab
commit f564e26fd1
5 changed files with 170 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
View File

@@ -27,8 +27,9 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
function manageUserController($scope, $injector) {
// Required types
var ConnectionGroup = $injector.get('ConnectionGroup');
var PermissionSet = $injector.get('PermissionSet');
var ConnectionGroup = $injector.get('ConnectionGroup');
var PermissionFlagSet = $injector.get('PermissionFlagSet');
var PermissionSet = $injector.get('PermissionSet');
// Required services
var $location = $injector.get('$location');
@@ -63,7 +64,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
// Pull user permissions
permissionService.getPermissions(username).success(function gotPermissions(permissions) {
$scope.permissions = permissions;
$scope.permissionFlags = PermissionFlagSet.fromPermissionSet(permissions);
});
// Retrieve all connections for which we have UPDATE permission
@@ -101,76 +102,19 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
$scope.groupListContext = {
/**
* Determines whether read permission for the connection having the
* given identifier is granted for the user being edited.
*
* @param {String} identifier
* The identifier of the connection to check.
*
* @returns {Boolean}
* true if the user has read permission for the given connection,
* false if the user lacks read permission, or the permissions have
* not yet been loaded.
* Returns the PermissionFlagSet that contains the current state of
* granted permissions.
*
* @returns {PermissionFlagSet}
* The PermissionFlagSet describing the current state of granted
* permissions for the user being edited.
*/
canReadConnection : function canReadConnection(identifier) {
// Assume no permission if permissions not available yet
if (!$scope.permissions)
return false;
// Return whether READ permission is present
return PermissionSet.hasConnectionPermission($scope.permissions, PermissionSet.ObjectPermissionType.READ, identifier);
},
/**
* Determines whether read permission for the connection group having
* the given identifier is granted for the user being edited.
*
* @param {String} identifier
* The identifier of the connection group to check.
*
* @returns {Boolean}
* true if the user has read permission for the given connection
* group, false if the user lacks read permission, or the
* permissions have not yet been loaded.
*/
canReadConnectionGroup : function canReadConnectionGroup(identifier) {
// Assume no permission if permissions not available yet
if (!$scope.permissions)
return false;
// Return whether READ permission is present
return PermissionSet.hasConnectionGroupPermission($scope.permissions, PermissionSet.ObjectPermissionType.READ, identifier);
getPermissionFlags : function getPermissionFlags() {
return $scope.permissionFlags;
}
};
/**
* Determines whether the given system permission is granted for the
* user being edited.
*
* @param {String} type
* The type string of the system permission to check.
*
* @returns {Boolean}
* true if the user has the given system permission, false if the
* user lacks the given system permission, or the permissions have
* not yet been loaded.
*/
$scope.hasSystemPermission = function hasSystemPermission(type) {
// Assume no permission if permissions not available yet
if (!$scope.permissions)
return false;
// Return whether given permission is present
return PermissionSet.hasSystemPermission($scope.permissions, type);
};
/**
* Cancels all pending edits, returning to the management page.
*/

2
guacamole/src/main/webapp/app/manage/templates/connectionGroupPermission.html
View File

@@ -21,6 +21,6 @@
THE SOFTWARE.
-->
<input type="checkbox" ng-checked="context.canReadConnectionGroup(item.identifier)"/>
<input type="checkbox" ng-model="context.getPermissionFlags().connectionGroupPermissions.READ[item.identifier]"/>
<span class="name">{{item.name}}</span>
</div>

2
guacamole/src/main/webapp/app/manage/templates/connectionPermission.html
View File

@@ -27,7 +27,7 @@
</div>
<!-- Checkbox -->
<input type="checkbox" ng-checked="context.canReadConnection(item.identifier)"/>
<input type="checkbox" ng-model="context.getPermissionFlags().connectionPermissions.READ[item.identifier]"/>
<!-- Connection name -->
<span class="name">{{item.name}}</span>

2
guacamole/src/main/webapp/app/manage/templates/manageUser.html
View File

@@ -53,7 +53,7 @@ THE SOFTWARE.
<table class="properties">
<tr ng-repeat="systemPermissionType in systemPermissionTypes">
<th>{{systemPermissionType.label | translate}}</th>
<td><input type="checkbox" ng-checked="hasSystemPermission(systemPermissionType.value)"/></td>
<td><input type="checkbox" ng-model="permissionFlags.systemPermissions[systemPermissionType.value]"/></td>
</tr>
</table>
</div>