mailtoken becomes mailtrigger

 - Legacy-Id: 10090

Author: rjsparks

ietf/doc/expire.py

@@ -10,7 +10,7 @@
 from ietf.person.models import Person 
 from ietf.meeting.models import Meeting
 from ietf.doc.utils import add_state_change_event
-from ietf.mailtoken.utils import gather_address_lists
+from ietf.mailtrigger.utils import gather_address_lists
 
 
 def expirable_draft(draft):

ietf/doc/mails.py

@@ -14,10 +14,10 @@
 from ietf.doc.utils import needed_ballot_positions, get_document_content
 from ietf.group.models import Role
 from ietf.doc.models import Document
-from ietf.mailtoken.utils import gather_address_lists
+from ietf.mailtrigger.utils import gather_address_lists
 
-def email_state_changed(request, doc, text, mailtoken_id=None):
-    (to,cc) = gather_address_lists(mailtoken_id or 'doc_state_edited',doc=doc)
+def email_state_changed(request, doc, text, mailtrigger_id=None):
+    (to,cc) = gather_address_lists(mailtrigger_id or 'doc_state_edited',doc=doc)
     if not to:
         return
 

ietf/doc/tests_ballot.py

@@ -152,7 +152,7 @@ def test_send_ballot_comment(self):
         # send
         mailbox_before = len(outbox)
 
-        r = self.client.post(url, dict(extra_cc="test298347@example.com", cc_tokens=['doc_notify','doc_group_chairs']))
+        r = self.client.post(url, dict(extra_cc="test298347@example.com", cc_choices=['doc_notify','doc_group_chairs']))
         self.assertEqual(r.status_code, 302)
 
         self.assertEqual(len(outbox), mailbox_before + 1)
@@ -163,11 +163,11 @@ def test_send_ballot_comment(self):
         self.assertTrue("clearer title" in str(m))
         self.assertTrue("Test!" in str(m))
         self.assertTrue("iesg@" in m['To'])
-        # cc_token doc_group_chairs
+        # cc_choice doc_group_chairs
         self.assertTrue("mars-chairs@" in m['Cc'])
-        # cc_token doc_notify
+        # cc_choice doc_notify
         self.assertTrue("somebody@example.com" in m['Cc'])
-        # cc_token doc_group_email_list was not selected
+        # cc_choice doc_group_email_list was not selected
         self.assertFalse(draft.group.list_email in m['Cc'])
         # extra-cc    
         self.assertTrue("test298347@example.com" in m['Cc'])

ietf/doc/utils.py

@@ -18,7 +18,7 @@
 from ietf.ietfauth.utils import has_role
 from ietf.utils import draft, markup_txt
 from ietf.utils.mail import send_mail
-from ietf.mailtoken.utils import gather_address_lists
+from ietf.mailtrigger.utils import gather_address_lists
 
 #TODO FIXME - it would be better if this lived in ietf/doc/mails.py, but there's
 #        an import order issue to work out.
@@ -524,7 +524,7 @@ def check_common_doc_name_rules(name):
         raise ValidationError(errors)
 
 def get_initial_notify(doc,extra=None):
-    # With the mailtoken based changes, a document's notify should start empty
+    # With the mailtrigger based changes, a document's notify should start empty
     receivers = []
 
     if extra:

ietf/doc/utils_charter.py

@@ -6,7 +6,7 @@
 from ietf.doc.models import NewRevisionDocEvent, WriteupDocEvent 
 from ietf.utils.history import find_history_active_at
 from ietf.utils.mail import parse_preformatted
-from ietf.mailtoken.utils import gather_address_lists
+from ietf.mailtrigger.utils import gather_address_lists
 
 def charter_name_for_group(group):
     if group.type_id == "rg":

ietf/doc/views_ballot.py

@@ -27,8 +27,8 @@
 from ietf.name.models import BallotPositionName
 from ietf.person.models import Person
 from ietf.utils.mail import send_mail_text, send_mail_preformatted
-from ietf.mailtoken.utils import gather_address_lists
-from ietf.mailtoken.forms import CcSelectForm
+from ietf.mailtrigger.utils import gather_address_lists
+from ietf.mailtrigger.forms import CcSelectForm
 
 BALLOT_CHOICES = (("yes", "Yes"),
                   ("noobj", "No Objection"),
@@ -289,7 +289,7 @@ def send_ballot_comment(request, name, ballot_id):
 
     if request.method == 'POST':
         cc = []
-        cc_select_form = CcSelectForm(data=request.POST,mailtoken_slug='ballot_saved',mailtoken_context={'doc':doc})
+        cc_select_form = CcSelectForm(data=request.POST,mailtrigger_slug='ballot_saved',mailtrigger_context={'doc':doc})
         if cc_select_form.is_valid():
             cc.extend(cc_select_form.get_selected_addresses())
         extra_cc = [x.strip() for x in request.POST.get("extra_cc","").split(',') if x.strip()]
@@ -302,7 +302,7 @@ def send_ballot_comment(request, name, ballot_id):
 
     else: 
 
-        cc_select_form = CcSelectForm(mailtoken_slug='ballot_saved',mailtoken_context={'doc':doc})
+        cc_select_form = CcSelectForm(mailtrigger_slug='ballot_saved',mailtrigger_context={'doc':doc})
 
     return render_to_response('doc/ballot/send_ballot_comment.html',
                               dict(doc=doc,

ietf/doc/views_conflict_review.py

@@ -20,7 +20,7 @@
 from ietf.person.models import Person
 from ietf.utils.mail import send_mail_preformatted
 from ietf.utils.textupload import get_cleaned_text_file_content
-from ietf.mailtoken.utils import gather_address_lists
+from ietf.mailtrigger.utils import gather_address_lists
 
 class ChangeStateForm(forms.Form):
     review_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev"), label="Conflict review state", empty_label=None, required=True)

ietf/doc/views_doc.py

@@ -59,7 +59,7 @@
 from ietf.utils.history import find_history_active_at
 from ietf.doc.forms import TelechatForm, NotifyForm
 from ietf.doc.mails import email_comment 
-from ietf.mailtoken.utils import gather_relevant_expansions
+from ietf.mailtrigger.utils import gather_relevant_expansions
 
 def render_document_top(request, doc, tab, name):
     tabs = []

ietf/doc/views_draft.py

@@ -38,7 +38,7 @@
 from ietf.secr.lib.template import jsonapi
 from ietf.utils.mail import send_mail, send_mail_message
 from ietf.utils.textupload import get_cleaned_text_file_content
-from ietf.mailtoken.utils import gather_address_lists
+from ietf.mailtrigger.utils import gather_address_lists
 
 class ChangeStateForm(forms.Form):
     state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg"), empty_label=None, required=True)

ietf/doc/views_status_change.py

@@ -22,7 +22,7 @@
 from ietf.person.models import Person
 from ietf.utils.mail import send_mail_preformatted
 from ietf.utils.textupload import get_cleaned_text_file_content
-from ietf.mailtoken.utils import gather_address_lists
+from ietf.mailtrigger.utils import gather_address_lists
 
 class ChangeStateForm(forms.Form):
     new_state = forms.ModelChoiceField(State.objects.filter(type="statchg", used=True), label="Status Change Evaluation State", empty_label=None, required=True)