Skip to content

Commit

Permalink
always enable next in license confirmation dialog, because even if no…
Browse files Browse the repository at this point in the history
…t accepted, popup is shown to user (bnc#993530)
  • Loading branch information
jreidinger committed Aug 23, 2016
1 parent 8d29f9d commit 225c85c
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions src/modules/ProductLicense.rb
Expand Up @@ -471,16 +471,12 @@ def DisplayLicenseDialogWithTitle(languages, back, license_language, licenses, i
_GetLicenseDialog_result
)

# If acceptance is not needed, there's no need to disable the button
# by default
default_next_button_state = AcceptanceNeeded(id) ? false : true

Wizard.SetContents(
caption,
contents,
GetLicenseDialogHelp(),
back,
default_next_button_state
true # always allow next button, as if not accepted, it will raise popup (bnc#993530)
)

# set the initial license download URL
Expand Down Expand Up @@ -1308,9 +1304,6 @@ def AskLicensesAgreementWithHeading(dirs, patterns, action, enable_back,
VSpacing(0.5)
) : Empty()
)
# If acceptance is not needed, there's no need to disable the button
# by default
default_next_button_state = true

Builtins.foreach(dirs) do |dir|
counter = Ops.add(counter, 1)
Expand Down Expand Up @@ -1360,15 +1353,14 @@ def AskLicensesAgreementWithHeading(dirs, patterns, action, enable_back,
# Display info as a popup if exists
InstShowInfo.show_info_txt(@info_file) if @info_file != nil
Ops.set(licenses, counter, tmp_licenses)
default_next_button_state = false if AcceptanceNeeded(dir)
end

Wizard.SetContents(
caption,
contents,
GetLicenseDialogHelp(),
enable_back,
default_next_button_state
true # always enable next, as popup is raised if not accepted (bnc#993530)
)

Wizard.SetTitleIcon("yast-license")
Expand Down

0 comments on commit 225c85c

Please sign in to comment.