Merge remote-tracking branch 'origin/SLE-15-GA' into merge_sle15

yast · Jun 11, 2018 · 01ff687 · 01ff687
2 parents c212365 + fd5efe0
commit 01ff687
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/package/yast2-ftp-server.changes b/package/yast2-ftp-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 11 13:36:16 UTC 2018 - jreidinger@suse.com
+
+- Do not modify value when Browse dialog is canceled (bsc#1041829)
+- 4.1.1
+
 -------------------------------------------------------------------
 Thu Jun  7 09:22:47 UTC 2018 - jreidinger@suse.com
 

diff --git a/package/yast2-ftp-server.spec b/package/yast2-ftp-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ftp-server
-Version:        4.1.0
+Version:        4.1.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/ftp-server/wid_functions.rb b/src/include/ftp-server/wid_functions.rb
@@ -319,7 +319,7 @@ def HandleBrowseAnon(_key, event)
       button = Ops.get(event, "ID")
       if button == "BrowseAnon"
         val = UI.AskForExistingDirectory("/", _("Select directory"))
-        UI.ChangeWidget(Id("FtpDirAnon"), :Value, val)
+        UI.ChangeWidget(Id("FtpDirAnon"), :Value, val) if val
       end
       nil
     end
@@ -355,7 +355,7 @@ def HandleBrowseLocal(_key, event)
       button = Ops.get(event, "ID")
       if button == "BrowseLocal"
         val = UI.AskForExistingDirectory("/", _("Select directory"))
-        UI.ChangeWidget(Id("FtpDirLocal"), :Value, val)
+        UI.ChangeWidget(Id("FtpDirLocal"), :Value, val) if val
       end
       nil
     end
@@ -1040,7 +1040,7 @@ def HandleBrowseCertFile(_key, event)
       button = Ops.get(event, "ID")
       if button == "BrowseCertFile"
         val = UI.AskForExistingFile("/", "*.*", _("Select File"))
-        UI.ChangeWidget(Id("CertFile"), :Value, val)
+        UI.ChangeWidget(Id("CertFile"), :Value, val) if val
       end
 
       nil