GUACAMOLE-470: Allow TEXT fields to be associated with predefined sets of known-good values.

This commit is contained in:
Michael Jumper
2018-06-12 12:37:07 -07:00
parent a8bb6fe966
commit 426a7919b3
4 changed files with 66 additions and 1 deletions

View File

@@ -19,6 +19,8 @@
package org.apache.guacamole.form; package org.apache.guacamole.form;
import java.util.Collection;
/** /**
* Represents a basic text field. The field may generally contain any data, but * Represents a basic text field. The field may generally contain any data, but
* may not contain multiple lines. * may not contain multiple lines.
@@ -35,6 +37,21 @@ public class TextField extends Field {
super(name, Field.Type.TEXT); super(name, Field.Type.TEXT);
} }
/**
* Creates a new TextField with the given name and possible values. As a
* text field may contain any data by definition, any provided options are
* simply known-good values.
*
* @param name
* The unique name to associate with this field.
*
* @param options
* A set of known legal options for this field.
*/
public TextField(String name, Collection<String> options) {
super(name, Field.Type.TEXT, options);
}
/** /**
* Parses the given string, interpreting empty strings as equivalent to * Parses the given string, interpreting empty strings as equivalent to
* null. For all other cases, the given string is returned verbatim. * null. For all other cases, the given string is returned verbatim.

View File

@@ -0,0 +1,40 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* Controller for text fields.
*/
angular.module('form').controller('textFieldController', ['$scope', '$injector',
function textFieldController($scope, $injector) {
/**
* The ID of the datalist element that should be associated with the text
* field, providing a set of known-good values. If no such values are
* defined, this will be null.
*
* @type String
*/
$scope.dataListId = null;
// Generate unique ID for datalist, if applicable
if ($scope.field.options && $scope.field.options.length)
$scope.dataListId = $scope.field.name + '-datalist';
}]);

View File

@@ -44,6 +44,8 @@ angular.module('form').provider('formService', function formServiceProvider() {
* @type FieldType * @type FieldType
*/ */
'TEXT' : { 'TEXT' : {
module : 'form',
controller : 'textFieldController',
templateUrl : 'app/form/templates/textField.html' templateUrl : 'app/form/templates/textField.html'
}, },

View File

@@ -1 +1,7 @@
<input type="text" ng-model="model" autocorrect="off" autocapitalize="off"/> <div class="text-field">
<input type="text" ng-model="model" autocorrect="off" autocapitalize="off" ng-attr-list="{{ dataListId }}"/>
<datalist ng-if="dataListId" id="{{ dataListId }}">
<option ng-repeat="option in field.options | orderBy: option"
value="{{ option }}">{{ getFieldOption(option) | translate }}</option>
</datalist>
</div>