Merge pull request #30 from yast/merge-sle-15-sp1

Fix which buttons are displayed in firstboot stage
yast · Jul 12, 2019 · 09b567c · 09b567c
2 parents a174f3b + 9cb9004
commit 09b567c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/package/yast2-proxy.changes b/package/yast2-proxy.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul  4 13:49:19 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Fix 'proxy' behaviour when running in firstboot (bsc#1140199).
+- 4.2.1
+
 -------------------------------------------------------------------
 Fri May 31 12:35:58 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
 

diff --git a/package/yast2-proxy.spec b/package/yast2-proxy.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-proxy
-Version:        4.2.0
+Version:        4.2.1
 Release:        0
 Summary:        YaST2 - Proxy Configuration
 License:        GPL-2.0-or-later

diff --git a/src/include/proxy/dialogs.rb b/src/include/proxy/dialogs.rb
@@ -376,7 +376,7 @@ def UrlContainPassword(url)
     # If modified, ask for confirmation
     # @return true if abort is confirmed
     def ReallyAbortCond
-      !modified || Popup.ReallyAbort(true)
+      (!modified || installation?) || Popup.ReallyAbort(true)
     end
 
     # Proxy dialog
@@ -541,11 +541,9 @@ def ProxyMainDialog(standalone)
         contents,
         help,
         Label.BackButton,
-        Label.FinishButton
+        Label.NextButton
       )
-      Wizard.SetNextButton(:next, Label.OKButton)
-      Wizard.SetAbortButton(:abort, Label.CancelButton)
-      Wizard.HideBackButton
+      adjust_wizard_buttons unless installation?
 
       # #103841, relaxed. now avoiding only quotes
       # #337048 allow using space as well
@@ -752,5 +750,24 @@ def ProxyMainDialog(standalone)
 
       deep_copy(ret)
     end
+
+  private
+
+    # Sets OK/Cancel wizard buttons
+    def adjust_wizard_buttons
+      Wizard.SetNextButton(:next, Label.OKButton)
+      Wizard.SetAbortButton(:abort, Label.CancelButton)
+      Wizard.HideBackButton
+    end
+
+    # Determines whether running in installation mode
+    #
+    # We do not use Stage.initial because of firstboot, which runs in 'installation' mode
+    # but in 'firstboot' stage.
+    #
+    # @return [Boolean] Boolean if running in installation or update mode
+    def installation?
+      Mode.installation || Mode.update
+    end
   end
 end
diff --git a/src/lib/proxy/client.rb b/src/lib/proxy/client.rb
@@ -149,7 +149,6 @@ def ProxyGUI
 
       Wizard.CreateDialog
       Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Proxy")
-      Wizard.SetNextButton(:next, Label.FinishButton)
 
       # main ui function
       ret = ProxyMainDialog(true)