Attachment 9104 Details for Bug 45162 – patch

[patch] patch

45162.patch (text/plain), 1.28 KB, created by Florian Best on 2017-08-08 15:57:32 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-08-08 15:57:32 CEST

Size: 1.28 KB

patch

obsolete

>diff --git a/management/univention-web/js/tools.js b/management/univention-web/js/tools.js
>index 70de553..0795200 100644
>--- a/management/univention-web/js/tools.js
>+++ b/management/univention-web/js/tools.js
>@@ -677,11 +677,12 @@ define([
> 					this.umcpProgressSubCommand({
> 						progressCmd: progressCmd,
> 						progressID: progressID,
>-						flavor: flavor
>+						flavor: flavor,
>+						errorHandler: errorHandler
> 					}).then(function() {
>-							deferred.resolve(allData);
>-					}, function() {
>-						deferred.reject();
>+						deferred.resolve(allData);
>+					}, function(error) {
>+						deferred.reject(error);
> 					}, function(result) {
> 						allData = allData.concat(result.intermediate);
> 						if (result.percentage === 'Infinity') { // FIXME: JSON cannot handle Infinity
>@@ -694,8 +695,8 @@ define([
> 						}
> 					});
> 				}),
>-				function() {
>-					deferred.reject(arguments);
>+				function(error) {
>+					deferred.reject(tools.parseError(error));
> 				}
> 			);
> 			return deferred;
>@@ -715,8 +716,8 @@ define([
> 						setTimeout(lang.hitch(this, 'umcpProgressSubCommand', lang.mixin({}, props, {deferred: deferred}), 200));
> 					}
> 				}),
>-				function() {
>-					deferred.reject();
>+				function(error) {
>+					deferred.reject(tools.parseError(error));
> 				}
> 			);
> 			return deferred;

Actions: View | Diff

Attachments on bug 45162: 9104