Attachment 8021 Details for Bug 41403 – svn diff -c r69692

[patch] svn diff -c r69692

bug41403.patch (text/plain), 3.27 KB, created by Alexander Kläser on 2016-09-20 12:01:04 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kläser

Created: 2016-09-20 12:01:04 CEST

Size: 3.27 KB

patch

obsolete

>Index: ucs-4.0/ucs-4.0-5/base/univention-updater/debian/changelog
>===================================================================
>--- ucs-4.0/ucs-4.0-5/base/univention-updater/debian/changelog	(Revision 69691)
>+++ ucs-4.0/ucs-4.0-5/base/univention-updater/debian/changelog	(Revision 69692)
>@@ -1,3 +1,9 @@
>+univention-updater (10.0.57-3) unstable; urgency=medium
>+
>+  * Bug #41353: adjust query for titlepanes
>+
>+ -- Alexander KlÃ¤ser <klaeser@univention.de>  Wed, 01 Jun 2016 13:00:16 +0200
>+
> univention-updater (10.0.57-2) unstable; urgency=medium
> 
>   Bug #41353:
>Index: ucs-4.0/ucs-4.0-5/base/univention-updater/umc/js/updater/UpdatesPage.js
>===================================================================
>--- ucs-4.0/ucs-4.0-5/base/univention-updater/umc/js/updater/UpdatesPage.js	(Revision 69691)
>+++ ucs-4.0/ucs-4.0-5/base/univention-updater/umc/js/updater/UpdatesPage.js	(Revision 69692)
>@@ -36,6 +36,7 @@
> 	"dojo/dom-class",
> 	"dojo/topic",
> 	"dojo/Deferred",
>+	"dijit/registry",
> 	"dojox/string/sprintf",
> 	"umc/dialog",
> 	"umc/app",
>@@ -45,7 +46,16 @@
> 	"umc/modules/updater/Page",
> 	"umc/modules/updater/Form",
> 	"umc/i18n!umc/modules/updater"
>-], function(declare, lang, array, all, domClass, topic, Deferred, sprintf, dialog, UMCApplication, tools, store, TitlePane, Page, Form, _) {
>+], function(declare, lang, array, all, domClass, topic, Deferred, dijitRegistry, sprintf, dialog, UMCApplication, tools, store, TitlePane, Page, Form, _) {
>+	var _getParentWidget = function(widget) {
>+		try {
>+			return dijitRegistry.getEnclosingWidget(widget.domNode.parentNode)
>+		} catch(e) {
>+			// could not access _widget.domNode.parentNode
>+			return null;
>+		}
>+	};
>+
> 	return declare("umc.modules.updater.UpdatesPage", Page, {
> 
> 		_last_reboot:	false,
>@@ -64,6 +74,21 @@
> 			});
> 		},
> 
>+		_getEnclosingTitlePane: function(widgetName) {
>+			var _widget = this._form.getWidget(widgetName) || this._form.getButton(widgetName);
>+			while (_widget != null) {
>+				if (_widget.isInstanceOf(TitlePane)) {
>+					// we successfully found the enclosing TitlePane of the given widget
>+					return _widget;
>+				}
>+				if (_widget.isInstanceOf(Form)) {
>+					// do not search beyond the form widget
>+					return null;
>+				}
>+				_widget = _getParentWidget(_widget);
>+			}
>+		},
>+
> 		buildRendering: function() {
> 
> 			this.inherited(arguments);
>@@ -81,7 +106,7 @@
> 					'class':		'umcUpdaterWarningText',
> 					visible:		false,
> 					label:			'',
>-					content:		'', // will be set bellow as soon as the UCS version is known
>+					content:		'', // will be set below as soon as the UCS version is known
> 				},
> 				{
> 					type:			'Text',
>@@ -469,10 +494,10 @@
> 			// fetch all known/initial titlepanes and save them with their name
> 			// so they can be used later on
> 			this._titlepanes = {
>-				reboot: this._form._container.getChildren()[0],
>-				easymode: this._form._container.getChildren()[1],
>-				release: this._form._container.getChildren()[2],
>-				packages: this._form._container.getChildren()[3]
>+				reboot: this._getEnclosingTitlePane('reboot'),
>+				easymode: this._getEnclosingTitlePane('easy_upgrade'),
>+				release: this._getEnclosingTitlePane('run_release_update'),
>+				packages: this._getEnclosingTitlePane('run_packages_update')
> 			};
> 
> 			// Before we attach the form to our page, just switch off all title panes.

Actions: View | Diff

Attachments on bug 41403: 8021