Merge pull request #487 from yast/bsc_1167523

Reverts 4.2.36
yast · Mar 26, 2020 · cbf2e80 · cbf2e80
2 parents 4e1d898 + 80811d1
commit cbf2e80
Show file tree

Hide file tree

Showing 11 changed files with 663 additions and 924 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 26 12:07:36 UTC 2020 - David Diaz <dgonzalez@suse.com>
+
+- Reverts changes made in 4.2.36 to improve the addons selection,
+  keeping it as it was (bsc#1167523).
+- 4.2.39
+
 -------------------------------------------------------------------
 Mon Mar 23 14:34:05 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.2.38
+Version:        4.2.39
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only

diff --git a/src/lib/registration/clients/inst_scc.rb b/src/lib/registration/clients/inst_scc.rb
@@ -36,8 +36,8 @@
 require "registration/url_helpers"
 require "registration/registration"
 require "registration/registration_ui"
-require "registration/dialogs/addons_selection"
 require "registration/ui/addon_eula_dialog"
+require "registration/ui/addon_selection_registration_dialog"
 require "registration/ui/addon_reg_codes_dialog"
 require "registration/ui/registered_system_dialog"
 require "registration/ui/base_system_registration_dialog"
@@ -148,7 +148,7 @@ def select_addons
       # FIXME: workaround to reference between old way and new storage in Addon metaclass
       @selected_addons = Registration::Addon.selected
       ::Registration::Storage::InstallationOptions.instance.selected_addons = @selected_addons
-      Registration::Dialogs::AddonsSelection.run(@registration)
+      Registration::UI::AddonSelectionRegistrationDialog.run(@registration)
     end
 
     # load available addons from SCC server

diff --git a/src/lib/registration/dialogs/addons_selection.rb b/src/lib/registration/dialogs/addons_selection.rb