handle rerun of dialog

yast · Jul 31, 2017 · fcf80ec · fcf80ec
1 parent 82a455e
commit fcf80ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/lib/installation/dialogs/product_selection.rb b/src/lib/installation/dialogs/product_selection.rb
@@ -10,6 +10,11 @@
 module Installation
   module Dialogs
     class ProductSelection < CWM::Dialog
+
+      class << self
+        attr_accessor :selected_package
+      end
+
       def initialize
         textdomain "installation"
       end
@@ -34,12 +39,17 @@ def run
         res = super
 
         if res == :next
+          # remove already selected if it is not first run of dialog
+          if self.class.selected_package
+            Yast::WorkflowManager.RemoveWorkflow(:package, 0, self.class.selected_package)
+          end
           product = selector.product
           Yast::WorkflowManager.AddWorkflow(:package, 0, product.installation_package)
           Yast::WorkflowManager.MergeWorkflows
           Yast::WorkflowManager.RedrawWizardSteps
-          # run new steps for product, for now disable back TODO: allow it
-          res = Yast::ProductControl.RunFrom(Yast::ProductControl.CurrentStep + 1, false)
+          self.class.selected_package = product.installation_package
+          # run new steps for product
+          res = Yast::ProductControl.RunFrom(Yast::ProductControl.CurrentStep + 1, true)
         end
 
         res

diff --git a/src/lib/installation/widgets/product_selector.rb b/src/lib/installation/widgets/product_selector.rb
@@ -51,7 +51,7 @@ def store
       def validation
         return true if value
 
-        Yast::Popup.Error(_("Please select product to install.")
+        Yast::Popup.Error(_("Please select product to install."))
         false
       end
     end