Added Email origin to Email record creation throughout the codebase.

 - Legacy-Id: 15149

Author: levkowetz

ietf/doc/views_draft.py

@@ -954,6 +954,9 @@ def edit_shepherd(request, name):
                 events = []
 
                 doc.shepherd = form.cleaned_data['shepherd']
+                if not doc.shepherd.origin:
+                    doc.shepherd.origin = 'shepherd: %s' % doc.name
+                    doc.shepherd.save()
 
                 c = DocEvent(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person)
                 c.desc = "Document shepherd changed to "+ (doc.shepherd.person.name if doc.shepherd else "(None)")

ietf/group/views.py

@@ -958,6 +958,10 @@ def diff(attr, name):
                     group.role_set.filter(name=slug).delete()
                     for e in new:
                         Role.objects.get_or_create(name_id=slug, email=e, group=group, person=e.person)
+                        if not e.origin or e.origin == e.person.user.username:
+                            e.origin = "role: %s %s" % (group.acronym, slug)
+                            e.save()
+
                     added = set(new) - set(old)
                     deleted = set(old) - set(new)
                     if added:
@@ -1206,6 +1210,9 @@ def stream_edit(request, acronym):
                 group.role_set.filter(name=slug).delete()
                 for e in new:
                     Role.objects.get_or_create(name_id=slug, email=e, group=group, person=e.person)
+                    if not e.origin or e.origin == e.person.user.username:
+                        e.origin = "role: %s %s" % (group.acronym, slug)
+                        e.save()
 
             return redirect("ietf.group.views.streams")
     else:

ietf/liaisons/forms.py

@@ -500,6 +500,15 @@ def set_to_fields(self):
         if has_role(self.user, "Liaison Manager"):
             self.fields['to_groups'].initial = [queryset.first()]
 
+    def save(self, commit=False):
+        instance = super(EditModelForm, self).save(commit=False)
+
+        if 'from_contact' in self.changed_data:
+            email = self.cleaned_data.get('from_contact')
+            if not email.origin:
+                email.origin = "liaison: %s" % (','.join([ g.acronym for g in instance.from_groups.all() ]))
+                email.save()
+
 class EditLiaisonForm(LiaisonModelForm):
     def __init__(self, *args, **kwargs):
         super(EditLiaisonForm, self).__init__(*args, **kwargs)

ietf/nomcom/utils.py

@@ -372,7 +372,7 @@ def make_nomineeposition(nomcom, candidate, position, author):
 def make_nomineeposition_for_newperson(nomcom, candidate_name, candidate_email, position, author):
 
     # This is expected to fail if called with an existing email address
-    email = Email.objects.create(address=candidate_email, origin=nomcom.group.acronym)
+    email = Email.objects.create(address=candidate_email, origin="nominee: %s" % nomcom.group.acronym)
     person = Person.objects.create(name=candidate_name,
                                    ascii=unidecode_name(candidate_name),
                                    )

ietf/review/import_from_review_tool.py

@@ -101,7 +101,7 @@ def parse_timestamp(t):
                 for name in new_aliases:
                     Alias.objects.create(person=person, name=name)
 
-            email, created = Email.objects.get_or_create(address=row.email, person=person, origin=__name__)
+            email, created = Email.objects.get_or_create(address=row.email, person=person, origin="import: %s" % __name__)
             if created:
                 print "created email", email
 

ietf/secr/areas/views.py

@@ -214,6 +214,10 @@ def people(request, name):
                 # create role
                 Role.objects.create(name_id='pre-ad',group=area,email=email,person=person)
 
+                if not email.origin or email.origin == person.user.username:
+                    email.origin = "role: %s %s" % (area.acronym, 'pre-ad')
+                    email.save()
+
                 messages.success(request, 'New Area Director added successfully!')
                 return redirect('ietf.secr.areas.views.view', name=name)
     else:

ietf/secr/drafts/forms.py

@@ -178,6 +178,12 @@ def save(self, commit=False):
             else:
                 m.tags.remove('rfc-rev')
 
+        if 'shepherd' in self.changed_data:
+            email = self.cleaned_data.get('shepherd')
+            if not email.origin:
+                email.origin = 'shepherd: %s' % m.name
+                email.save()
+
         # handle replaced by
 
         return m

ietf/secr/groups/forms.py

@@ -193,6 +193,9 @@ def clean(self):
         name = cleaned_data['name']
         group_acronym = cleaned_data['group_acronym']
 
+        if email.person != person:
+            raise forms.ValidationError('ERROR: The person associated with the chosen email address is different from the chosen person')
+
         if Role.objects.filter(name=name,group=self.group,person=person,email=email):
             raise forms.ValidationError('ERROR: This is a duplicate entry')
 

ietf/secr/groups/views.py

@@ -347,6 +347,10 @@ def people(request, acronym):
                                 email=email,
                                 group=group)
 
+            if not email.origin or email.origin == person.user.username:
+                email.origin = "role: %s %s" % (group.acronym, name.slug)
+                email.save()
+
             messages.success(request, 'New %s added successfully!' % name)
             return redirect('ietf.secr.groups.views.people', acronym=group.acronym)
     else:

ietf/secr/roles/views.py

@@ -93,6 +93,10 @@ def main(request):
                                 email=email,
                                 group=group)
 
+            if not email.origin or email.origin == person.user.username:
+                email.origin = "role: %s %s" % (group.acronym, name.slug)
+                email.save()
+
             messages.success(request, 'New %s added successfully!' % name)
             url = reverse('ietf.secr.roles.views.main') + '?group=%s' % group.acronym
             return HttpResponseRedirect(url)