Ticket #1582: sorting.patch

turbogears/paginate.py

@@ -339 +339 @@
-    if isinstance(var_data, SelectResults):
-        col = getattr(var_data.sourceClass.q, colname, None)
-
- or isinstance(var_data, Query)
+
-        col = getattr(
-                var_data._query.mapper.c,
-                colname[len(var_data._query.mapper.column_prefix or ''):],
-                None)
-
+    elif isinstance(var_data, Query):
+        col = getattr(
+                var_data.mapper.c,
+                colname[len(var_data.mapper.column_prefix or ''):],
+                None)
+        #if no attribute is found, let's try searching for 'foreign' objects...
+        # eg.: address.user.occupation.name
+        if not col and colname.find('.'):
+            seq = colname.split('.')
+            mapper = var_data.mapper
+            for propname in seq[:-1]:
+                prop = mapper.properties.get(propname)
+                if not prop:
+                    break
+                mapper = prop.mapper
+            # last item from split should be a simple attribute
+            col = getattr(
+                    mapper.c,
+                    seq[-1][len(mapper.column_prefix or ''):],
+                    None)
-    else:
-        raise StandardError, 'expected SelectResults'
-
@@ -369 +389 @@
-    return order_col
-
-# Ordering re:
-
+(\.\w+)*
-
-def convert_ordering(ordering):
-    """Covert ordering unicode string to dict."""
@@ -389 +409 @@
-            assert len(ordering_info_find) > 0, emsg
-            for ordering_info in ordering_info_find:
-                ordering_key = str(ordering_info[0]).strip("'")
-1
-2
+2
+3
-                new_ordering[ordering_key] = [ordering_order,
-                                              ordering_reverse]
-        except StandardError, e: