allow overiding of the index args roundup/cgi/templating.py

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

diff --git a/roundup/backends/back_anydbm.py b/roundup/backends/back_anydbm.py
index f1f70fc378e9304f7ab4ca1708e840888934609a..46c44d1b653ec0baf022f253dc5bad8e0bb04982 100644 (file)
--- a/roundup/backends/back_anydbm.py
+++ b/roundup/backends/back_anydbm.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.68 2002-09-03 05:46:20 richard Exp $
+#$Id: back_anydbm.py,v 1.69 2002-09-03 07:33:01 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in a database
 chosen by anydbm. It is guaranteed to always be available in python
@@ -175,8 +175,8 @@ class Database(FileStorage, hyperdb.Database, roundupdb.Database):
         # new database? let anydbm pick the best dbm
         if not db_type:
             if __debug__:
-                print >>hyperdb.DEBUG, "opendb anydbm.open(%r, 'n')"%path
-            return anydbm.open(path, 'n')
+                print >>hyperdb.DEBUG, "opendb anydbm.open(%r, 'c')"%path
+            return anydbm.open(path, 'c')
 
         # open the database with the correct module
         try:
@@ -1909,6 +1909,9 @@ class IssueClass(Class, roundupdb.IssueClass):
 
 #
 #$Log: not supported by cvs2svn $
+#Revision 1.68  2002/09/03 05:46:20  richard
+#handle disappearing users for journaltags
+#
 #Revision 1.67  2002/09/03 02:53:53  richard
 #Fixed nasty bug that was preventing changes to multilinks going through.
 #

diff --git a/roundup/backends/back_bsddb.py b/roundup/backends/back_bsddb.py
index 6e14a6e5ee24882b50ddcc7effee56f6e0354ad9..598407869550929d6a8a5da2616f8a695ef1cd7b 100644 (file)
--- a/roundup/backends/back_bsddb.py
+++ b/roundup/backends/back_bsddb.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_bsddb.py,v 1.20 2002-07-19 03:36:34 richard Exp $
+#$Id: back_bsddb.py,v 1.21 2002-09-03 07:33:01 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in BSDDB.
 '''
@@ -61,8 +61,8 @@ class Database(Database):
         path = os.path.join(os.getcwd(), self.dir, name)
         if not os.path.exists(path):
             if __debug__:
-                print >>hyperdb.DEBUG, "opendb bsddb.open(%r, 'n')"%path
-            return bsddb.btopen(path, 'n')
+                print >>hyperdb.DEBUG, "opendb bsddb.open(%r, 'c')"%path
+            return bsddb.btopen(path, 'c')
 
         # open the database with the correct module
         if __debug__:
@@ -131,6 +131,15 @@ class Database(Database):
 
 #
 #$Log: not supported by cvs2svn $
+#Revision 1.20  2002/07/19 03:36:34  richard
+#Implemented the destroy() method needed by the session database (and possibly
+#others). At the same time, I removed the leading underscores from the hyperdb
+#methods that Really Didn't Need Them.
+#The journal also raises IndexError now for all situations where there is a
+#request for the journal of a node that doesn't have one. It used to return
+#[] in _some_ situations, but not all. This _may_ break code, but the tests
+#pass...
+#
 #Revision 1.19  2002/07/14 02:05:53  richard
 #. all storage-specific code (ie. backend) is now implemented by the backends
 #

diff --git a/roundup/cgi/templating.py b/roundup/cgi/templating.py
index 27ab4769096ae4c372b96353db48d0655d42a419..d2c5ae1d8cba77338f0bebe8ae3a0c7c25eb2fb4 100644 (file)
--- a/roundup/cgi/templating.py
+++ b/roundup/cgi/templating.py
@@ -1096,28 +1096,31 @@ env: %(env)s
     def indexargs_href(self, url, args):
         ''' embed the current index args in a URL '''
         l = ['%s=%s'%(k,v) for k,v in args.items()]
-        if self.columns:
+        if self.columns and not args.has_key(':columns'):
             l.append(':columns=%s'%(','.join(self.columns)))
-        if self.sort[1] is not None:
+        if self.sort[1] is not None and not args.has_key(':sort'):
             if self.sort[0] == '-':
                 val = '-'+self.sort[1]
             else:
                 val = self.sort[1]
             l.append(':sort=%s'%val)
-        if self.group[1] is not None:
+        if self.group[1] is not None and not args.has_key(':group'):
             if self.group[0] == '-':
                 val = '-'+self.group[1]
             else:
                 val = self.group[1]
             l.append(':group=%s'%val)
-        if self.filter:
+        if self.filter and not args.has_key(':columns'):
             l.append(':filter=%s'%(','.join(self.filter)))
         for k,v in self.filterspec.items():
-            l.append('%s=%s'%(k, ','.join(v)))
-        if self.search_text:
+            if not args.has_key(k):
+                l.append('%s=%s'%(k, ','.join(v)))
+        if self.search_text and not args.has_key(':search_text'):
             l.append(':search_text=%s'%self.search_text)
-        l.append(':pagesize=%s'%self.pagesize)
-        l.append(':startwith=%s'%self.startwith)
+        if not args.has_key(':pagesize'):
+            l.append(':pagesize=%s'%self.pagesize)
+        if not args.has_key(':startwith'):
+            l.append(':startwith=%s'%self.startwith)
         return '%s?%s'%(url, '&'.join(l))
 
     def base_javascript(self):

diff --git a/roundup/templates/classic/html/issue.index b/roundup/templates/classic/html/issue.index
index 420d0e6a3b57494749126ae491c6dc7d634e136a..74741924d583c0819dd73e4b0016fcfc38a5cf97 100644 (file)
--- a/roundup/templates/classic/html/issue.index
+++ b/roundup/templates/classic/html/issue.index
@@ -59,9 +59,10 @@
    <td>
     <select name=":sort">
      <option value="">- nothing -</option>
-     <option tal:repeat="col request/columns"
-             tal:attributes="value col; selected python:col == request.sort[1]"
-             tal:content="col">column</option>
+     <option tal:repeat="col klass/properties"
+             tal:attributes="value col/name;
+                             selected python:col.name == request.sort[1]"
+             tal:content="col/name">column</option>
     </select>
    </td>
    <th>Descending:</th>
@@ -74,9 +75,10 @@
    <td>
     <select name=":group">
      <option value="">- nothing -</option>
-     <option tal:repeat="col request/columns"
-             tal:attributes="value col; selected python:col == request.group[1]"
-             tal:content="col">column</option>
+     <option tal:repeat="col klass/properties"
+             tal:attributes="value col/name;
+                             selected python:col.name == request.group[1]"
+             tal:content="col/name">column</option>
     </select>
    </td>
    <th>Descending:</th>