Attachment 9643 Details for Bug 46045 – return_to_role_page.patch

[patch] return_to_role_page.patch

return_to_role_page.patch (text/plain), 1.33 KB, created by Arvid Requate on 2018-08-27 18:18:12 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2018-08-27 18:18:12 CEST

Size: 1.33 KB

patch

obsolete

>diff --git a/base/univention-system-setup/usr/share/univention-system-setup/www/ApplianceWizard.js b/base/univention-system-setup/usr/share/univention-system-setup/www/ApplianceWizard.js
>index 804974af89..f40face29c 100644
>--- a/base/univention-system-setup/usr/share/univention-system-setup/www/ApplianceWizard.js
>+++ b/base/univention-system-setup/usr/share/univention-system-setup/www/ApplianceWizard.js
>@@ -1667,7 +1667,7 @@ define([
> 			var role = values['server/role'];
> 			return this.uidIsUsable(uid, role).then(
> 				function(data) { return true; },  // callback; uid is available, just continue
>-				this.getConfirmationToContinueWithDuplicateHostname.bind(null, hostname)  // errback
>+				this.getConfirmationToContinueWithDuplicateHostname(hostname)
> 			);
> 		},
> 
>@@ -1689,17 +1689,15 @@ define([
> 				hostname
> 			), [{
> 				label: _('Adjust settings'),
>-				name: 'stay'
>+				name: 'adjust_settings'
> 			}, {
> 				label: _('Continue with duplicate hostname'),
> 				'default': true,
> 				name: 'continue'
>-			}], _('Warning')).then(
>-				function(choice) {
>-					if (choice == 'continue') { return choice; }
>-					throw choice;
>-				}
>-			);
>+			}], _('Warning')).then(lang.hitch(this, function(choice) {
>+				if (choice == 'continue') { return choice; }
>+				this.selectChild(this._pages.role)
>+			}));
> 		},
> 
> 		_updateAppGallery: function() {

Actions: View | Diff

Attachments on bug 46045: 9643