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

GUACAMOLE-292: Remove now-unnecessary valuesOnly attribute of guacForm (reverts 4d7841a).

Browse Source
This commit is contained in:
Michael Jumper
2017-05-26 20:25:12 -07:00
parent a34d3facc4
commit 203afd1099
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
guacamole/src/main/webapp/app/form/directives/form.js
View File

@@ -64,16 +64,7 @@ angular.module('form').directive('guacForm', [function form() {
*
* @type Boolean
*/
modelOnly : '=',
/**
* Whether the contents of the form should be restricted to those
* fields/forms which have associated values defined within the
* given model object. By default, all fields will be shown.
*
* @type Boolean
*/
valuesOnly : '='
modelOnly : '='
},
templateUrl: 'app/form/templates/form.html',
@@ -193,18 +184,14 @@ angular.module('form').directive('guacForm', [function form() {
*/
$scope.isVisible = function isVisible(field) {
// Forms with valuesOnly set should display only fields with
// associated values in the model object
if ($scope.valuesOnly)
return field && $scope.values[field.name];
// All fields are visible if contents are not restricted to
// model properties only
if (!$scope.modelOnly)
return true;
// Forms with modelOnly set should display only fields with
// associated properties in the model object
if ($scope.modelOnly)
return field && (field.name in $scope.values);
// Otherwise, all fields are visible
return true;
// Otherwise, fields are only visible if they are present
// within the model
return field && (field.name in $scope.values);
};