Merged in [14104] from rcross@amsl.com:

Update secretariat admin permissions.  Change AnnouncementFrom.address to CharField because full emails, with real name, fail EmailField validation. Includes migration.
 - Legacy-Id: 14109
Note: SVN reference [14104] has been migrated to Git commit 6772afdd24
This commit is contained in:
Henrik Levkowetz 2017-09-08 13:28:44 +00:00
commit a6a85385ac
3 changed files with 22 additions and 1 deletions

View file

@ -66,6 +66,7 @@ def main():
'meeting.add_meeting','meeting.change_meeting','meeting.delete_meeting',
'meeting.add_room','meeting.change_room','meeting.delete_room',
'meeting.add_urlresource','meeting.change_urlresource','meeting.delete_urlresource',
'message.add_announcementfrom','message.change_announcementfrom','message.delete_announcementfrom',
'person.add_person','person.change_person','person.delete_person',
'person.add_alias','person.change_alias','person.delete_alias',
'person.add_email','person.change_email','person.delete_email',

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2017-09-06 15:25
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('message', '0007_auto_20170731_0508'),
]
operations = [
migrations.AlterField(
model_name='announcementfrom',
name='address',
field=models.CharField(max_length=255),
),
]

View file

@ -67,7 +67,7 @@ class SendQueue(models.Model):
class AnnouncementFrom(models.Model):
name = models.ForeignKey(RoleName)
group = models.ForeignKey(Group)
address = models.EmailField()
address = models.CharField(max_length=255)
def __unicode__(self):
return self.address