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

GUACAMOLE-526: Move handling of request error notification to guacNotification, resolving circular dependency.

Browse Source
This commit is contained in:
Michael Jumper
2018-04-26 22:28:18 -07:00
parent 266b445c21
commit ae6b5fc8bb
10 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,7 +379,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
connectionService.saveConnection($scope.selectedDataSource, $scope.connection)
.then(function savedConnection() {
$location.url('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
};
@@ -419,7 +419,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
connectionService.deleteConnection($scope.selectedDataSource, $scope.connection)
.then(function deletedConnection() {
$location.path('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
};

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

@@ -221,7 +221,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
connectionGroupService.saveConnectionGroup($scope.selectedDataSource, $scope.connectionGroup)
.then(function savedConnectionGroup() {
$location.path('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
};
@@ -261,7 +261,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
connectionGroupService.deleteConnectionGroup($scope.selectedDataSource, $scope.connectionGroup)
.then(function deletedConnectionGroup() {
$location.path('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
};

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

@@ -342,7 +342,7 @@ angular.module('manage').controller('manageSharingProfileController', ['$scope',
sharingProfileService.saveSharingProfile($scope.selectedDataSource, $scope.sharingProfile)
.then(function savedSharingProfile() {
$location.url('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
};
@@ -370,7 +370,7 @@ angular.module('manage').controller('manageSharingProfileController', ['$scope',
sharingProfileService.deleteSharingProfile($scope.selectedDataSource, $scope.sharingProfile)
.then(function deletedSharingProfile() {
$location.path('/settings/' + encodeURIComponent($scope.selectedDataSource) + '/connections');
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
};

6
guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
View File

@@ -1141,9 +1141,9 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
permissionService.patchPermissions(selectedDataSource, $scope.user.username, permissionsAdded, permissionsRemoved)
.then(function patchedUserPermissions() {
$location.url('/settings/users');
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
};
@@ -1183,7 +1183,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
userService.deleteUser(selectedDataSource, $scope.user)
.then(function deletedUser() {
$location.path('/settings/users');
}, requestService.SHOW_NOTIFICATION);
}, guacNotification.SHOW_REQUEST_ERROR);
};