Changeset ecf87c8 for asadb/space/diffs.py

Timestamp:

Jun 5, 2013, 5:53:11 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

17c118f

Parents:

242566d (diff), 72a3d90 (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@…> (06/05/13 05:53:05)

git-committer:

Alex Dehnert <adehnert@…> (06/05/13 05:53:11)

Message:

Merge branch 'space-access'

This branch was created to fix ASA-#96 ("Differentiate between spaces CAC does
and does not manage access to"), but also fixes a wide variety of other
space-related issues.

• space-access: (23 commits) Fill in the office access timeframe Fix grammar ({e,a}ffect) Punt another spurious slash Use "Space Access" more consistently Add "Details" link to "Space access" page Rename 50-030 to 50-032 and set its lock type Space: tell groups CAC should reply (ASA-#235) Warn people off the "Space access" page (ASA-#233) Don't let people edit spaces the DB doesn't manage More Walker rooms Correct Walker room access Add info_url to the admin Incorporate feedback from CAC Update the space emails with non-DB-managed info Comment space/diffs.py's locker code a bit better Show lock types on manage access page Describe the lock types and list on space summary Add list of lock types and assign them to rooms Use pagename "groups", not "group" WIP: more non-CAC space work ...

File:

• asadb/space/diffs.py (modified) (7 diffs)

asadb/space/diffs.py

@@ -8 +8 @@
     cur_file = os.path.abspath(__file__)
     django_dir = os.path.abspath(os.path.join(os.path.dirname(cur_file), '..'))
+    django_dir_parent = os.path.abspath(os.path.join(os.path.dirname(cur_file), '../..'))
     sys.path.append(django_dir)
+    sys.path.append(django_dir_parent)
     os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 from django.core.mail import EmailMessage
+from django.core.urlresolvers import reverse
 from django.db import connection
 from django.db.models import Q
@@ -100 +103 @@
 
     def list_office_changes(self, ):
-        cac_lines = []
+        systems_lines = {
+            'cac-card': [],
+            'none': [],
+        }
         group_lines = []
-        def append_change(mit_id, verb, name):
-            cac_lines.append("%s:\t%s:\t%s" % (mit_id, verb, name))
-            group_lines.append("%s:\t%s" % (verb, name))
         for space_pk, space_data in self.offices.items():
+            lock_type = all_spaces[space_pk].lock_type
+            system_lines = systems_lines[lock_type.db_update]
+            def append_change(mit_id, verb, name):
+                system_lines.append("%s:\t%s:\t%s" % (mit_id, verb, name))
+                group_lines.append("%s:\t%s" % (verb, name))
+
             line = "Changes in %s:" % (all_spaces[space_pk].number, )
-            cac_lines.append(line)
+            system_lines.append(line)
             group_lines.append(line)
+
+            if lock_type.db_update == 'none':
+                tmpl =  'Warning: You submitted changes affecting this space, but this space is ' + \
+                        'a "%s" space, and is not managed through the ASA DB. See ' + \
+                        'https://asa.mit.edu%s for details on how to update spaces of this type.'
+                line = tmpl % (lock_type.name, reverse('space-lock-type'), )
+                group_lines.append(line)
+
             for mit_id, (old_names, new_names) in space_data.items():
                 if mit_id is None: mit_id = "ID unknown"
@@ -125 +142 @@
                         else:
                             append_change(mit_id, "Add", name)
-            cac_lines.append("")
+            system_lines.append("")
             group_lines.append("")
 
-        cac_msg = "\n".join(cac_lines)
+        systems_msg = dict([
+            (system, '\n'.join(lines), ) for (system, lines) in systems_lines.items()
+        ])
         group_msg = "\n".join(group_lines)
-        return cac_msg, group_msg
+        return systems_msg, group_msg
 
     def add_locker_signatories(self, space_access, time):
@@ -177 +196 @@
 
 def safe_add_change_real(change_by_name, change):
+    """Add a new change to our dict of pending changes.
+
+    If a different change has already been added for this person (eg, "Remove"
+    instead of "Keep", or with a different list of groups), error.  This should
+    always succeed; if it doesn't, the code is buggy. We worry about this
+    because we want to be really sure that the email that goes to just CAC is
+    compatible with the emails that go to each groups. Since we iterate over
+    the changes once per group, we want to be sure that for each group
+    iteration we're building compatible information.
+    """
+
     name = change.name
     if name in change_by_name:
@@ -200 +230 @@
         print "ID=%s (%s):\n\t%s\t(%s)\n\t%s\t(%s)\n" % (mit_id, unchanged, old_by_names, old_by_group, new_by_names, new_by_group, ),
         for group_pk in joint_keys(old_by_group, new_by_group):
+            # TODO: Do we need to do an iteration for each group? This seems
+            # slightly questionable. Can we just loop over all known names?
+
             old_names = old_by_group[group_pk]
             new_names = new_by_group[group_pk]
@@ -267 +300 @@
     cac_locker_msgs = []
 
-    process_spaces =  space.models.Space.objects.all()
+    process_spaces =  space.models.Space.objects.all().select_related('lock_type')
     for the_space in process_spaces:
         new_cac_msgs = space_specific_access(the_space, group_data, old_time, new_time)
@@ -274 +307 @@
 
     changed_groups = []
+    cac_chars = 0
     for group_pk, group_info in group_data.items():
         group_info.add_office_signatories(old_time, new_time)
-        cac_changes, group_office_changes = group_info.list_office_changes()
+        systems_changes, group_office_changes = group_info.list_office_changes()
         if group_info.changes:
-            changed_groups.append((group_info.group, cac_changes, group_office_changes, group_info.locker_messages, ))
+            cac_chars += len(systems_changes['cac-card'])
+            changed_groups.append((group_info.group, systems_changes['cac-card'], group_office_changes, group_info.locker_messages, ))
 
     asa_rcpts = ['asa-space@mit.edu', 'asa-db@mit.edu', ]
-    if changed_groups:
+    if cac_chars > 0 or cac_locker_msgs:
         util.emails.email_from_template(
             tmpl='space/cac-change-email.txt',