share part of help text, some workflow fixes

src/clients/inst_scc.rb

@@ -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"
         },

src/lib/registration/ui/addon_selection_base_dialog.rb

@@ -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

src/lib/registration/ui/addon_selection_registration_dialog.rb

@@ -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

src/lib/registration/ui/addon_selection_reregistration_dialog.rb

@@ -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

src/lib/registration/ui/base_system_registration_dialog.rb

@@ -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