Merge pull request #980 from yast/ay-custom-proposal

Fix displaying a custom proposal set in AY
yast · Nov 1, 2021 · a179687 · a179687
2 parents f8c2050 + 2584f71
commit a179687
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 @@
+-------------------------------------------------------------------
+Sun Sep 26 22:01:53 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.1.55
+
 -------------------------------------------------------------------
 Thu Apr 29 13:14:40 CEST 2021 - Jozef Pupava <jpupava@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.1.54
+Version:        4.1.55
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/installation/proposal_runner.rb b/src/lib/installation/proposal_runner.rb
@@ -473,9 +473,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))