View | Details | Raw Unified | Return to bug 26604 | Differences between
and this patch

Collapse All | Expand All

(-)debian/changelog (+13 lines)
 Lines 1-3    Link Here 
1
univention-management-console-frontend (1.0.310-1) unstable; urgency=low
2
3
  * Wizard: fix last commit (Bug #26603)
4
5
 -- Jascha Geerds <geerds@univention.de>  Fri, 23 Mar 2012 16:02:08 +0100
6
7
univention-management-console-frontend (1.0.309-1) unstable; urgency=low
8
9
  * Wizard: next/previous functions now accept deferred objects
10
    as return value (Bug #26603)
11
12
 -- Jascha Geerds <geerds@univention.de>  Fri, 23 Mar 2012 15:29:20 +0100
13
1
univention-management-console-frontend (1.0.308-1) unstable; urgency=low
14
univention-management-console-frontend (1.0.308-1) unstable; urgency=low
2
15
3
  * Form: on save, distinguish between put() and add(); Bug #26542
16
  * Form: on save, distinguish between put() and add(); Bug #26542
(-)umc/widgets/Wizard.js (-9 / +11 lines)
 Lines 188-199    Link Here 
188
188
189
	_next: function(/*String*/ currentPage) {
189
	_next: function(/*String*/ currentPage) {
190
		// update visibilty of buttons and show next page
190
		// update visibilty of buttons and show next page
191
		var nextPage = this.next(currentPage);
191
		dojo.when(this.next(currentPage), dojo.hitch(this, function(nextPage) {
192
		if (!nextPage) {
192
			if (!nextPage) {
193
			throw new Error('ERROR: received invalid page name [' + dojo.toJson(nextPage) + '] for Wizard.next(' + dojo.toJson(currentPage) + ')');
193
				throw new Error('ERROR: received invalid page name [' + dojo.toJson(nextPage) + '] for Wizard.next(' + dojo.toJson(currentPage) + ')');
194
		}
194
			}
195
		this._updateButtons(nextPage);
195
			this._updateButtons(nextPage);
196
		this.selectChild(this._pages[nextPage]);
196
			this.selectChild(this._pages[nextPage]);
197
		}));
197
	},
198
	},
198
199
199
	next: function(/*String*/ pageName) {
200
	next: function(/*String*/ pageName) {
 Lines 226-234    Link Here 
226
227
227
	_previous: function(/*String*/ currentPage) {
228
	_previous: function(/*String*/ currentPage) {
228
		// update visibilty of buttons and show previous page
229
		// update visibilty of buttons and show previous page
229
		var previousPage = this.previous(currentPage);
230
		dojo.when(this.previous(currentPage), dojo.hitch(this, function(previousPage) {
230
		this._updateButtons(previousPage);
231
			this._updateButtons(previousPage);
231
		this.selectChild(this._pages[previousPage]);
232
			this.selectChild(this._pages[previousPage]);
233
		}));
232
	},
234
	},
233
235
234
	previous: function(/*String*/ pageName) {
236
	previous: function(/*String*/ pageName) {

Return to bug 26604