A working control flow from login to sql edit window opening

diff --git a/src/pgwui_sql/exceptions.py b/src/pgwui_sql/exceptions.py
index 1b0377a904e945c6064c52e23171079560a3783d..3b893f3fac3046c1ad0e8c0e849974e0a906d69d 100644 (file)
--- a/src/pgwui_sql/exceptions.py
+++ b/src/pgwui_sql/exceptions.py
@@ -77,5 +77,4 @@ class NoStatementsError(SQLError):
     detail Extra HTML describing the error
     '''
     def __init__(self, descr='', detail=''):
-        super().__init__('Warning when executing SQL',
-                         '', descr=descr, detail=detail)
+        super().__init__('Notice', '', descr=descr, detail=detail)

diff --git a/src/pgwui_sql/templates/sql.mak b/src/pgwui_sql/templates/sql.mak
index cc51f72864ba8896dab48278016233fc2a4bc390..c3295fd3afa10162140e68576768de31928e0a5d 100644 (file)
--- a/src/pgwui_sql/templates/sql.mak
+++ b/src/pgwui_sql/templates/sql.mak
@@ -37,7 +37,7 @@
 <%inherit file="${sql_base_mak}" />
 
 <%block name="action_success">
-  <p><em class="success">Executed SQL without errors</em>,
+  <p><em class="success">No errors</em>,
   from a file<em class="success">!</em>
   </p>
   % if sql:
@@ -74,10 +74,6 @@
   </tr>
 </%def>
 
-<%def name="sql_error()">
-  <p>${caller.body()}</p>  
-</%def>
-
 <%def name="render_results()">
   <%
   if not result_rows:
@@ -114,44 +110,35 @@
 <%def name="result_form(tab_index)">
   <form action="" enctype="multipart/form-data" method="post">
     <div>
-      <self:hidden_vars>
-        <input type="hidden"
-               name="sql"
-               value="${sql}"
-               />
-      </self:hidden_vars>
     </div>
-
-    <p>
-      <input value="SQL" tabindex="${tab_index.val}" type="submit" />
-      <% tab_index.inc() %>
-    </p>
   </form>
 </%def>
 
+
 <script>
   window.name='${self.sql_results_target()}';
+  function open_sql_edit() {
+           window.open(
+                '${request.route_path("pgwui_sql_edit")|n}',
+                'sql_edit',
+                'popup=true,width=800,height=600').focus();
+  };
+  % if havecreds:
+      open_sql_edit();
+  % endif
 </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}" />
+     <button type="button" tabindex="${tab_index.val}"
+             onclick="open_sql_edit();"
+     >New SQL Input Window</button>
    % endif
+   <% tab_index.inc() %>
 </%def>
 
 <% tab_index = self.attr.TabIndex() %>
-% if result_rows:
-    ${render_results()}
-    ${result_form(tab_index)}
-% else:
-    ${self.main_form(tab_index)}
-% endif
+${render_results()}
+${self.main_form(tab_index)}

diff --git a/src/pgwui_sql/templates/sql_base.mak b/src/pgwui_sql/templates/sql_base.mak
index 783eefb89befcbe8ba6be23ea6805e4fedc1f440..83870465ee91873d4cfcc760fb8e107b42ced0f5 100644 (file)
--- a/src/pgwui_sql/templates/sql_base.mak
+++ b/src/pgwui_sql/templates/sql_base.mak
@@ -57,40 +57,6 @@
         type="text/css" />
 </%block>
 
-<%def name="submit(tab_index)">
-  <input value="Execute" tabindex="${tab_index.val}" type="submit" />
-  <% tab_index.inc() %>
-</%def>
-
-<%def name="sql_row(tab_index)">
-      <tr>
-        <%self.lib:td_label for_id="sql_id">SQL</%self.lib:td_label>
-        <td><button type="button" tabindex="${tab_index.val}"
-                    onclick="window.open(
-                      '${request.route_path("pgwui_sql_edit")|n}',
-                      'sql_edit',
-                      'popup=true,width=800,height=600')"
-            >Show In Window</button></td>
-            <% tab_index.inc() %>
-      </tr>
-      <tr>
-        <%self.lib:td_input tab_index="${tab_index}" colspan="2">
-          <textarea name="sql"
-                    class="sqltext"
-                    tabindex="${tab_index.val}"
-                    id="sql_id">${sql}</textarea>
-        </%self.lib:td_input>
-      </tr>
-</%def>
-
-<%def name="table_rows(tab_index)">
-  <%parent:table_rows tab_index="${tab_index}" args="tab_index">
-    ## A blank table row for spacing
-    <tr class="verticalgap"><td/><td/></tr>
-    ${self.sql_row(tab_index)}
-  </%parent:table_rows>
-</%def>
-
 <%doc>
 <%block name="hidden_vars">
   <%parent:hidden_vars>

diff --git a/src/pgwui_sql/templates/sql_edit.mak b/src/pgwui_sql/templates/sql_edit.mak
index e5d605c24d09e973f596c4459619aeaab25f7e47..1017221590fb8d348d5836799b1b2a1981ce2055 100644 (file)
--- a/src/pgwui_sql/templates/sql_edit.mak
+++ b/src/pgwui_sql/templates/sql_edit.mak
@@ -39,6 +39,30 @@
   SQL Entry Window
 </%block>
 
+<%def name="sql_row(tab_index)">
+      <tr>
+        <%self.lib:td_input tab_index="${tab_index}" colspan="2">
+          <textarea name="sql"
+                    class="sqltext"
+                    tabindex="${tab_index.val}"
+                    id="sql_id">${sql}</textarea>
+        </%self.lib:td_input>
+      </tr>
+</%def>
+
+<%def name="table_rows(tab_index)">
+  <%parent:table_rows tab_index="${tab_index}" args="tab_index">
+    ## A blank table row for spacing
+    <tr class="verticalgap"><td/><td/></tr>
+    ${self.sql_row(tab_index)}
+  </%parent:table_rows>
+</%def>
+
+<%def name="submit(tab_index)">
+  <input value="Execute" tabindex="${tab_index.val}" type="submit" />
+  <% tab_index.inc() %>
+</%def>
+
 <% tab_index = self.attr.TabIndex() %>
 ${self.main_form(tab_index, target=self.sql_results_target(),
                  action=request.route_path('pgwui_sql'))}

diff --git a/src/pgwui_sql/views/sql.py b/src/pgwui_sql/views/sql.py
index cad4c0d080bb53fc933b90eb8f1ce6881f2a79e1..95ccd2c1351eb316f4bd76bd308fa3e9ba6d619e 100644 (file)
--- a/src/pgwui_sql/views/sql.py
+++ b/src/pgwui_sql/views/sql.py
@@ -196,9 +196,7 @@ class SQLHandler(pgwui_core.core.SessionDBHandler):
         cur = self.cur
         self.execute(cur, self.uf['sql'])
         if cur.statusmessage is None:
-            raise sql_ex.NoStatementsError(
-                descr=('There seem to be no SQL statements, or at least no'
-                       ' results'))
+            raise sql_ex.NoStatementsError(descr='No SQL statements executed')
 
         sql_results = self.sql_results
         nextset = True