From 6b1fb7b2cad1edf7b0d83afe02de2ad03d3a9bea Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Fri, 24 Sep 2021 10:52:05 +0200 Subject: [PATCH 1/3] Filter proposals according to AY profile even before tab switching (bsc#1190294) The filtering code was only used after a tab change (in switch_to_tab), here apply it also for the initial display. --- src/lib/installation/proposal_runner.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/installation/proposal_runner.rb b/src/lib/installation/proposal_runner.rb index 4ab20b8a0..06387f7a5 100644 --- 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)) From 583c66711aabba0cd8b4eeb774faddb337d8de26 Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Mon, 27 Sep 2021 00:06:01 +0200 Subject: [PATCH 2/3] version + changelog --- package/yast2-installation.changes | 8 ++++++++ package/yast2-installation.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 559720e9e..0d8f708d2 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Sep 26 22:01:53 UTC 2021 - Martin Vidner + +- Filter the installation proposals (in the Installation Settings + screen) according to the AutoYaST profile even before + tab switching (bsc#1190294) +- 4.1.55 + ------------------------------------------------------------------- Thu Apr 29 13:14:40 CEST 2021 - Jozef Pupava diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 9560d7fdb..12158c4e2 100644 --- 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 From 2584f710be6469b0cd0ac672fe4b544b979153d2 Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Mon, 1 Nov 2021 13:39:12 +0100 Subject: [PATCH 3/3] Update package/yast2-installation.changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: David Díaz <1691872+dgdavid@users.noreply.github.com> --- package/yast2-installation.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 0d8f708d2..75e6c4c0b 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -3,7 +3,7 @@ Sun Sep 26 22:01:53 UTC 2021 - Martin Vidner - Filter the installation proposals (in the Installation Settings screen) according to the AutoYaST profile even before - tab switching (bsc#1190294) + tab switching (related to bsc#1190294) - 4.1.55 -------------------------------------------------------------------