Skip to content
Permalink
Browse files

use better action name as semantics change

  • Loading branch information...
jreidinger committed Sep 1, 2014
1 parent a072364 commit e961a84210997f5c436fb166a6d10c2178dc5a08
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/include/add-on/add-on-workflow.rb
@@ -1073,7 +1073,7 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
# Bugzilla #893103 be consistent, so always when there is no add-on skip
if no_addons
Builtins.y2milestone("Skipping to media_select")
ret = :first_time
ret = :skip_to_add
end

# Show Add-Ons table
@@ -1093,7 +1093,7 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
some_addon_changed = false
begin
# FATE #301928 - Saving one click
ret = Convert.to_symbol(UI.UserInput) unless ret == :first_time
ret = Convert.to_symbol(UI.UserInput) unless ret == :skip_to_add

# aborting
if ret == :abort || ret == :cancel
@@ -1142,11 +1142,11 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
)

# adding new add-on
elsif ret == :add || ret == :first_time
elsif ret == :add || ret == :skip_to_add
# show checkbox only first time in installation when there is no
# other addons, so allow to quickly skip adding addons, otherwise
# it make no sense as user explicitelly want add addon
SourceDialogs.display_addon_checkbox = ret == :first_time
SourceDialogs.display_addon_checkbox = ret == :skip_to_add

# bugzilla #293428
# Release all sources before adding a new one
@@ -1171,7 +1171,7 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
AddOnProduct.PrepareForRegistration(AddOnProduct.src_id)
some_addon_changed = true
# do not keep first_time, otherwise summary won't be shown during installation
ret = nil if ret == :first_time
ret = nil if ret == :skip_to_add
elsif ret2 == :abort || ret2 == :cancel
Builtins.y2milestone("Add-on sequence aborted")

@@ -1192,9 +1192,9 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
end
end
# properly return abort in installation
ret = :abort if ret == :first_time
ret = :abort if ret == :skip_to_add
# extra handling for the global enable checkbox
elsif ret == :first_time
elsif ret == :skip_to_add
ret = :back if ret2 == :back
ret = :next if ret2 == :skip
end

0 comments on commit e961a84

Please sign in to comment.
You can’t perform that action at this time.