Make use of groupDictBy in program.slots
authorSverre Rabbelier <srabbelier@gmail.com>
Sun, 08 Mar 2009 15:00:59 +0000
changeset 1750 1ac2d27fdb6b
parent 1749 a0ae6e6431a9
child 1751 17c7a7a48dc7
Make use of groupDictBy in program.slots Patch by: Sverre Rabbelier
app/soc/views/models/program.py
--- a/app/soc/views/models/program.py	Sun Mar 08 15:00:31 2009 +0000
+++ b/app/soc/views/models/program.py	Sun Mar 08 15:00:59 2009 +0000
@@ -179,16 +179,8 @@
       # filter out all orgs where the link_id is 'undefined'
       orgs = dict( ((k,v) for k, v in from_json if k != 'undefined'))
 
-      items = orgs.iteritems()
-
-      # whether the org has it's allocations locked
-      locked = ((k, v['slots']) for k, v in items if v['locked'])
-
-      # the adjustement for the org
-      adjusted = ((k, v['adjustment']) for k, v in items if v['adjustment'])
-
-      locked_slots = dict(locked)
-      adjusted_slots = dict(adjusted)
+      locked_slots = dicts.groupDictBy(orgs, 'locked', 'slots')
+      adjusted_slots = dicts.groupDictBy(orgs, 'adjustment')
     else:
       filter = {
           'scope': program,