Changeset ef118cf for asadb/space/models.py

Timestamp:

Feb 11, 2014, 2:22:25 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

d4f571c

Parents:

2563230 (diff), e5c5180 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (02/11/14 02:22:25)

git-committer:

Alex Dehnert <adehnert@…> (02/11/14 02:22:25)

Message:

Merge branch 'master' into filters

• master: (107 commits) People lookup: Handle more name formats (ASA-#253) People lookup: specify intended format (ASA-#253) People lookup: handle round numbers (ASA-#253) People lookup: force names to lowercase (ASA-#252) Add hazing and non-discrimination links (ASA-#255) Correct description of submitted link Add missing column heading (ASA-#258) Re-wrap anti-hazing email (ASA-#256) Add recognition date to issues.csv People lookup: fix *small* groups... Add docs for setting up chosen.js Link people lookup tool from membership update page People lookup: mention the data source People lookup: Support large numbers of people People lookup: make the UI more reasonable Basic people lookup support (ASA-#186) Add pre-group-approval warnings Reword membership definition text More thoroughly purge mention of membership lists Standarize on UK-style ndashes ...

Conflicts:

asadb/groups/models.py

File:

• asadb/space/models.py (modified) (1 diff)

asadb/space/models.py

@@ -10 +10 @@
 
 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', help_text='Address groups should email to get more information about managing access through this lock type.')
+    info_url = models.URLField(blank=True, help_text='URL that groups can visit to get more information about this lock type.')
+    db_update = models.CharField(max_length=20, default='none', choices=lock_db_update_choices)
+
+    def __unicode__(self, ):
+        return self.name
+
 
 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, )