Attachment 6343 Details for Bug 36569 – patch

[patch] patch

bug36569.patch (text/plain), 2.71 KB, created by Florian Best on 2014-11-11 13:48:00 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2014-11-11 13:48:00 CET

Size: 2.71 KB

patch

obsolete

>diff --git a/ucs-4.0-0/management/univention-management-console-module-services/umc/js/services.js b/ucs-4.0-0/management/univention-management-console-module-services/umc/js/services.js
>index bb06f93..e91f51c 100644
>--- a/ucs-4.0-0/management/univention-management-console-module-services/umc/js/services.js
>+++ b/ucs-4.0-0/management/univention-management-console-module-services/umc/js/services.js
>@@ -135,11 +135,11 @@ define([
> 			var columns = [{
> 				name: 'service',
> 				label: _('Name'),
>-            	width: '200px'
>+				width: '200px'
> 			}, {
> 				name: 'isRunning',
> 				label: _('Status'),
>-            	width: 'adjust',
>+				width: 'auto',
> 				formatter: lang.hitch(this, function(value) {
> 					if (value === true) {
> 						return _('running');
>@@ -150,7 +150,7 @@ define([
> 			}, {
> 				name: 'autostart',
> 				label: _('Start type'),
>-            	width: '100px',
>+				width: 'auto',
> 				formatter: lang.hitch(this, function(value) {
> 					if (value == 'no') {
> 						return _('Never');
>@@ -163,7 +163,7 @@ define([
> 			}, {
> 				name: 'description',
> 				label: _('Description'),
>-            	width: 'auto',
>+				width: 'auto',
> 				formatter: lang.hitch(this, function(value) {
> 					if (value === null) {
> 						return '-';
>@@ -203,6 +203,11 @@ define([
> 			this._page.startup();
>     	},
> 
>+		reloadGrid: function() {
>+			data = this._searchWidget.get('value');
>+			this._grid.filter(data);
>+		},
>+
> 		_changeState: function(data, command, confirmMessage, errorMessage) {
> 			confirmMessage += '<ul>';
> 			array.forEach(data, function(idata) {
>@@ -213,24 +218,17 @@ define([
> 			dialog.confirm(confirmMessage, [{
> 				label: _('OK'),
> 				callback: lang.hitch(this, function() {
>-					this.standby(true);
>-					tools.umcpCommand(command, data).then(
>-						lang.hitch(this, function(response) {
>-							this.standby(false);
>-							if (response.result.success === false) {
>-								errorMessage += '<ul>';
>-								array.forEach(response.result.objects, function(item) {
>-									errorMessage += '<li>' + item + '</li>';
>-								});
>-								errorMessage += '</ul>';
>-								dialog.alert(errorMessage);
>-							}
>-							data = this._searchWidget.get('value');
>-							this._grid.filter(data);
>-						}), lang.hitch(this, function() {
>-							this.standby(false);
>-						})
>-					);
>+					this.standbyDuring(tools.umcpCommand(command, data)).then(lang.hitch(this, function(response) {
>+						if (response.result.success === false) {
>+							errorMessage += '<ul>';
>+							array.forEach(response.result.objects, function(item) {
>+								errorMessage += '<li>' + item + '</li>';
>+							});
>+							errorMessage += '</ul>';
>+							dialog.alert(errorMessage);
>+						}
>+						this.reloadGrid();
>+					}));
> 				})
> 			}, {
> 				'default': true,

Actions: View | Diff

Attachments on bug 36569: 6342 | 6343