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

GUACAMOLE-220: Pull primary connection for new sharing profiles.

Browse Source
This commit is contained in:
Michael Jumper
2018-05-03 23:16:14 -07:00
parent 5028d85bb1
commit f5f516d82a
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
guacamole/src/main/webapp/app/manage/controllers/manageSharingProfileController.js
View File

@@ -205,11 +205,15 @@ angular.module('manage').controller('manageSharingProfileController', ['$scope',
* Loads skeleton sharing profile data, preparing the interface for
* creating a new sharing profile.
*
* @param {String} dataSource
* The unique identifier of the data source containing the sharing
* profile to be created.
*
* @returns {Promise}
* A promise which is resolved when the interface has been prepared for
* creating a new sharing profile.
*/
var loadSkeletonSharingProfile = function loadSkeletonSharingProfile() {
var loadSkeletonSharingProfile = function loadSkeletonSharingProfile(dataSource) {
// Use skeleton sharing profile object with no associated parameters
$scope.sharingProfile = new SharingProfile({
@@ -217,7 +221,14 @@ angular.module('manage').controller('manageSharingProfileController', ['$scope',
});
$scope.parameters = {};
return $q.resolve();
// Load connection object for associated primary connection
return connectionService.getConnection(
dataSource,
$scope.sharingProfile.primaryConnectionIdentifier
)
.then(function connectionRetrieved(connection) {
$scope.primaryConnection = connection;
});
};
@@ -243,7 +254,7 @@ angular.module('manage').controller('manageSharingProfileController', ['$scope',
// If we are creating a new sharing profile, populate skeleton sharing
// profile data
return loadSkeletonSharingProfile();
return loadSkeletonSharingProfile($scope.selectedDataSource);
};