Attachment #8872 for bug #44498

View | Details | Raw Unified | Return to bug 44498
Collapse All | Expand All

(-)a/management/univention-appcenter/umc/js/appcenter/AppDetailsPage.js (-3 / +6 lines)

Lines 957-963 define([	Link Here

957

					'values': values || {}

957

					'values': values || {}

958

};

958

};

959

960

				this._progressBar.reset(_('%s: Performing software tests on involved systems', entities.encode(this.app.name)));

960

				this._progressBar.reset(_('%s: Performing software tests on involved systems', this.app.name));

961

				this._progressBar._progressBar.set('value', Infinity); // TODO: Remove when this is done automatically by .reset()

961

				this._progressBar._progressBar.set('value', Infinity); // TODO: Remove when this is done automatically by .reset()

962

				var invokation;

962

				var invokation;

963

				if (this.app.installsAsDocker()) {

963

				if (this.app.installsAsDocker()) {

Lines 1082-1088 define([	Link Here

1082

			if (keepAlive !== false) {

1082

			if (keepAlive !== false) {

1083

				tools.umcpCommand('appcenter/keep_alive', {}, false);

1083

				tools.umcpCommand('appcenter/keep_alive', {}, false);

1084

1085

			msg = entities.encode(msg || _('Another package operation is in progress.'));

1085

			msg = msg || _('Another package operation is in progress.');

1086

			var callback = lang.hitch(this, function() {

1086

			var callback = lang.hitch(this, function() {

1087

				if (this._progressBar.getErrors().errors.length) {

1087

				if (this._progressBar.getErrors().errors.length) {

1088

					deferred.reject();

1088

					deferred.reject();

Lines 1110-1123 define([	Link Here

1110

					var role = match[2];

1110

					var role = match[2];

1111

					var host = match[3];

1111

					var host = match[3];

1112

					error = '<p>' + _('Installing the extension of the LDAP schema on %s seems to have failed.', '<strong>' + entities.encode(host) + '</strong>') + '</p>';

1112

					error = '<p>' + _('Installing the extension of the LDAP schema on %s seems to have failed.', '<strong>' + entities.encode(host) + '</strong>') + '</p>';

1113

					if (role == 'DC Backup') {

1113

					if (role === 'DC Backup') {

1114

						error += '<p>' + _('If everything else went correct and this is just a temporary network problem, you should execute %s as root on that backup system.', '<pre>univention-add-app ' + entities.encode(component) + ' -m</pre>') + '</p>';

1114

						error += '<p>' + _('If everything else went correct and this is just a temporary network problem, you should execute %s as root on that backup system.', '<pre>univention-add-app ' + entities.encode(component) + ' -m</pre>') + '</p>';

1115

1116

					error += '<p>' + _('Further information can be found in the following log file on each of the involved systems: %s', '<br /><em>/var/log/univention/management-console-module-appcenter.log</em>') + '</p>';

1116

					error += '<p>' + _('Further information can be found in the following log file on each of the involved systems: %s', '<br /><em>/var/log/univention/management-console-module-appcenter.log</em>') + '</p>';

1117

				} else {

1118

					error = entities.encode(error);

1117

1119

1118

				return error;

1120

				return error;

1119

});

1121

});

1120

			this._progressBar._errors = errors;

1122

			this._progressBar._errors = errors;

1123

			this._progressBar.allowHTMLErrors = true;

1121

			this._progressBar.stop(lang.hitch(this, 'restartOrReload'), undefined, true);

1124

			this._progressBar.stop(lang.hitch(this, 'restartOrReload'), undefined, true);

1122

},

1125

},

1123

1126

(-)a/management/univention-appcenter/umc/js/appcenter/PackagesPage.js (-2 / +2 lines)

Lines 418-425 define([	Link Here

418

419

];

419

];

420

				} else {

420

				} else {

421

					headline = _("Do you really want to %(verb)s %(ids)s?", {verb: verb, ids: array.map(ids, lang.hitch(entities, 'encode')).join(', ')});

421

					headline = _("Do you really want to %(verb)s %(ids)s?", {verb: verb, ids: ids.join(', ')});

422

					var msg = _("%(verb)s %(ids)s", {verb: verb1, ids: array.map(ids, lang.hitch(entities, 'encode')).join(', ')});

422

					var msg = _("%(verb)s %(ids)s", {verb: verb1, ids: ids.join(', ')});

423

					buttons = [

423

					buttons = [

424

425

							name: 'cancel',

425

							name: 'cancel',

(-)a/management/univention-web/js/widgets/ProgressBar.js (-3 / +12 lines)

Lines 46-51 define([	Link Here

		//		This class provides a widget providing detailed progress information

		//		This class provides a widget providing detailed progress information

		baseClass: 'umcProgressBar',

		baseClass: 'umcProgressBar',

		allowHTMLErrors: false,

		_component: null,

		_component: null,

		_message: null,

		_message: null,

		_progressBar: null,

		_progressBar: null,

Lines 86-92 define([	Link Here

			this._criticalError = false;

			this._criticalError = false;

			this._errors = [];

			this._errors = [];

			this._component.set('content', this._initialComponent);

			this._component.set('content', entities.encode(this._initialComponent));

			// make sure that at least a not breakable space is printed

			// make sure that at least a not breakable space is printed

			// ... this avoids vertical jumping of widgets

			// ... this avoids vertical jumping of widgets

Lines 172-181 define([	Link Here

172

			if (errors.length && handleErrors) {

174

			if (errors.length && handleErrors) {

173

				var msg = '';

175

				var msg = '';

174

				if (errors.length === 1) {

176

				if (errors.length === 1) {

175

					msg = _('An error occurred: ') + errors[0];

177

					msg = _('An error occurred: ') + this._encodeError(errors[0]);

176

				} else {

178

				} else {

177

					msg = lang.replace(_('{number} errors occurred: '), {number : errors.length});

179

					msg = lang.replace(_('{number} errors occurred: '), {number : errors.length});

178

					msg += '<ul><li>' + errors.join('</li><li>') + '</li></ul>';

180

					msg += '<ul><li>' + array.map(errors, lang.hitch(this, '_encodeError')).join('</li><li>') + '</li></ul>';

179

181

180

				dialog.confirm(msg, [{

182

				dialog.confirm(msg, [{

181

					label: 'Ok',

183

					label: 'Ok',

Lines 187-192 define([	Link Here

187

189

188

},

190

},

189

191

192

		_encodeError: function(error) {

193

			if (!this.allowHTMLErrors) {

194

				error = entities.encode(error);

195

196

			return error;

197

},

198

190

		getErrors: function() {

199

		getErrors: function() {

191

			return {'errors' : this._errors, 'critical' : this._criticalError};

200

			return {'errors' : this._errors, 'critical' : this._criticalError};

192

201

Return to bug 44498