Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix displaying a custom proposal set in AY #980

Merged
merged 3 commits into from Nov 1, 2021
Merged

Conversation

mvidner
Copy link
Member

@mvidner mvidner commented Sep 16, 2021

Filter the installation proposals (in the Installation Settings screen) according to the AutoYaST profile even before tab switching

The filtering code was only used after a tab change (in switch_to_tab), here apply it also for the initial display.

Manual Test

I tested the fix with a profile that limited the proposals to software and language:

<profile xmlns="http://www.suse.com/1.0/yast2ns"
  xmlns:config="http://www.suse.com/1.0/configns">
  <general>
    <mode>
      <confirm config:type="boolean">true</confirm>
    </mode>
    <proposals config:type="list">
      <proposal>software_proposal</proposal>
      <proposal>language_proposal</proposal>
    </proposals>
  </general>
...

(full profile at https://gist.github.com/mvidner/909181a348483fd367ab2c689880a293#file-minimal-sle-15-proposalmodulebug-sw-lang-xml)

Screenshots of a Tabbed Proposal, Before and After

This test used a stock control.xml file which has Installation Settings show two tabs, Overview and Expert.

Initial displaySwitched to 2nd tabSwitched back

without-1

without-2

without-3

with-1

with-2

with-3

Screenshots of a Non-Tabbed Proposal, Before and After

This test used a modified control.xml that limited the proposal set to software, timezone, language, presenting them without tabs.

BeforeAfter

without-notabs

with-notabs

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) to 40.02% when pulling e465dee on ay-custom-proposal into d745ba6 on master.

…sc#1190294)

The filtering code was only used after a tab change (in switch_to_tab), here
apply it also for the initial display.
@mvidner mvidner changed the base branch from master to SLE-15-SP1 September 25, 2021 08:39
@mvidner mvidner marked this pull request as ready for review September 26, 2021 22:10
Copy link
Member

@dgdavid dgdavid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although looks like it is not the final patch for https://bugzilla.suse.com/show_bug.cgi?id=1190294 I think you can go ahead and merge this patch. LGTM, thanks!

package/yast2-installation.changes Outdated Show resolved Hide resolved
Co-authored-by: David Díaz <1691872+dgdavid@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants