Skip to content

Commit 3af4759

Browse files
author
Richard Jones
committed
bugfix
1 parent 12e8596 commit 3af4759

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

roundup/backends/back_anydbm.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
#$Id: back_anydbm.py,v 1.69 2002-09-03 07:33:01 richard Exp $
18+
#$Id: back_anydbm.py,v 1.70 2002-09-04 04:29:36 richard Exp $
1919
'''
2020
This module defines a backend that saves the hyperdatabase in a database
2121
chosen by anydbm. It is guaranteed to always be available in python
@@ -1606,7 +1606,7 @@ def sortfun(a, b, sort=sort, group=group, properties=self.getprops(),
16061606
b_id, bn = b
16071607
# sort by group and then sort
16081608
for dir, prop in group, sort:
1609-
if dir is None: continue
1609+
if dir is None or prop is None: continue
16101610

16111611
# sorting is class-specific
16121612
propclass = properties[prop]
@@ -1909,6 +1909,9 @@ def __init__(self, db, classname, **properties):
19091909

19101910
#
19111911
#$Log: not supported by cvs2svn $
1912+
#Revision 1.69 2002/09/03 07:33:01 richard
1913+
#allow overiding of the index args roundup/cgi/templating.py
1914+
#
19121915
#Revision 1.68 2002/09/03 05:46:20 richard
19131916
#handle disappearing users for journaltags
19141917
#

roundup/backends/back_gadfly.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: back_gadfly.py,v 1.11 2002-09-03 22:11:50 richard Exp $
1+
# $Id: back_gadfly.py,v 1.12 2002-09-04 04:30:18 richard Exp $
22
__doc__ = '''
33
About Gadfly
44
============
@@ -1519,7 +1519,7 @@ def filter(self, search_matches, filterspec, sort, group):
15191519
# figure the order by clause
15201520
orderby = []
15211521
ordercols = []
1522-
if sort is not None:
1522+
if sort[0] is not None and sort[1] is not None:
15231523
if sort[0] != '-':
15241524
orderby.append('_'+sort[1])
15251525
ordercols.append(sort[1])
@@ -1530,7 +1530,7 @@ def filter(self, search_matches, filterspec, sort, group):
15301530
# figure the group by clause
15311531
groupby = []
15321532
groupcols = []
1533-
if group is not None:
1533+
if group[0] is not None and group[1] is not None:
15341534
if group[0] != '-':
15351535
groupby.append('_'+group[1])
15361536
groupcols.append(group[1])
@@ -1758,6 +1758,9 @@ def __init__(self, db, classname, **properties):
17581758

17591759
#
17601760
# $Log: not supported by cvs2svn $
1761+
# Revision 1.11 2002/09/03 22:11:50 richard
1762+
# *** empty log message ***
1763+
#
17611764
# Revision 1.10 2002/09/03 06:08:50 richard
17621765
# oops
17631766
#

0 commit comments

Comments
 (0)