Attachment 4286 Details for Bug 26604

[patch] deferred_wizard

26604-deferred_wizard.patch (text/plain), 2.19 KB, created by Jascha Geerds on 2012-03-23 16:06 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Jascha Geerds

Created: 2012-03-23 16:06 CET

Size: 2.19 KB

patch

obsolete

>Index: debian/changelog
>===================================================================
>--- debian/changelog	(Revision 31530)
>+++ debian/changelog	(Revision 31725)
>@@ -1,3 +1,16 @@
>+univention-management-console-frontend (1.0.310-1) unstable; urgency=low
>+
>+  * Wizard: fix last commit (Bug #26603)
>+
>+ -- Jascha Geerds <geerds@univention.de>  Fri, 23 Mar 2012 16:02:08 +0100
>+
>+univention-management-console-frontend (1.0.309-1) unstable; urgency=low
>+
>+  * Wizard: next/previous functions now accept deferred objects
>+    as return value (Bug #26603)
>+
>+ -- Jascha Geerds <geerds@univention.de>  Fri, 23 Mar 2012 15:29:20 +0100
>+
> univention-management-console-frontend (1.0.308-1) unstable; urgency=low
> 
>   * Form: on save, distinguish between put() and add(); Bug #26542
>Index: umc/widgets/Wizard.js
>===================================================================
>--- umc/widgets/Wizard.js	(Revision 31530)
>+++ umc/widgets/Wizard.js	(Revision 31725)
>@@ -188,12 +188,13 @@
> 
> 	_next: function(/*String*/ currentPage) {
> 		// update visibilty of buttons and show next page
>-		var nextPage = this.next(currentPage);
>-		if (!nextPage) {
>-			throw new Error('ERROR: received invalid page name [' + dojo.toJson(nextPage) + '] for Wizard.next(' + dojo.toJson(currentPage) + ')');
>-		}
>-		this._updateButtons(nextPage);
>-		this.selectChild(this._pages[nextPage]);
>+		dojo.when(this.next(currentPage), dojo.hitch(this, function(nextPage) {
>+			if (!nextPage) {
>+				throw new Error('ERROR: received invalid page name [' + dojo.toJson(nextPage) + '] for Wizard.next(' + dojo.toJson(currentPage) + ')');
>+			}
>+			this._updateButtons(nextPage);
>+			this.selectChild(this._pages[nextPage]);
>+		}));
> 	},
> 
> 	next: function(/*String*/ pageName) {
>@@ -226,9 +227,10 @@
> 
> 	_previous: function(/*String*/ currentPage) {
> 		// update visibilty of buttons and show previous page
>-		var previousPage = this.previous(currentPage);
>-		this._updateButtons(previousPage);
>-		this.selectChild(this._pages[previousPage]);
>+		dojo.when(this.previous(currentPage), dojo.hitch(this, function(previousPage) {
>+			this._updateButtons(previousPage);
>+			this.selectChild(this._pages[previousPage]);
>+		}));
> 	},
> 
> 	previous: function(/*String*/ pageName) {

Actions: View | Diff

Attachments on bug 26604: 4285 | 4286