safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-932: Display the cog when parameters are not yet loaded.

Browse Source
This commit is contained in:
Michael Jumper
2014-12-21 20:00:38 -08:00
parent 086d9a9516
commit c3bdbcd013
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js
View File

@@ -36,7 +36,6 @@ angular.module('manage').controller('connectionEditModalController', ['$scope',
// Copy data into a new conection object in case the user doesn't want to save // Copy data into a new conection object in case the user doesn't want to save
$scope.connection = new Connection($scope.connection); $scope.connection = new Connection($scope.connection);
$scope.connection.parameters = {};
var newConnection = !$scope.connection.identifier; var newConnection = !$scope.connection.identifier;
@@ -60,6 +59,9 @@ angular.module('manage').controller('connectionEditModalController', ['$scope',
}); });
} }
else {
$scope.connection.parameters = {};
}
/** /**
* Close the modal. * Close the modal.

7
guacamole/src/main/webapp/app/manage/templates/editableConnection.html
View File

@@ -65,14 +65,17 @@ THE SOFTWARE.
</table> </table>
</dd> </dd>
<dd> <!-- Connection parameters -->
<dt>{{'manage.edit.connection.parameters' | translate}}</dt>
<dd ng-class="{loading: !connection.parameters}">
<table class="fields section"> <table class="fields section">
<!-- All the different possible editable field types --> <!-- All the different possible editable field types -->
<tr ng-repeat="parameter in protocols[connection.protocol].parameters"> <tr ng-repeat="parameter in protocols[connection.protocol].parameters">
<th>{{'protocol.' + connection.protocol + '.parameters.' + parameter.name + '.label' | translate}}:</th> <th>{{'protocol.' + connection.protocol + '.parameters.' + parameter.name + '.label' | translate}}:</th>
<td> <td>
<guac-connection-parameter protocol="protocols[connection.protocol]" name="parameter.name" value="connection.parameters[parameter.name]" /> <guac-connection-parameter protocol="protocols[connection.protocol]" name="parameter.name" parameters="connection.parameters"/>
</td> </td>
</tr> </tr>
</table> </table>

1
guacamole/src/main/webapp/translations/en_US.json
View File

@@ -46,6 +46,7 @@
"root" : "ROOT", "root" : "ROOT",
"location" : "Location:", "location" : "Location:",
"name" : "Name:", "name" : "Name:",
"parameters" : "Parameters:",
"history" : { "history" : {
"connectionNotUsed" : "This connection has not yet been used.", "connectionNotUsed" : "This connection has not yet been used.",
"usageHistory" : "Usage History:", "usageHistory" : "Usage History:",