From 2933bf43173d875cf00f9eb440905b6c5f792638 Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 4 Sep 2002 04:30:18 +0000 Subject: [PATCH] bugfix git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1057 57a73879-2fb5-44c3-a270-3262357dd7e2 --- roundup/backends/back_anydbm.py | 7 +++++-- roundup/backends/back_gadfly.py | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/roundup/backends/back_anydbm.py b/roundup/backends/back_anydbm.py index 46c44d1..cfb2681 100644 --- 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.69 2002-09-03 07:33:01 richard Exp $ +#$Id: back_anydbm.py,v 1.70 2002-09-04 04:29:36 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 @@ -1606,7 +1606,7 @@ class Class(hyperdb.Class): b_id, bn = b # sort by group and then sort for dir, prop in group, sort: - if dir is None: continue + if dir is None or prop is None: continue # sorting is class-specific propclass = properties[prop] @@ -1909,6 +1909,9 @@ class IssueClass(Class, roundupdb.IssueClass): # #$Log: not supported by cvs2svn $ +#Revision 1.69 2002/09/03 07:33:01 richard +#allow overiding of the index args roundup/cgi/templating.py +# #Revision 1.68 2002/09/03 05:46:20 richard #handle disappearing users for journaltags # diff --git a/roundup/backends/back_gadfly.py b/roundup/backends/back_gadfly.py index 954947a..0ed6e03 100644 --- a/roundup/backends/back_gadfly.py +++ b/roundup/backends/back_gadfly.py @@ -1,4 +1,4 @@ -# $Id: back_gadfly.py,v 1.11 2002-09-03 22:11:50 richard Exp $ +# $Id: back_gadfly.py,v 1.12 2002-09-04 04:30:18 richard Exp $ __doc__ = ''' About Gadfly ============ @@ -1519,7 +1519,7 @@ class Class(hyperdb.Class): # figure the order by clause orderby = [] ordercols = [] - if sort is not None: + if sort[0] is not None and sort[1] is not None: if sort[0] != '-': orderby.append('_'+sort[1]) ordercols.append(sort[1]) @@ -1530,7 +1530,7 @@ class Class(hyperdb.Class): # figure the group by clause groupby = [] groupcols = [] - if group is not None: + if group[0] is not None and group[1] is not None: if group[0] != '-': groupby.append('_'+group[1]) groupcols.append(group[1]) @@ -1758,6 +1758,9 @@ class IssueClass(Class, roundupdb.IssueClass): # # $Log: not supported by cvs2svn $ +# Revision 1.11 2002/09/03 22:11:50 richard +# *** empty log message *** +# # Revision 1.10 2002/09/03 06:08:50 richard # oops # -- 2.30.2