Changeset 2563230

Timestamp:

Apr 8, 2013, 2:52:19 PM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

ef118cf

Parents:

62f73df

git-author:

Alex Dehnert <adehnert@…> (04/08/13 14:52:19)

git-committer:

Alex Dehnert <adehnert@…> (04/08/13 14:52:19)

Message:

Filters: select by office/locker ownership

File:

• asadb/space/models.py (modified) (3 diffs)

asadb/space/models.py

@@ -134 +134 @@
 )
 
-def building_filter(building):
-    building_assignments = SpaceAssignment.current.filter(
-        space__number__startswith="%s-" % (building, ),
-    )
-    owners = groups.models.Group.objects.filter(
-        pk__in=building_assignments.values('group'),
-    )
+def assignment_filter(building=None, locker=None):
+    assign = SpaceAssignment.current.all()
+    if building:
+        assign = assign.filter(
+            space__number__startswith="%s-" % (building, ),
+        )
+    if locker == True:
+        assign = assign.exclude(locker_num="")
+    elif locker == False:
+        assign = assign.filter(locker_num="")
+    owners = groups.models.Group.objects.filter(pk__in=assign.values('group'))
     return owners
 
+groups.models.filter_registry.register(
+    category='space',
+    slug='space:locker',
+    name='Locker owners',
+    desc='Owners of lockers',
+    qs_thunk=lambda: assignment_filter(locker=True),
+)
+groups.models.filter_registry.register(
+    category='space',
+    slug='space:office',
+    name='Office owners',
+    desc='Owners of offices',
+    qs_thunk=lambda: assignment_filter(locker=False),
+)
 groups.models.filter_registry.register(
     category='space',
@@ -148 +166 @@
     name='W20 owners',
     desc='Owners of W20 space',
-    qs_thunk=lambda: building_filter('W20'),
+    qs_thunk=lambda: assignment_filter(building='W20'),
 )
 groups.models.filter_registry.register(
@@ -155 +173 @@
     name='Walker owners',
     desc='Owners of Walker space',
-    qs_thunk=lambda: building_filter('50'),
-)
+    qs_thunk=lambda: assignment_filter(building='50'),
+)
+
 
 class CurrentACLEntryManager(models.Manager):