fix nested scope bug in multilink sorting in rdbms filtering

Author: Richard Jones

CHANGES.txt

@@ -7,6 +7,8 @@ Fixed:
 - user editing Role entry help text always appears
 - disable forking server when os.fork() not available (sf bug 938586)
 - removed Boolean from source to make py <2.3 happy (sf bug 938790)
+- fix nested scope bug in rdbms multilink sorting
+- re-seed the random number generator for each request
 
 
 2004-04-18 0.7.0b3

roundup/backends/back_mysql.py

@@ -698,7 +698,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             r.append((id, m))
         i = 0
         for sortby in mlsort:
-            def sortfun(a, b, dir=sortby[i]):
+            def sortfun(a, b, dir=sortby[i], i=i):
                 if dir == '-':
                     return cmp(b[1][i], a[1][i])
                 else:

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.92 2004-04-20 05:47:33 richard Exp $
+# $Id: rdbms_common.py,v 1.93 2004-04-22 22:17:34 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2127,7 +2127,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             r.append((id, m))
         i = 0
         for sortby in mlsort:
-            def sortfun(a, b, dir=sortby[i]):
+            def sortfun(a, b, dir=sortby[i], i=i):
                 if dir == '-':
                     return cmp(b[1][i], a[1][i])
                 else:

tools/load_tracker.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# $Id: load_tracker.py,v 1.2 2004-04-20 21:57:29 richard Exp $
+# $Id: load_tracker.py,v 1.3 2004-04-22 22:17:34 richard Exp $
 
 '''
 Usage: %s <tracker home> <N>
@@ -71,7 +71,7 @@
             priority=random.choice(priorities),
             status=random.choice(statuses),
             assignedto=random.choice(users))
-        if i%100:
+        if i%10:
             db.commit()
     print