From 1a5346298cb81dc0dc960045f78eb6e426fc0bbb Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Wed, 11 Sep 2024 18:00:02 -0500 Subject: [PATCH] Add "login" user interface when not logged in --- src/pgwui_sql/templates/sql.mak | 15 +++++++++++++++ src/pgwui_sql/templates/sql_base.mak | 4 +++- src/pgwui_sql/views/sql.py | 5 ++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pgwui_sql/templates/sql.mak b/src/pgwui_sql/templates/sql.mak index 7f1affc..cc51f72 100644 --- a/src/pgwui_sql/templates/sql.mak +++ b/src/pgwui_sql/templates/sql.mak @@ -133,6 +133,21 @@ window.name='${self.sql_results_target()}'; +<%def name="submit(tab_index)"> + % if not havecreds: + + <% tab_index.inc() %> + % else: + <%parent:submit tab_index="${tab_index}" /> + % endif + + +<%def name="sql_row(tab_index)"> + % if havecreds: + <%parent:sql_row tab_index="${tab_index}" /> + % endif + + <% tab_index = self.attr.TabIndex() %> % if result_rows: ${render_results()} diff --git a/src/pgwui_sql/templates/sql_base.mak b/src/pgwui_sql/templates/sql_base.mak index a47d896..783eefb 100644 --- a/src/pgwui_sql/templates/sql_base.mak +++ b/src/pgwui_sql/templates/sql_base.mak @@ -87,10 +87,11 @@ <%parent:table_rows tab_index="${tab_index}" args="tab_index"> ## A blank table row for spacing - ${sql_row(tab_index)} + ${self.sql_row(tab_index)} +<%doc> <%block name="hidden_vars"> <%parent:hidden_vars> + diff --git a/src/pgwui_sql/views/sql.py b/src/pgwui_sql/views/sql.py index 5a6afe5..cad4c0d 100644 --- a/src/pgwui_sql/views/sql.py +++ b/src/pgwui_sql/views/sql.py @@ -68,7 +68,10 @@ class SQLForm(pgwui_core.forms.UploadFormBaseMixin, super().read() # Read our own data - self['sql'] = self._form.sql.data + if self._form.sql.data is None: + self['sql'] = '' + else: + self['sql'] = self._form.sql.data def write(self, result, errors): ''' -- 2.34.1