From cf7bde958b29d33c4399440fd8205af58a5a396b940ea4847f4c7075de6e42f3 Mon Sep 17 00:00:00 2001 From: Daniel Stoppek Date: Tue, 10 Dec 2024 09:15:54 +0100 Subject: [PATCH] trim dbconfiguration --- js/qmldict.js | 9 ++++++--- lib/DB/DbManager.py | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/qmldict.js b/js/qmldict.js index f9a497b..5f2cb85 100644 --- a/js/qmldict.js +++ b/js/qmldict.js @@ -11,7 +11,10 @@ function firstConf(tabs) { if (!tabs.children[i].text.trim()) return false - pyqcrm_conf[tabs.name] [tabs.children[i].name] = tabs.children[i].text + if (pyqcrm_conf[tabs.name][tabs.children[i].name] !== "DB_PASS") + pyqcrm_conf[tabs.name] [tabs.children[i].name] = tabs.children[i].text.trim() + else + pyqcrm_conf[tabs.name] [tabs.children[i].name] = tabs.children[i].text } } @@ -36,11 +39,11 @@ function addBusiness(form) } else if (form.children[i].toString().startsWith("TextField")) { - business_form[form.children[i].name] = form.children[i].text + business_form[form.children[i].name] = form.children[i].text.trim() } else if (form.children[i].toString().startsWith("Scroll")) { - business_form[form.children[i].contentChildren[0].name] = form.children[i].contentChildren[0].text + business_form[form.children[i].contentChildren[0].name] = form.children[i].contentChildren[0].text.trim() } } return business_form diff --git a/lib/DB/DbManager.py b/lib/DB/DbManager.py index bb15208..8ebd99f 100644 --- a/lib/DB/DbManager.py +++ b/lib/DB/DbManager.py @@ -24,6 +24,7 @@ class DbManager(object): print(f"DbManager Connection (INTERFACE ERROR): {e}..reconnecting...") except mariadb.Error as e: print(f"Connection parameters are wrong: {e}") + cls.__connection = None return cls.__connection