mailmanager/www SystemSettings.zpt,1.28.2.4,1.28.2.5

[Andrew V. <av...@us...>]

Update of /cvsroot/mailmanager/mailmanager/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1873/www

Modified Files:
      Tag: db-backend
	SystemSettings.zpt 
Log Message:
Still not completely there but it's late. Tickets are now exported correctly
and the import is pretty much there. The parser still needs a little work.
I think this should scale fine, even with large import/export sets.


Index: SystemSettings.zpt
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/www/SystemSettings.zpt,v
retrieving revision 1.28.2.4
retrieving revision 1.28.2.5
diff -u -d -r1.28.2.4 -r1.28.2.5
--- SystemSettings.zpt	23 Apr 2005 08:52:00 -0000	1.28.2.4
+++ SystemSettings.zpt	26 Apr 2005 21:49:37 -0000	1.28.2.5
@@ -75,8 +75,9 @@
             <td><b i18n:translate="account_label">Account:</b></td>
             <td>
               <select name="account_id">
+                <option value="">Any</option>
                 <option tal:repeat="acc python:here.sql.listAccounts(email='')"
-                        tal:attributes="value acc/id"
+                        tal:attributes="value acc/email"
                         tal:content="acc/email">te...@ex...</option>
               </select>
             </td>
@@ -88,7 +89,7 @@
               </b>
             </td>
             <td>
-              <select name="age:date">
+              <select name="to_date:date">
                 <option tal:attributes="value python:DateTime()"
                         i18n:translate="now">
                   Now
@@ -177,6 +178,7 @@
           <tr>
             <td colspan="2" align="right">
               <input type="hidden" name="section" value="delete" />
+              <input type="hidden" name="count" value="1" />
               <input type="image" src="images/delete.gif" height="15"
                      width="49" border="0" vspace="0" hspace="0"
                      i18n:attributes="alt" alt="Delete" />
@@ -195,16 +197,6 @@
                 i18n:translate="restore_tickets">Restore Tickets</td>
           </tr>
           <tr>
-            <td><b i18n:translate="account_label">Account:</b></td>
-            <td>
-              <select name="account_id">
-                <option tal:repeat="acc python:sequence.sort(here.accounts.objectValues(), (('id', 'nocase'),))"
-                        tal:attributes="value acc/id"
-                        tal:content="acc/title">te...@ex...</option>
-              </select>
-            </td>
-          </tr>
-          <tr>
             <td><b>Archive File:</b></td>
             <td><input type="file" name="archive_file" /></td>
           </tr>
@@ -221,7 +213,7 @@
       <form action="deleteTickets" method="post"
             tal:condition="python:section == 'confirm'">
         <table cellpadding="5" cellspacing="0" border="0" class="content"
-               tal:define="results python:here.Catalog(status=request.get('status'), account_id=request.get('account_id'), category0=request.get('category0'), category1=request.get('category1'), category2=request.get('category2'), date_opened={'query':request.get('age'), 'range':'max'})">
+               tal:define="count python:here.sql.listTickets()[0].count">
           <tr class="table_head">
             <td class="white" colspan="2"
                 i18n:translate="delete_archive">Delete & Archive Tickets</td>
@@ -231,7 +223,7 @@
           <tr>
             <td tal:condition="exists:request/status"
                 i18n:translate="x_tickets_to_be_deleted">
-              <b tal:content="python:len(results)" i18n:name="x">12</b>
+              <b tal:content="python:count" i18n:name="x">12</b>
               ticket(s) found to be deleted.
             </td>
             <td tal:condition="not:exists:request/status">
@@ -254,7 +246,7 @@
               </b>
             </td>
           </tr>
-          <tr tal:condition="python:results and request.has_key('status')">
+          <tr tal:condition="python:count and request.has_key('status')">
             <td align="right">
               <input type="submit" value="Submit" />
               <input tal:repeat="cat python:range(len(here.category_on))"
@@ -263,8 +255,8 @@
                      type="hidden" />
               <input tal:attributes="value request/account_id"
                      type="hidden" name="account_id" />
-              <input tal:attributes="value request/age"
-                     type="hidden" name="age:date" />
+              <input tal:attributes="value request/to_date"
+                     type="hidden" name="to_date:date" />
               <input tal:repeat="item request/status"
                      tal:attributes="value item"
                      type="hidden" name="status:list" />