Better app and model names. Some model hygiene. Added admin.

 - Legacy-Id: 9993

Author: rjsparks

ietf/doc/mails.py

@@ -14,7 +14,7 @@
 from ietf.person.models import Person
 from ietf.group.models import Group, Role
 from ietf.doc.models import Document
-from ietf.eventmail.utils import gather_addresses
+from ietf.mailtoken.utils import gather_addresses
 
 def email_state_changed(request, doc, text):
     to = [x.strip() for x in doc.notify.replace(';', ',').split(',')]

ietf/doc/tests_ballot.py

@@ -15,7 +15,7 @@
 from ietf.utils.mail import outbox
 from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
-from ietf.eventmail.utils import gather_addresses
+from ietf.mailtoken.utils import gather_addresses
 
 
 class EditPositionTests(TestCase):

ietf/doc/views_ballot.py

@@ -27,7 +27,7 @@
 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.eventmail.utils import gather_addresses
+from ietf.mailtoken.utils import gather_addresses
 
 BALLOT_CHOICES = (("yes", "Yes"),
                   ("noobj", "No Objection"),

ietf/doc/views_draft.py

@@ -37,7 +37,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.eventmail.utils import gather_addresses
+from ietf.mailtoken.utils import gather_addresses
 
 class ChangeStateForm(forms.Form):
     state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg"), empty_label=None, required=True)

ietf/eventmail/urls.py

@@ -0,0 +1,17 @@
+from django.contrib import admin
+
+from ietf.mailtoken.models import MailToken, Recipient
+
+class RecipientAdmin(admin.ModelAdmin):
+    list_display = [ 'slug', 'desc', 'template', 'has_code', ]
+    def has_code(self, obj):
+        return hasattr(obj,'gather_%s'%obj.slug) 
+    has_code.boolean = True
+admin.site.register(Recipient, RecipientAdmin)
+
+
+class MailTokenAdmin(admin.ModelAdmin):
+    list_display = [ 'slug', 'desc',  ]
+    filter_horizontal = [ 'recipients' ]
+admin.site.register(MailToken, MailTokenAdmin)
+

ietf/eventmail/views.py

@@ -11,25 +11,32 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Ingredient',
+            name='MailToken',
             fields=[
                 ('slug', models.CharField(max_length=32, serialize=False, primary_key=True)),
                 ('desc', models.TextField(blank=True)),
-                ('template', models.CharField(max_length=512, null=True, blank=True)),
             ],
             options={
+                'ordering': ['slug'],
             },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
-            name='Recipe',
+            name='Recipient',
             fields=[
                 ('slug', models.CharField(max_length=32, serialize=False, primary_key=True)),
                 ('desc', models.TextField(blank=True)),
-                ('ingredients', models.ManyToManyField(to='eventmail.Ingredient', null=True, blank=True)),
+                ('template', models.CharField(max_length=512, null=True, blank=True)),
             ],
             options={
+                'ordering': ['slug'],
             },
             bases=(models.Model,),
         ),
+        migrations.AddField(
+            model_name='mailtoken',
+            name='recipients',
+            field=models.ManyToManyField(to='mailtoken.Recipient', null=True, blank=True),
+            preserve_default=True,
+        ),
     ]