Changeset 74e9f09

Timestamp:

Mar 16, 2012, 5:34:38 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

9a30b56

Parents:

080bf9a

git-author:

Alex Dehnert <adehnert@…> (03/16/12 05:34:38)

git-committer:

Alex Dehnert <adehnert@…> (03/16/12 05:34:38)

Message:

Mailman list updater improvements

• Don't remove people if either their old or new address was blank (the former because it won't work, and the latter because we want them to keep getting mail)
• Don't add people if their address is blank

Location:

asadb

Files:

• groups/diffs.py (modified) (3 diffs)
• template/groups/diffs/asa-official-update.txt (modified) (1 diff)

asadb/groups/diffs.py

@@ -144 +144 @@
         self.add = []
         self.delete = []
+        self.notes = []
 
     def end_run(self, ):
@@ -156 +157 @@
                 'delete': self.delete,
                 'errors': errors,
+                'notes': self.notes,
             }
             util.emails.email_from_template(
@@ -164 +166 @@
 
     def handle_group(self, before, after, before_fields, after_fields, ):
-        if before_fields['officer_email'] != after_fields['officer_email']:
+        before_addr = before_fields['officer_email']
+        after_addr  = after_fields['officer_email']
+        if before_addr != after_addr:
             name = after_fields['name']
-            self.add.append((after_fields['name'], after_fields['officer_email'], ))
-            self.delete.append(before_fields['officer_email'])
+            if after_addr:
+                self.add.append((name, after_addr, ))
+            else:
+                self.notes.append("%s: Not adding because address is blank." % (name, ))
+            if before_addr and after_addr:
+                # Don't remove an address unless there's a replacement
+                self.delete.append(before_fields['officer_email'])
+            else:
+                self.notes.append("%s: Not removing '%s' (to add '%s') because at least one is blank." % (name, before_addr, after_addr, ))
 
     def new_group(self, after, after_fields, ):

asadb/template/groups/diffs/asa-official-update.txt

@@ -14 +14 @@
 {% for email in delete %}{{email}}
 {% endfor %}
+
+Notes:
+{% for note in notes %}{{note}}
+{% empty %}No notes.
+{% endfor %}
 {% endautoescape %}