Add "login" user interface when not logged in

diff --git a/src/pgwui_sql/templates/sql.mak b/src/pgwui_sql/templates/sql.mak
index 7f1affc93e78e1f62dd838167337cf7d4a6edcad..cc51f72864ba8896dab48278016233fc2a4bc390 100644 (file)
--- a/src/pgwui_sql/templates/sql.mak
+++ b/src/pgwui_sql/templates/sql.mak
@@ -133,6 +133,21 @@
   window.name='${self.sql_results_target()}';
 </script>
 
+<%def name="submit(tab_index)">
+   % if not havecreds:
+     <input value="Login" tabindex="${tab_index.val}" type="submit" />
+     <% tab_index.inc() %>
+   % else:
+     <%parent:submit tab_index="${tab_index}" />
+   % endif
+</%def>
+
+<%def name="sql_row(tab_index)">
+   % if havecreds:
+     <%parent:sql_row tab_index="${tab_index}" />
+   % endif
+</%def>
+
 <% 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 a47d896f6b13bf68156bbfdaed06e73558577add..783eefb89befcbe8ba6be23ea6805e4fedc1f440 100644 (file)
--- 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
     <tr class="verticalgap"><td/><td/></tr>
-    ${sql_row(tab_index)}
+    ${self.sql_row(tab_index)}
   </%parent:table_rows>
 </%def>
 
+<%doc>
 <%block name="hidden_vars">
   <%parent:hidden_vars>
     <input type="hidden"
@@ -103,3 +104,4 @@
            />
   </%parent:hidden_vars>
 </%block>
+</%doc>

diff --git a/src/pgwui_sql/views/sql.py b/src/pgwui_sql/views/sql.py
index 5a6afe5eaeec1b1534fc1b393aa8918bd1a9cf16..cad4c0d080bb53fc933b90eb8f1ce6881f2a79e1 100644 (file)
--- 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):
         '''