mirror of
				https://github.com/gyurix1968/guacamole-client.git
				synced 2025-10-31 17:13:21 +00:00 
			
		
		
		
	GUACAMOLE-292: Display all object attributes if we are creating the object.
This commit is contained in:
		| @@ -299,6 +299,23 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i | ||||
|         $scope.parameters = {}; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Returns whether the current user can change/set all connection | ||||
|      * attributes for the connection being edited, regardless of whether those | ||||
|      * attributes are already explicitly associated with that connection. | ||||
|      * | ||||
|      * @returns {Boolean} | ||||
|      *     true if the current user can change all attributes for the | ||||
|      *     connection being edited, regardless of whether those attributes are | ||||
|      *     already explicitly associated with that connection, false otherwise. | ||||
|      */ | ||||
|     $scope.canChangeAllAttributes = function canChangeAllAttributes() { | ||||
|  | ||||
|         // All attributes can be set if we are creating the connection | ||||
|         return !identifier; | ||||
|  | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Returns the translation string namespace for the protocol having the | ||||
|      * given name. The namespace will be of the form: | ||||
|   | ||||
| @@ -195,7 +195,26 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope' | ||||
|             value : ConnectionGroup.Type.BALANCING | ||||
|         } | ||||
|     ]; | ||||
|      | ||||
|  | ||||
|     /** | ||||
|      * Returns whether the current user can change/set all connection group | ||||
|      * attributes for the connection group being edited, regardless of whether | ||||
|      * those attributes are already explicitly associated with that connection | ||||
|      * group. | ||||
|      * | ||||
|      * @returns {Boolean} | ||||
|      *     true if the current user can change all attributes for the | ||||
|      *     connection group being edited, regardless of whether those | ||||
|      *     attributes are already explicitly associated with that connection | ||||
|      *     group, false otherwise. | ||||
|      */ | ||||
|     $scope.canChangeAllAttributes = function canChangeAllAttributes() { | ||||
|  | ||||
|         // All attributes can be set if we are creating the connection group | ||||
|         return !identifier; | ||||
|  | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Cancels all pending edits, returning to the management page. | ||||
|      */ | ||||
|   | ||||
| @@ -280,6 +280,25 @@ angular.module('manage').controller('manageSharingProfileController', ['$scope', | ||||
|  | ||||
|     }); | ||||
|  | ||||
|     /** | ||||
|      * Returns whether the current user can change/set all sharing profile | ||||
|      * attributes for the sharing profile being edited, regardless of whether | ||||
|      * those attributes are already explicitly associated with that sharing | ||||
|      * profile. | ||||
|      * | ||||
|      * @returns {Boolean} | ||||
|      *     true if the current user can change all attributes for the sharing | ||||
|      *     profile being edited, regardless of whether those attributes are | ||||
|      *     already explicitly associated with that sharing profile, false | ||||
|      *     otherwise. | ||||
|      */ | ||||
|     $scope.canChangeAllAttributes = function canChangeAllAttributes() { | ||||
|  | ||||
|         // All attributes can be set if we are creating the sharing profile | ||||
|         return !identifier; | ||||
|  | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Returns the translation string namespace for the protocol having the | ||||
|      * given name. The namespace will be of the form: | ||||
|   | ||||
| @@ -225,8 +225,8 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Returns whether the current user can change attributes associated with | ||||
|      * the user being edited within the given data source. | ||||
|      * Returns whether the current user can change attributes explicitly | ||||
|      * associated with the user being edited within the given data source. | ||||
|      * | ||||
|      * @param {String} [dataSource] | ||||
|      *     The identifier of the data source to check. If omitted, this will | ||||
| @@ -260,6 +260,23 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto | ||||
|  | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Returns whether the current user can change/set all user attributes for | ||||
|      * the user being edited, regardless of whether those attributes are | ||||
|      * already explicitly associated with that user. | ||||
|      * | ||||
|      * @returns {Boolean} | ||||
|      *     true if the current user can change all attributes for the user | ||||
|      *     being edited, regardless of whether those attributes are already | ||||
|      *     explicitly associated with that user, false otherwise. | ||||
|      */ | ||||
|     $scope.canChangeAllAttributes = function canChangeAllAttributes() { | ||||
|  | ||||
|         // All attributes can be set if we are creating the user | ||||
|         return !$scope.userExists(selectedDataSource); | ||||
|  | ||||
|     }; | ||||
|  | ||||
|     /** | ||||
|      * Returns whether the current user can change permissions of any kind | ||||
|      * which are associated with the user being edited within the given data | ||||
|   | ||||
| @@ -41,7 +41,7 @@ | ||||
|     <!-- Connection attributes section --> | ||||
|     <div class="attributes"> | ||||
|         <guac-form namespace="'CONNECTION_ATTRIBUTES'" content="attributes" | ||||
|                    model="connection.attributes" model-only="true"></guac-form> | ||||
|                    model="connection.attributes" model-only="!canChangeAllAttributes()"></guac-form> | ||||
|     </div> | ||||
|  | ||||
|     <!-- Connection parameters --> | ||||
|   | ||||
| @@ -41,7 +41,7 @@ | ||||
|     <!-- Connection group attributes section --> | ||||
|     <div class="attributes"> | ||||
|         <guac-form namespace="'CONNECTION_GROUP_ATTRIBUTES'" content="attributes" | ||||
|                    model="connectionGroup.attributes" model-only="true"></guac-form> | ||||
|                    model="connectionGroup.attributes" model-only="!canChangeAllAttributes()"></guac-form> | ||||
|     </div> | ||||
|  | ||||
|     <!-- Form action buttons --> | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
|     <!-- Sharing profile attributes section --> | ||||
|     <div class="attributes"> | ||||
|         <guac-form namespace="'SHARING_PROFILE_ATTRIBUTES'" content="attributes" | ||||
|                    model="sharingProfile.attributes" model-only="true"></guac-form> | ||||
|                    model="sharingProfile.attributes" model-only="!canChangeAllAttributes()"></guac-form> | ||||
|     </div> | ||||
|  | ||||
|     <!-- Sharing profile parameters --> | ||||
|   | ||||
| @@ -42,7 +42,7 @@ | ||||
|         <!-- User attributes section --> | ||||
|         <div class="attributes" ng-show="canChangeAttributes()"> | ||||
|             <guac-form namespace="'USER_ATTRIBUTES'" content="attributes" | ||||
|                        model="user.attributes" model-only="true"></guac-form> | ||||
|                        model="user.attributes" model-only="!canChangeAllAttributes()"></guac-form> | ||||
|         </div> | ||||
|  | ||||
|         <!-- System permissions section --> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user