Changeset 8aea837

Timestamp:

Feb 17, 2013, 2:25:26 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

21f7242

Parents:

59506d6

git-author:

Alex Dehnert <adehnert@…> (02/17/13 02:25:26)

git-committer:

Alex Dehnert <adehnert@…> (02/17/13 02:25:26)

Message:

Incorporate feedback from CAC

• Expand the description for "CAC Combo Only"
• Link to the description of "CAC Key" on the ASA website

Location:

asadb

Files:

• space/fixtures/LockTypes.xml (modified) (6 diffs)
• space/migrations/0005_add_lock_type.py (modified) (3 diffs)
• space/models.py (modified) (1 diff)
• template/space/lock_types.html (modified) (1 diff)

asadb/space/fixtures/LockTypes.xml

@@ -6 +6 @@
         <field type="TextField" name="description">Office with the standard CAC-maintained card access system.</field>
         <field type="CharField" name="info_addr">asa-exec@mit.edu</field>
+        <field type="CharField" name="info_url"></field>
         <field type="CharField" name="db_update">cac-card</field>
     </object>
@@ -13 +14 @@
         <field type="TextField" name="description">Office accessed through another office owned by the same group, which therefore do not have a separate lock.</field>
         <field type="CharField" name="info_addr">asa-exec@mit.edu</field>
+        <field type="CharField" name="info_url"></field>
         <field type="CharField" name="db_update">none</field>
     </object>
@@ -18 +20 @@
         <field type="CharField" name="name">CAC Combo Only</field>
         <field type="SlugField" name="slug">cac-combo</field>
-        <field type="TextField" name="description">Room accessible only with a CAC-administered combination, rather than using IDs.</field>
+        <field type="TextField" name="description">Room accessible only with a CAC-administered combination, rather than using IDs. Presidents and Treasurers of organizations with this type of lock can come to the CAC office to request a combo change.</field>
         <field type="CharField" name="info_addr">caclocks@mit.edu</field>
+        <field type="CharField" name="info_url"></field>
         <field type="CharField" name="db_update">none</field>
     </object>
@@ -27 +30 @@
         <field type="TextField" name="description">Room accessible with a (physical, CAC-administered) key.</field>
         <field type="CharField" name="info_addr">asa-exec@mit.edu</field>
+        <field type="CharField" name="info_url">http://web.mit.edu/asa/resources/office-space-alloc.html#access-keys</field>
         <field type="CharField" name="db_update">none</field>
     </object>
@@ -34 +38 @@
         <field type="TextField" name="description">Room that the ASA does not (currently) know how to manage the access of. (If you know, please tell us at asa-exec@mit.edu.)</field>
         <field type="CharField" name="info_addr">asa-exec@mit.edu</field>
+        <field type="CharField" name="info_url"></field>
         <field type="CharField" name="db_update">none</field>
     </object>
@@ -41 +46 @@
         <field type="TextField" name="description">Room with access administered through SEMO (the Security and Emergency Management Office).</field>
         <field type="CharField" name="info_addr">asa-exec@mit.edu</field>
+        <field type="CharField" name="info_url"></field>
         <field type="CharField" name="db_update">none</field>
     </object>

asadb/space/migrations/0005_add_lock_type.py

@@ -16 +16 @@
             ('description', self.gf('django.db.models.fields.TextField')()),
             ('info_addr', self.gf('django.db.models.fields.EmailField')(default='asa-exec@mit.edu', max_length=75)),
+            ('info_url', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),
             ('db_update', self.gf('django.db.models.fields.CharField')(default='none', max_length=20)),
         ))
@@ -96 +97 @@
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'info_addr': ('django.db.models.fields.EmailField', [], {'default': "'asa-exec@mit.edu'", 'max_length': '75'}),
+            'info_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
             'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
@@ -116 +118 @@
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
             'space': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['space.Space']"}),
-            'start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 27, 17, 53, 25, 630881)', 'db_index': 'True'})
+            'start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 17, 2, 11, 27, 140773)', 'db_index': 'True'})
         },
         'space.spaceassignment': {

asadb/space/models.py

@@ -23 +23 @@
     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)
 

asadb/template/space/lock_types.html

@@ -18 +18 @@
 <tr>
     <th>{{lock_type.name}}</th>
-    <td>{{lock_type.description}}</td>
+    <td>{{lock_type.description}}{% if lock_type.info_url %} <a href='{{lock_type.info_url}}'>Details.</a>{%endif%}</td>
     <td><a href='mailto:{{lock_type.info_addr}}'>{{lock_type.info_addr}}</a></td>
     <td>{% if lock_type.db_update != "none" %}Yes: {%endif%}{{lock_type.get_db_update_display}}</td>