X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tools%2Fmisc.py;h=ddc6cee7490dc6fc3492376f5e004821827b2952;hb=381c81a8ffac8c4b3abf6a762d031a7e261e8eaa;hp=1259ab7d706284e6abc2164e79d6d90cdbe50143;hpb=dec5a89fa614023c3e9fe7b0eff52eb186832f70;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/tools/misc.py b/tools/misc.py
index 1259ab7..ddc6cee 100644
--- a/tools/misc.py
+++ b/tools/misc.py
@@ -22,9 +22,38 @@ prints it to stdout and raises it again.
 def log_error(func):
     def show(*args, **kwargs):
         try:
-            func(*args, **kwargs)
+            return func(*args, **kwargs)
         except Exception, e:
             import traceback
             traceback.print_exc()
             raise e
     return show
+
+def make_choices(objects):
+    """
+    Transforms a list (or iteratable) of model objects to a list
+    suitable to be used as a list of choices in form widgets like
+    Select.
+
+    This fullfills a similar (but simpler) function as
+    django.forms.models.ModelChoiceIterator, but that one requires a
+    FormField and is not public.
+    """
+    return [(o.pk, o) for o in objects]
+
+def filter_choices(choices, filter):
+    """
+    Returns the given choices list with only the choices with the names
+    in filter left. For example, when a model defines
+    A   = 'A'
+    B   = 'B'
+    FOO_CHOICES = (
+        (A, "Foo A"),
+        (B, "Foo B")
+    )
+
+    you can later define a modelfield using
+
+    foo = ChoiceField(choices=filter_choices(Foo.FOO_CHOICES, [Foo.A]))
+    """
+    return [(name, value) for (name, value) in choices if name in filter]