If no user name (or auth config) is chosen, we fill up the user name …

…with the user's account name (from the environment variable).
opengisch · Oct 28, 2024 · fc9e24b · fc9e24b
1 parent fb9a349
commit fc9e24b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/QgisModelBaker/gui/panel/pg_config_panel.py b/QgisModelBaker/gui/panel/pg_config_panel.py
@@ -19,6 +19,7 @@
 import logging
 from enum import IntEnum
 
+from qgis.core import QgsApplication
 from qgis.PyQt.QtCore import QSettings, Qt, QThread, QTimer
 
 import QgisModelBaker.libs.modelbaker.utils.db_utils as db_utils
@@ -327,15 +328,6 @@ def is_valid(self):
         elif not self.pg_database_line_edit.text().strip():
             message = self.tr("Please set a database before creating the project.")
             self.pg_database_line_edit.setFocus()
-        elif (
-            not self.pg_auth_settings.username()
-            and not self.pg_auth_settings.configId()
-        ):
-            message = self.tr(
-                "Please set a username or select an authentication configuration before creating the "
-                "project."
-            )
-            self.pg_auth_settings.setFocus()
         elif (
             self.pg_auth_settings.configId()
             and not self.pg_use_super_login.isChecked()
@@ -347,6 +339,17 @@ def is_valid(self):
                 "Use superuser login for data management tasks when you use an authentication configuration."
             )
             self.pg_use_super_login.setFocus()
+        elif (
+            not self.pg_auth_settings.username()
+            and not self.pg_auth_settings.configId()
+        ):
+            self.pg_auth_settings.setUsername(QgsApplication.userLoginName())
+            message = self.tr(
+                "Set the user's account name '{}'as username.".format(
+                    QgsApplication.userLoginName()
+                )
+            )
+            result = True
         else:
             result = True
 

diff --git a/QgisModelBaker/gui/workflow_wizard/database_selection_page.py b/QgisModelBaker/gui/workflow_wizard/database_selection_page.py
@@ -158,6 +158,11 @@ def is_valid(self):
                 message,
                 gui_utils.LogLevel.FAIL,
             )
+        elif message:
+            self.workflow_wizard.log_panel.print_info(
+                message,
+                gui_utils.LogLevel.WARNING,
+            )
         return res
 
     def help_text(self):