Merge branch 'SLE-15-SP3' into ay-custom-proposal-m

yast · Nov 2, 2021 · 20af469 · 20af469
2 parents e02626a + b9c08d2
commit 20af469
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov  1 12:48:19 UTC 2021 - Martin Vidner <mvidner@suse.com>
+
+- Filter the installation proposals (in the Installation Settings
+  screen) according to the AutoYaST profile even before
+  tab switching (related to bsc#1190294)
+- 4.4.21
+
 -------------------------------------------------------------------
 Thu Oct 28 08:33:55 UTC 2021 - José Iván López González <jlopez@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.4.20
+Version:        4.4.21
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

diff --git a/src/lib/installation/proposal_runner.rb b/src/lib/installation/proposal_runner.rb
@@ -487,9 +487,8 @@ def make_proposal(force_reset, language_changed)
           @html[submod] = prop
 
           # now do the complete html
-          presentation_modules = @store.presentation_order
-          presentation_modules = presentation_modules[@current_tab] if @store.tabs?
-          proposal = presentation_modules.reduce("") do |res, mod|
+          load_matching_submodules_list
+          proposal = @submodules_presentation.reduce("") do |res, mod|
             res << (@html[mod] || "")
           end
           display_proposal(div_with_direction(proposal))