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

Merge branch 'master' into GUAC-546-REWRITE

Browse Source 
Conflicts:
	guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/protocol/ProtocolRetrievalService.java
	guacamole/src/main/webapp/scripts/admin-ui.js
	guacamole/src/main/webapp/scripts/service.js
This commit is contained in:
Michael Jumper
2014-11-23 13:06:12 -08:00
parent ad6d7a614e 534f4f45c1
commit b68f9a0a26
6 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
guacamole/src/main/webapp/app/manage/templates/connectionParameter.html
View File

@@ -22,6 +22,7 @@
-->
<input ng-show="parameterType === 'TEXT'" type="text" ng-model="connectionParameters[parameterName]"/>
<input ng-show="parameterType === 'NUMERIC'" type="number" ng-model="connectionParameters[parameterName]"/>
<input ng-show="parameterType === 'USERNAME'" type="text" ng-model="connectionParameters[parameterName]"/>
<input ng-show="parameterType === 'PASSWORD'" type="password" ng-model="connectionParameters[parameterName]"/>
<input ng-show="parameterType === 'BOOLEAN'" type="checkbox" ng-model="connectionParameters[parameterName]"/>
<select ng-show="parameterType === 'ENUM'" ng-model="connectionParameters[parameterName]" ng-options="option.value as 'protocol.' + connection.protocol + '.parameters.' + parameter.name + '.options.' + (option.value || 'empty') | translate for option in parameter.options | orderBy: value"></select>