Fixes/improvements to the search form & saved queries.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@905 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/cgi_client.py b/roundup/cgi_client.py
index 715d02d61bd035b9fb0eecd1305fcf3aaa065041..f45667373c2afeb88ba536845a725f820e1e3fb1 100644 (file)
--- a/roundup/cgi_client.py
+++ b/roundup/cgi_client.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: cgi_client.py,v 1.142 2002-07-18 11:17:30 gmcm Exp $
+# $Id: cgi_client.py,v 1.143 2002-07-20 19:29:10 gmcm Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -491,8 +491,6 @@ function help_window(helpurl, width, height) {
         '''
         cn = self.classname
         cl = self.db.classes[cn]
-        self.pagehead(_('%(instancename)s: Index of %(classname)s')%{
-            'classname': cn, 'instancename': self.instance.INSTANCE_NAME})
         if sort is None: sort = self.index_sort()
         if group is None: group = self.index_arg(':group')
         if filter is None: filter = self.index_arg(':filter')
@@ -531,7 +529,9 @@ function help_window(helpurl, width, height) {
 
             # create a query
             d = {}
-            d['name'] = self.form[':name'].value
+            d['name'] = nm = self.form[':name'].value
+            if not nm:
+                d['name'] = nm = 'New Query'
             d['klass'] = self.form[':classname'].value
             d['url'] = url
             qid = self.db.getclass('query').create(**d)
@@ -543,6 +543,9 @@ function help_window(helpurl, width, height) {
             queries.append(qid)
             usercl.set(uid, queries=queries)
             
+        self.pagehead(_('%(instancename)s: Index of %(classname)s')%{
+            'classname': cn, 'instancename': self.instance.INSTANCE_NAME})
+        
         index = htmltemplate.IndexTemplate(self, self.instance.TEMPLATES, cn)
         try:
             index.render(filterspec, search_text, filter, columns, sort, 
@@ -1610,6 +1613,11 @@ def parsePropsFromForm(db, cl, form, nodeid=0, num_re=re.compile('^\d+$')):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.142  2002/07/18 11:17:30  gmcm
+# Add Number and Boolean types to hyperdb.
+# Add conversion cases to web, mail & admin interfaces.
+# Add storage/serialization cases to back_anydbm & back_metakit.
+#
 # Revision 1.141  2002/07/17 12:39:10  gmcm
 # Saving, running & editing queries.
 #

diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py
index 57b555af8ff4cda705f4320f90b72406b25ef3be..2dc9af7ea6d11aa3e146ba92d8811216d80d2bb1 100644 (file)
--- a/roundup/htmltemplate.py
+++ b/roundup/htmltemplate.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: htmltemplate.py,v 1.102 2002-07-18 23:07:08 richard Exp $
+# $Id: htmltemplate.py,v 1.103 2002-07-20 19:29:10 gmcm Exp $
 
 __doc__ = """
 Template engine.
@@ -1196,17 +1196,21 @@ class IndexTemplate(TemplateFunctions):
         w('  <td>&nbsp;</td>\n')
         w('  <td colspan=6><input type="submit" name="Query" value="Redisplay"></td>\n')
         w(' </tr>\n')
-        if self.db.getclass('user').getprops().has_key('queries'):
+        if (self.db.getclass('user').getprops().has_key('queries')
+            and not self.client.user in (None, "anonymous")):
             w(' <tr class="location-bar">\n')
             w('  <td colspan=7><hr></td>\n')
             w(' </tr>\n')
             w(' <tr class="location-bar">\n')
             w('  <td align=right class="form-label">Name</td>\n')
-            w('  <td colspan=6><input type="text" name=":name" value=""></td>\n')
+            w('  <td colspan=2 class="form-text"><input type="text" name=":name" value=""></td>\n')
+            w('  <td colspan=4 rowspan=2 class="form-help">If you give the query a name '
+              'and click <b>Save</b>, it will appear on your menu. Saved queries may be '
+              'edited by going to <b>My Details</b> and clicking on the query name.</td>')
             w(' </tr>\n')
             w(' <tr class="location-bar">\n')
             w('  <td>&nbsp;</td><input type="hidden" name=":classname" value="%s">\n' % self.classname)
-            w('  <td colspan=6><input type="submit" name="Query" value="Save"></td>\n')
+            w('  <td colspan=2><input type="submit" name="Query" value="Save"></td>\n')
             w(' </tr>\n')
         w('</table>\n')
 
@@ -1364,6 +1368,9 @@ class NewItemTemplate(TemplateFunctions):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.102  2002/07/18 23:07:08  richard
+# Unit tests and a few fixes.
+#
 # Revision 1.101  2002/07/18 11:17:30  gmcm
 # Add Number and Boolean types to hyperdb.
 # Add conversion cases to web, mail & admin interfaces.