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

GUAC-1120: Move notifications into own service.

Browse Source
This commit is contained in:
Michael Jumper
2015-03-12 15:57:53 -07:00
parent 0d83f0e83d
commit 4475fcb7fb
13 changed files with 219 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
var $location = $injector.get('$location');
var $routeParams = $injector.get('$routeParams');
var authenticationService = $injector.get('authenticationService');
var guacNotification = $injector.get('guacNotification');
var connectionService = $injector.get('connectionService');
var connectionGroupService = $injector.get('connectionGroupService');
var permissionService = $injector.get('permissionService');
@@ -50,7 +51,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
name : "MANAGE_CONNECTION.ACTION_ACKNOWLEDGE",
// Handle action
callback : function acknowledgeCallback() {
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -317,7 +318,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
// Notify of any errors
.error(function connectionSaveFailed(error) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE_CONNECTION.DIALOG_HEADER_ERROR',
'text' : error.message,
@@ -337,7 +338,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
// Handle action
callback : function deleteCallback() {
deleteConnectionImmediately();
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -349,7 +350,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
name : "MANAGE_CONNECTION.ACTION_CANCEL",
// Handle action
callback : function cancelCallback() {
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -367,7 +368,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
// Notify of any errors
.error(function connectionDeletionFailed(error) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE_CONNECTION.DIALOG_HEADER_ERROR',
'text' : error.message,
@@ -384,7 +385,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
$scope.deleteConnection = function deleteConnection() {
// Confirm deletion request
$scope.showStatus({
guacNotification.showStatus({
'title' : 'MANAGE_CONNECTION.DIALOG_HEADER_CONFIRM_DELETE',
'text' : 'MANAGE_CONNECTION.TEXT_CONFIRM_DELETE',
'actions' : [ DELETE_ACTION, CANCEL_ACTION]

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

@@ -35,6 +35,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
var $routeParams = $injector.get('$routeParams');
var authenticationService = $injector.get('authenticationService');
var connectionGroupService = $injector.get('connectionGroupService');
var guacNotification = $injector.get('guacNotification');
var permissionService = $injector.get('permissionService');
/**
@@ -45,7 +46,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
name : "MANAGE_CONNECTION_GROUP.ACTION_ACKNOWLEDGE",
// Handle action
callback : function acknowledgeCallback() {
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -187,7 +188,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
// Notify of any errors
.error(function connectionGroupSaveFailed(error) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE_CONNECTION_GROUP.DIALOG_HEADER_ERROR',
'text' : error.message,
@@ -207,7 +208,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
// Handle action
callback : function deleteCallback() {
deleteConnectionGroupImmediately();
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -219,7 +220,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
name : "MANAGE_CONNECTION_GROUP.ACTION_CANCEL",
// Handle action
callback : function cancelCallback() {
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -237,7 +238,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
// Notify of any errors
.error(function connectionGroupDeletionFailed(error) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE_CONNECTION_GROUP.DIALOG_HEADER_ERROR',
'text' : error.message,
@@ -254,7 +255,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
$scope.deleteConnectionGroup = function deleteConnectionGroup() {
// Confirm deletion request
$scope.showStatus({
guacNotification.showStatus({
'title' : 'MANAGE_CONNECTION_GROUP.DIALOG_HEADER_CONFIRM_DELETE',
'text' : 'MANAGE_CONNECTION_GROUP.TEXT_CONFIRM_DELETE',
'actions' : [ DELETE_ACTION, CANCEL_ACTION]

5
guacamole/src/main/webapp/app/manage/controllers/manageController.js
View File

@@ -35,6 +35,7 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
var $location = $injector.get('$location');
var authenticationService = $injector.get('authenticationService');
var connectionGroupService = $injector.get('connectionGroupService');
var guacNotification = $injector.get('guacNotification');
var permissionService = $injector.get('permissionService');
var userService = $injector.get('userService');
@@ -49,7 +50,7 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
name : "MANAGE.ACTION_ACKNOWLEDGE",
// Handle action
callback : function acknowledgeCallback() {
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -232,7 +233,7 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
// Notify of any errors
.error(function userCreationFailed(error) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE.DIALOG_HEADER_ERROR',
'text' : error.message,

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

@@ -36,6 +36,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
var $routeParams = $injector.get('$routeParams');
var authenticationService = $injector.get('authenticationService');
var connectionGroupService = $injector.get('connectionGroupService');
var guacNotification = $injector.get('guacNotification');
var userService = $injector.get('userService');
var permissionService = $injector.get('permissionService');
@@ -47,7 +48,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
name : "MANAGE_USER.ACTION_ACKNOWLEDGE",
// Handle action
callback : function acknowledgeCallback() {
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -409,7 +410,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
// Verify passwords match
if ($scope.passwordMatch !== $scope.user.password) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE_USER.DIALOG_HEADER_ERROR',
'text' : 'MANAGE_USER.ERROR_PASSWORD_MISMATCH',
@@ -430,7 +431,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
// Notify of any errors
.error(function userPermissionsPatchFailed(error) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE_USER.DIALOG_HEADER_ERROR',
'text' : error.message,
@@ -442,7 +443,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
// Notify of any errors
.error(function userSaveFailed(error) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE_USER.DIALOG_HEADER_ERROR',
'text' : error.message,
@@ -462,7 +463,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
// Handle action
callback : function deleteCallback() {
deleteUserImmediately();
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -474,7 +475,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
name : "MANAGE_USER.ACTION_CANCEL",
// Handle action
callback : function cancelCallback() {
$scope.showStatus(false);
guacNotification.showStatus(false);
}
};
@@ -492,7 +493,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
// Notify of any errors
.error(function userDeletionFailed(error) {
$scope.showStatus({
guacNotification.showStatus({
'className' : 'error',
'title' : 'MANAGE_USER.DIALOG_HEADER_ERROR',
'text' : error.message,
@@ -509,7 +510,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
$scope.deleteUser = function deleteUser() {
// Confirm deletion request
$scope.showStatus({
guacNotification.showStatus({
'title' : 'MANAGE_USER.DIALOG_HEADER_CONFIRM_DELETE',
'text' : 'MANAGE_USER.TEXT_CONFIRM_DELETE',
'actions' : [ DELETE_ACTION, CANCEL_ACTION]

10
guacamole/src/main/webapp/app/manage/manageModule.js
View File

@@ -23,5 +23,11 @@
/**
* The module for the administration functionality.
*/
angular.module('manage', ['groupList', 'locale', 'pager', 'rest', 'userMenu']);
angular.module('manage', [
'groupList',
'locale',
'notification',
'pager',
'rest',
'userMenu'
]);