Changeset 584 for tags/telemeta-0.5.0/telemeta/web/base.py

Timestamp:

02/17/10 16:38:55 (7 months ago)

Author:

olivier

Message:

merge r582 and r583 into telemeta 0.5.0 tag

Location:

tags/telemeta-0.5.0

Files:

• . (modified) (1 prop)
• telemeta/web/base.py (modified) (1 diff)

tags/telemeta-0.5.0/telemeta/web/base.py

@@ -240 +240 @@
             func = switch.get(key)
             if func and value and value != "0":
-                res = func(value)
-                if len(res) > 2:
-                    collections, items, value = res
-                else: 
-                    collections, items = res
+                try:
+                    res = func(value)
+                    if len(res) > 2:
+                        collections, items, value = res
+                    else: 
+                        collections, items = res
+                except ObjectDoesNotExist:
+                    collections = collections.none()
+                    items = items.none()
+
                 criteria[key] = value