Merge pull request #68 from yast/ui_glitch

Fixed displaying previous dialog content (bsc#1117492)
yast · Dec 17, 2018 · cc1f04a · cc1f04a
2 parents 805ab89 + 54f7bfe
commit cc1f04a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 14 17:13:20 UTC 2018 - lslezak@suse.cz
+
+- Fixed displaying previous dialog content when going back and
+  forth in the installation workflow (bsc#1117492)
+- 4.1.10
+
 -------------------------------------------------------------------
 Fri Nov 23 17:08:05 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
 

diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-add-on
-Version:        4.1.9
+Version:        4.1.10
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only

diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb
@@ -1021,13 +1021,8 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
           # because of CD/DVD + url cd://
           Pkg.SourceReleaseAll
 
-          # bugzilla #305788
-          # Use new wizard window for adding new Add-On.
-          # Do not use "Steps" dialog.
-          Wizard.OpenLeftTitleNextBackDialog
           Wizard.SetTitleIcon("yast-addon")
           ret2 = RunWizard()
-          Wizard.CloseDialog
 
           log.info "Subworkflow result: ret2: #{ret2}"
 

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -18,6 +18,9 @@ def stub_module(name)
 # Stub classes from other modules to speed up a build
 stub_module("AutoinstGeneral")
 stub_module("AutoinstSoftware")
+# the SuSEFirewall module checks the firewall status in the constructor,
+# avoid displaying a PolicyKit popup asking for the root password...
+stub_module("SuSEFirewall")
 
 if ENV["COVERAGE"]
   require "simplecov"