Added a 'verbose_name' attribute to the GroupTypeName table, with updated admin and a data migration to provide verbose group names.

- Legacy-Id: 11579

ietf/name/admin.py

@@ -12,16 +12,20 @@ class NameAdmin(admin.ModelAdmin):
 
 class DocRelationshipNameAdmin(NameAdmin):
     list_display = ["slug", "name", "revname", "desc", "used"]
+admin.site.register(DocRelationshipName, DocRelationshipNameAdmin)
     
 class DocTypeNameAdmin(NameAdmin):
     list_display = ["slug", "name", "prefix", "desc", "used"]
+admin.site.register(DocTypeName, DocTypeNameAdmin)
+
+class GroupTypeNameAdmin(NameAdmin):
+    list_display = ["slug", "name", "verbose_name", "desc", "used"]
+admin.site.register(GroupTypeName, GroupTypeNameAdmin)
+
 
-admin.site.register(GroupTypeName, NameAdmin)
 admin.site.register(GroupStateName, NameAdmin)
 admin.site.register(RoleName, NameAdmin)
 admin.site.register(StreamName, NameAdmin)
-admin.site.register(DocRelationshipName, DocRelationshipNameAdmin)
-admin.site.register(DocTypeName, DocTypeNameAdmin)
 admin.site.register(DocTagName, NameAdmin)
 admin.site.register(StdLevelName, NameAdmin)
 admin.site.register(IntendedStdLevelName, NameAdmin)

ietf/name/migrations/0012_grouptypename_verbose_name.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0011_add_session_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='grouptypename',
+            name='verbose_name',
+            field=models.CharField(default=b'', max_length=255),
+            preserve_default=True,
+        ),
+    ]

ietf/name/migrations/0013_add_group_type_verbose_name_data.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+verbose_names = {
+    "wg":       "Working Group",
+    "team":	"Team",
+    "sdo":      "Standards Organization",
+    "rg":       "Research Group",
+    "rfcedtyp":	"The RFC Editor",
+    "nomcom":	"IETF/IAB Nominating Committee",
+    "isoc":	"The Internet Society",
+    "irtf":	"Internet Research Task Force",
+    "individ":	"An Individual",
+    "ietf":	"Internet Engineering Task Force",
+    "iab":      "Internet Architecture Board",
+    "dir":      "Area Directorate",
+    "area":	"Area",
+    "ag":       "Area Group",
+}
+
+def forward(apps, schema_editor):
+    GroupTypeName  = apps.get_model('name', 'GroupTypeName')
+    for slug, verbose_name in verbose_names.items():
+        name = GroupTypeName.objects.get(slug=slug)
+        name.verbose_name = verbose_name
+        name.save()
+
+def backward(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0012_grouptypename_verbose_name'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, backward)
+    ]

ietf/name/models.py

@@ -20,6 +20,7 @@ class GroupStateName(NameModel):
     """BOF, Proposed, Active, Dormant, Concluded, Abandoned"""
 class GroupTypeName(NameModel):
     """IETF, Area, WG, RG, Team, etc."""
+    verbose_name = models.CharField(max_length=255, default="")
 class GroupMilestoneStateName(NameModel):
     """Active, Deleted, For Review, Chartering"""
 class RoleName(NameModel):