From b4ae7cb9efcbbfae9b9e6c47fd75d43a9d6653e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 7 Jan 2019 21:57:13 +0100 Subject: [PATCH] Use filled login to select profile The login should not be changed when editing the host or database. issue7928 review72381002 --- tryton/gui/window/dblogin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tryton/gui/window/dblogin.py b/tryton/gui/window/dblogin.py index 2ff8748a87..c1f4e84267 100644 --- a/tryton/gui/window/dblogin.py +++ b/tryton/gui/window/dblogin.py @@ -550,6 +550,7 @@ class DBLogin(object): host = common.get_hostname(netloc) port = common.get_port(netloc) database = self.entry_database.get_text().strip() + login = self.entry_login.get_text() for idx, profile_info in enumerate(self.profile_store): if not profile_info[1]: continue @@ -557,11 +558,13 @@ class DBLogin(object): try: profile_host = self.profiles.get(profile, 'host') profile_db = self.profiles.get(profile, 'database') + profile_login = self.profiles.get(profile, 'username') except configparser.NoOptionError: continue if (host == common.get_hostname(profile_host) and port == common.get_port(profile_host) - and database == profile_db): + and database == profile_db + and (not login or login == profile_login)): break else: idx = -1