Skip to content
Permalink
Browse files

share part of help text, some workflow fixes

  • Loading branch information...
lslezak committed May 15, 2015
1 parent a5a880a commit 3132f777812015941ff5bd91ac4586afe2407cd4
@@ -250,7 +250,7 @@ def registration_ui
def workflow_aliases
{
# skip this when going back
"check" => [->() { registration_check }, true],
"check" => ->() { registration_check },
"register" => ->() { register_base_system },
"select_addons" => ->() { select_addons },
"select_addons_rereg" => ->() { select_addons(reregistration: true) },
@@ -298,6 +298,7 @@ def start_workflow
},
"select_addons_rereg" => {
abort: :abort,
skip: "check",
cancel: "check",
next: "reregister_addons"
},
@@ -225,6 +225,17 @@ def supported_addon_count?

true
end

# shared part of the help text
# @return [String] translated help text
def generic_help_text
# help text (2/3)
_("<p>Please note, that some extensions or modules might need "\
"specific registration code.</p>") +
# help text (3/3)
_("<p>If you want to remove any extension or module you need to log"\
"into the SUSE Customer Center and remove them manually there.</p>")
end
end
end
end
@@ -32,13 +32,7 @@ def run
content,
# help text (1/3)
_("<p>Here you can select available extensions and modules for your"\
"system.</p>") +
# help text (2/3)
_("<p>Please note, that some extensions or modules might need "\
"specific registration code.</p>") +
# help text (3/3)
_("<p>If you want to remove any extension or module you need to log"\
"into the SUSE Customer Center and remove them manually there.</p>"),
"system.</p>") + generic_help_text,
# always enable Back/Next, the dialog cannot be the first in workflow
true,
true
@@ -38,13 +38,7 @@ def run
content,
# help text (1/3)
_("<p>Here you can select extensions and modules which will be "\
"registered again.</p>") +
# help text (2/3)
_("<p>Please note, that some extensions or modules might need "\
"specific registration code.</p>") +
# help text (3/3)
_("<p>If you want to remove any extension or module you need to log"\
"into the SUSE Customer Center and remove them manually there.</p>"),
"registered again.</p>") + generic_help_text,
# always enable Back/Next, the dialog cannot be the first in workflow
true,
true
@@ -47,7 +47,7 @@ def run
_("Registration"),
content,
help_text,
Yast::GetInstArgs.enable_back,
Yast::GetInstArgs.enable_back || (Yast::Mode.normal && Registration.is_registered?),
Yast::GetInstArgs.enable_next || Yast::Mode.normal
)

@@ -157,7 +157,7 @@ def handle_dialog
when :next
ret = handle_registration
when :abort
ret = nil unless Yast::Popup.ConfirmAbort(:painless)
ret = nil unless Yast::Mode.normal || Yast::Popup.ConfirmAbort(:painless)
when :skip
ret = nil unless confirm_skipping
end

0 comments on commit 3132f77

Please sign in to comment.
You can’t perform that action at this time.