Attachment 10909 Details for Bug 54032 – timeout patch for tools.js

[patch] timeout patch for tools.js

0001-compress.patch (text/plain), 2.28 KB, created by Nikola Radovanovic on 2022-01-28 06:43:21 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Nikola Radovanovic

Created: 2022-01-28 06:43:21 CET

Size: 2.28 KB

patch

obsolete

>From 70d9259c61bfd8c6892152ec52676639388b1597 Mon Sep 17 00:00:00 2001
>From: Nikola Radovanovic <radovanovic.extern@univention.de>
>Date: Fri, 28 Jan 2022 06:36:27 +0100
>Subject: [PATCH] compress
>
>---
> management/univention-web/js/tools.js | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
>diff --git a/management/univention-web/js/tools.js b/management/univention-web/js/tools.js
>index 8e5b3c1dba..a6de1a460a 100644
>--- a/management/univention-web/js/tools.js
>+++ b/management/univention-web/js/tools.js
>@@ -139,22 +139,20 @@ define([
> 			if (umcConfig.anonymousMeta) {
> 				deferred.resolve(tools.status());
> 			} else {
>-				require(['umc/dialog'], function(_dialog) {
>-					// register the real umc/dialog module in the local scope
>-					var dialog = _dialog;
>-
>-					var metaData = xhr.get('/univention/get/meta?' + timestamp, {timeout: 10000});
>-
>-					metaData.then(lang.hitch(this, function(meta) {
>+				tools.umcpCommand('get/meta?' + timestamp, undefined, undefined, undefined, undefined, {timeout: 10000}).then(
>+					lang.hitch(this, function(meta) {
> 						lang.mixin(this._status, meta.result);
> 						deferred.resolve(tools.status());
>-					}), function (err){
>-						var message = _('Login call lasted too long. Please visit the <a href="https://help.univention.com/t/draft-login-call-lasted-too-long/19031">Help</a> to check for possible causes.');
>-
>-						dialog.warn(message);
>-						deferred.reject('Timeout occurred');
>+					}), function (err) {
>+						require(['umc/dialog'], function(_dialog) {
>+							// register the real umc/dialog module in the local scope
>+							var dialog = _dialog;
>+
>+							var message = _('Login call lasted too long. Please visit the <a href="https://help.univention.com/t/draft-login-call-lasted-too-long/19031" target="_blank">Help</a> to check for possible causes.');
>+							dialog.warn(message);
>+							deferred.reject('Timeout occurred');
>+						});
> 					});
>-				});
> 			}
> 			return deferred.promise;
> 		},
>@@ -559,6 +557,7 @@ define([
> 				var call = xhr.post(url, {
> 					data: body,
> 					handleAs: 'json',
>+					timeout: (args && args.timeout) ? args.timeout : null,
> 					headers: lang.mixin({
> 						'Accept-Language': i18nTools.defaultLang(),
> 						'Accept': 'application/json; q=1.0, text/html; q=0.3; */*; q=0.1',
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 54032: 10909