Changeset 1eee8d1 for asadb/space

Timestamp:

Jan 27, 2013, 5:47:43 PM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

dcb389e

Parents:

d0bfc27

git-author:

Alex Dehnert <adehnert@…> (07/01/12 03:32:34)

git-committer:

Alex Dehnert <adehnert@…> (01/27/13 17:47:43)

Message:

WIP: more LockType? stuff

Location:

asadb/space

Files:

• admin.py (modified) (2 diffs)
• models.py (modified) (1 diff)

asadb/space/admin.py

@@ -2 +2 @@
 from django.contrib import admin
 from reversion.admin import VersionAdmin
+
+class Admin_LockType(VersionAdmin):
+    list_display = (
+        'id',
+        'name',
+        'slug',
+        'info_addr',
+        'db_update',
+    )
+    list_display_links = ( 'id', 'name', 'slug', )
+    search_fields = ('name', 'slug', 'info_addr', 'db_update', )
+admin.site.register(space.models.LockType, Admin_LockType)
 
 class Admin_Space(VersionAdmin):
@@ -8 +20 @@
         'number',
         'asa_owned',
+        'lock_type',
         'merged_acl',
     )
     list_display_links = ( 'id', 'number', )
+    list_filter = ('lock_type', )
     search_fields = ('number', )
 admin.site.register(space.models.Space, Admin_Space)

asadb/space/models.py

@@ -11 +11 @@
 EXPIRE_OFFSET   = datetime.timedelta(seconds=1)
 
+LOCK_DB_UPDATE_NONE = None
+LOCK_DB_UPDATE_CAC_CARD = 'cac-card'
+lock_db_update_choices = (
+    (LOCK_DB_UPDATE_NONE, "No database management"),
+    (LOCK_DB_UPDATE_CAC_CARD, "CAC-managed card-based access"),
+)
+
 class LockType(models.Model):
     name = models.CharField(max_length=50)
     slug = models.SlugField(unique=True, )
-
+    description = models.TextField()
+    info_addr = models.EmailField(default='asa-exec@mit.edu')
+    db_update = models.CharField(null=True, max_length=20, default=None, choices=lock_db_update_choices)
 
 class Space(models.Model):
     number = models.CharField(max_length=20, unique=True, )
     asa_owned = models.BooleanField(default=True, )
+    lock_type = models.ForeignKey(LockType)
     merged_acl = models.BooleanField(default=False, help_text="Does this room have a single merged ACL, that combines all groups together, or CAC maintain a separate ACL per-group? Generally, the shared storage offices get a merged ACL and everything else doesn't.")
     notes = models.TextField(blank=True, )