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

GUAC-605: Restore connection name handling.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-14 21:44:32 -08:00
parent 9fcd7af361
commit 5581fcc382
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -78,13 +78,13 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
$scope.clientProperties = new ClientProperties(); $scope.clientProperties = new ClientProperties();
// Hide menu by default // Hide menu by default
$scope.menuShown = false; $scope.menuShown = false;
// Convenience method for closing the menu // Convenience method for closing the menu
$scope.closeMenu = function closeMenu() { $scope.closeMenu = function closeMenu() {
$scope.menuShown = false; $scope.menuShown = false;
}; };
// Update the model when clipboard data received from client // Update the model when clipboard data received from client
$scope.$on('guacClientClipboard', function clipboardDataReceived(clipboardData) { $scope.$on('guacClientClipboard', function clipboardDataReceived(clipboardData) {
$scope.guacClipboard = clipboardData; $scope.guacClipboard = clipboardData;
@@ -99,19 +99,19 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
$scope.connectionParameters = $routeParams.params || ''; $scope.connectionParameters = $routeParams.params || '';
// Pull connection name from server // Pull connection name from server
switch ($scope.type) { switch ($routeParams.type) {
// Connection // Connection
case 'c': case 'c':
connectionDAO.getConnection($scope.id).success(function (connection) { connectionDAO.getConnection($routeParams.id).success(function (connection) {
$scope.page.title = connection.name; $scope.connectionName = $scope.page.title = connection.name;
}); });
break; break;
// Connection group // Connection group
case 'g': case 'g':
connectionGroupDAO.getConnectionGroup($scope.id).success(function (group) { connectionGroupDAO.getConnectionGroup($routeParams.id).success(function (group) {
$scope.page.title = group.name; $scope.connectionName = $scope.page.title = group.name;
}); });
break; break;

1
guacamole/src/main/webapp/app/client/directives/guacClient.js
View File

@@ -35,7 +35,6 @@ angular.module('client').directive('guacClient', [function guacClient() {
// Parameters for initially connecting // Parameters for initially connecting
id : '=', id : '=',
connectionName : '=',
connectionParameters : '=' connectionParameters : '='
}, },
templateUrl: 'app/client/templates/guacClient.html', templateUrl: 'app/client/templates/guacClient.html',

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

@@ -26,7 +26,6 @@
<guac-client <guac-client
client-properties="clientProperties" client-properties="clientProperties"
id="id" id="id"
connection-name="connectionName"
connection-parameters="connectionParameters" connection-parameters="connectionParameters"
></guac-client> ></guac-client>