safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-11 15:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1133 Split out session, user, and connection manage pages, rudimentary session management interface.

Browse Source
This commit is contained in:
James Muehlner
2015-03-17 23:19:21 -07:00
parent 803d85f4b5
commit 06b68a6834
12 changed files with 791 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
guacamole/src/main/webapp/app/userMenu/directives/guacUserMenu.js
View File

@@ -89,23 +89,64 @@ angular.module('userMenu').directive('guacUserMenu', [function guacUserMenu() {
$scope.homeDisabled = ($location.path() === '/');
/**
* Whether the option to go to the management interface is
* disabled. Note that shis is different from canManageGuacamole,
* Whether the option to go to the user management interface is
* disabled. Note that shis is different from canManageUsers,
* which deals with whether permission to manage is granted. A user
* may have permission, yet see this option as currently disabled.
*
* @type Boolean
*/
$scope.manageDisabled = ($location.path() === '/manage/');
$scope.manageUsersDisabled =
($location.path() === '/manage/modules/user');
/**
* Whether the current user has sufficient permissions to use the
* management interface. If permissions have not yet been loaded,
* this will be null.
* Whether the option to go to the connection management interface is
* disabled. Note that shis is different from canManageConnections,
* which deals with whether permission to manage is granted. A user
* may have permission, yet see this option as currently disabled.
*
* @type Boolean
*/
$scope.canManageGuacamole = null;
$scope.manageConnectionsDisabled =
($location.path() === '/manage/modules/connections');
/**
* Whether the option to go to the session management interface is
* disabled. Note that shis is different from canManageConnections,
* which deals with whether permission to manage is granted. A user
* may have permission, yet see this option as currently disabled.
*
* @type Boolean
*/
$scope.manageSessionsDisabled =
($location.path() === '/manage/modules/sessions');
/**
* Whether the current user has sufficient permissions to use the
* user management interface. If permissions have not yet been
* loaded, this will be null.
*
* @type Boolean
*/
$scope.canManageUsers = null;
/**
* Whether the current user has sufficient permissions to use the
* connection management interface. If permissions have not yet been
* loaded, this will be null.
*
* @type Boolean
*/
$scope.canManageConnections = null;
/**
* Whether the current user has sufficient permissions to use the
* session management interface. If permissions have not yet been
* loaded, this will be null.
*
* @type Boolean
*/
$scope.canManageSessions = null;
/**
* Whether the current user has sufficient permissions to change
@@ -173,29 +214,46 @@ angular.module('userMenu').directive('guacUserMenu', [function guacUserMenu() {
// Ignore permission to update self
PermissionSet.removeUserPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE, $scope.username);
// Determine whether the current user needs access to the management UI
$scope.canManageGuacamole =
// Determine whether the current user needs access to the user management UI
$scope.canManageUsers =
// System permissions
PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER)
|| PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.CREATE_USER)
// Permission to update users
|| PermissionSet.hasUserPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE)
// Permission to delete users
|| PermissionSet.hasUserPermission(permissions, PermissionSet.ObjectPermissionType.DELETE)
// Permission to administer users
|| PermissionSet.hasUserPermission(permissions, PermissionSet.ObjectPermissionType.ADMINISTER);
// Determine whether the current user needs access to the connection management UI
$scope.canManageConnections =
// System permissions
PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER)
|| PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.CREATE_CONNECTION)
|| PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.CREATE_CONNECTION_GROUP)
// Permission to update objects
// Permission to update connections or connection groups
|| PermissionSet.hasConnectionPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE)
|| PermissionSet.hasConnectionGroupPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE)
|| PermissionSet.hasUserPermission(permissions, PermissionSet.ObjectPermissionType.UPDATE)
// Permission to delete objects
// Permission to delete connections or connection groups
|| PermissionSet.hasConnectionPermission(permissions, PermissionSet.ObjectPermissionType.DELETE)
|| PermissionSet.hasConnectionGroupPermission(permissions, PermissionSet.ObjectPermissionType.DELETE)
|| PermissionSet.hasUserPermission(permissions, PermissionSet.ObjectPermissionType.DELETE)
// Permission to administer objects
// Permission to administer connections or connection groups
|| PermissionSet.hasConnectionPermission(permissions, PermissionSet.ObjectPermissionType.ADMINISTER)
|| PermissionSet.hasConnectionGroupPermission(permissions, PermissionSet.ObjectPermissionType.ADMINISTER)
|| PermissionSet.hasUserPermission(permissions, PermissionSet.ObjectPermissionType.ADMINISTER);
|| PermissionSet.hasConnectionGroupPermission(permissions, PermissionSet.ObjectPermissionType.ADMINISTER);
$scope.canManageSessions =
// A user must be a system administrator to manage sessions
PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER);
});
@@ -289,10 +347,24 @@ angular.module('userMenu').directive('guacUserMenu', [function guacUserMenu() {
};
/**
* Navigates to the management interface.
* Navigates to the user management interface.
*/
$scope.manage = function manage() {
$location.path('/manage/');
$scope.manageUsers = function manageUsers() {
$location.path('/manage/modules/users');
};
/**
* Navigates to the connection management interface.
*/
$scope.manageConnections = function manageConnections() {
$location.path('/manage/modules/connections');
};
/**
* Navigates to the user session management interface.
*/
$scope.manageSessions = function manageSessions() {
$location.path('/manage/modules/sessions');
};
/**

18
guacamole/src/main/webapp/app/userMenu/styles/user-menu.css
View File

@@ -97,7 +97,7 @@
cursor: default;
margin: 0;
min-width: 1.75in;
min-width: 2in;
font-size: 1.25em;
font-weight: bold;
@@ -180,7 +180,9 @@
}
.user-menu .options li a.home,
.user-menu .options li a.manage,
.user-menu .options li a.manage-users,
.user-menu .options li a.manage-connections,
.user-menu .options li a.manage-sessions,
.user-menu .options li a.change-password,
.user-menu .options li a.logout {
background-repeat: no-repeat;
@@ -193,8 +195,16 @@
background-image: url('images/action-icons/guac-home-dark.png');
}
.user-menu .options li a.manage {
background-image: url('images/action-icons/guac-config-dark.png');
.user-menu .options li a.manage-users {
background-image: url('images/user-icons/guac-user.png');
}
.user-menu .options li a.manage-connections {
background-image: url('images/protocol-icons/guac-monitor.png');
}
.user-menu .options li a.manage-sessions {
background-image: url('images/protocol-icons/guac-plug.png');
}
.user-menu .options li a.change-password {

20
guacamole/src/main/webapp/app/userMenu/templates/guacUserMenu.html
View File

@@ -35,10 +35,24 @@
</a>
</li>
<!-- Manage -->
<!-- Manage Users -->
<li>
<a class="manage" ng-click="manage()" ng-class="{disabled: manageDisabled}" ng-show="canManageGuacamole" href="#/manage/">
{{'USER_MENU.ACTION_MANAGE' | translate}}
<a class="manage-users" ng-click="manageUsers()" ng-class="{disabled: manageUsersDisabled}" ng-show="canManageUsers" href="#/manage/modules/users">
{{'USER_MENU.ACTION_MANAGE_USERS' | translate}}
</a>
</li>
<!-- Manage Connections -->
<li>
<a class="manage-connections" ng-click="manageConnections()" ng-class="{disabled: manageConnectionsDisabled}" ng-show="canManageConnections" href="#/manage/modules/connections">
{{'USER_MENU.ACTION_MANAGE_CONNECTIONS' | translate}}
</a>
</li>
<!-- Manage Sessions -->
<li>
<a class="manage-sessions" ng-click="manageSessions()" ng-class="{disabled: manageSessionsDisabled}" ng-show="canManageSessions" href="#/manage/modules/sessions">
{{'USER_MENU.ACTION_MANAGE_SESSIONS' | translate}}
</a>
</li>