[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - wizards/com

Julien Nabet serval2412 at yahoo.fr
Thu Oct 8 07:45:17 PDT 2015


 wizards/com/sun/star/wizards/web/FTPDialog.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a3fb3c5dcbbe974e2f49669bf14937f14261d8a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Oct 3 18:15:37 2015 +0200

    Web Wizard, ftp part: fix logic for dialog
    
    Comment indicated "If one of these fields is empty, the button is disabled",
    let's stick to this.
    
    Cherry-picked from 2ff595dbf2b42b4b3ee961b63e5da92067aa8fd9
    
    Change-Id: I99dd23339d888c33e7706935842a91f5da681ade
    Reviewed-on: https://gerrit.libreoffice.org/19112
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py b/wizards/com/sun/star/wizards/web/FTPDialog.py
index 96bc2db..b172622 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.py
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.py
@@ -249,7 +249,7 @@ class FTPDialog(WizardDialog):
     # according to the status of the hostname, username, password text fields.
     # If one of these fields is empty, the button is disabled.
     def enableTestButton(self):
-        self.setEnabled(self.btnTestConnection, not self.isEmpty(self.host) or self.isEmpty(self.username) or self.isEmpty(self.password))
+        self.setEnabled(self.btnTestConnection, not (self.isEmpty(self.host) or self.isEmpty(self.username) or self.isEmpty(self.password)))
 
     # @param s
     # @return True if the string is None or "".


More information about the Libreoffice-commits mailing list