Set verbose name on a number of fields on Conference

diff --git a/postgresqleu/confreg/migrations/0001_initial.py b/postgresqleu/confreg/migrations/0001_initial.py
index e2efa0b7ffc1199c2b847c5cfd32983f84453d5b..fd6bef0988735b6e1cc87f1eb807f23da118f5c7 100644 (file)
--- a/postgresqleu/confreg/migrations/0001_initial.py
+++ b/postgresqleu/confreg/migrations/0001_initial.py
@@ -41,13 +41,13 @@ class Migration(migrations.Migration):
             name='Conference',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('urlname', models.CharField(unique=True, max_length=32, validators=[postgresqleu.util.validators.validate_lowercase])),
-                ('conferencename', models.CharField(max_length=64)),
-                ('startdate', models.DateField()),
-                ('enddate', models.DateField()),
+                ('urlname', models.CharField(unique=True, max_length=32, validators=[postgresqleu.util.validators.validate_lowercase], verbose_name='URL name')),
+                ('conferencename', models.CharField(max_length=64, verbose_name='Conference name')),
+                ('startdate', models.DateField(verbose_name='Start date')),
+                ('enddate', models.DateField(verbose_name='End date')),
                 ('location', models.CharField(max_length=128)),
-                ('contactaddr', models.EmailField(max_length=254)),
-                ('sponsoraddr', models.EmailField(max_length=254)),
+                ('contactaddr', models.EmailField(max_length=254, verbose_name='Contact address')),
+                ('sponsoraddr', models.EmailField(max_length=254, verbose_name='Sponsor address')),
                 ('active', models.BooleanField(default=False, verbose_name=b'Registration open')),
                 ('callforpapersopen', models.BooleanField(default=False, verbose_name="Call for papers open")),
                 ('callforsponsorsopen', models.BooleanField(default=False, verbose_name="Call for sponsors open")),
@@ -57,7 +57,7 @@ class Migration(migrations.Migration):
                 ('sessionsactive', models.BooleanField(default=False, verbose_name=b'Session list publishing active')),
                 ('schedulewidth', models.IntegerField(default=600, verbose_name=b'Width of HTML schedule')),
                 ('pixelsperminute', models.FloatField(default=1.5, verbose_name=b'Vertical pixels per minute')),
-                ('confurl', models.CharField(max_length=128, validators=[postgresqleu.util.validators.validate_lowercase])),
+                ('confurl', models.CharField(max_length=128, validators=[postgresqleu.util.validators.validate_lowercase], verbose_name='Conference URL')),
                 ('listadminurl', models.CharField(max_length=128, blank=True)),
                 ('listadminpwd', models.CharField(max_length=128, blank=True)),
                 ('speakerlistadminurl', models.CharField(max_length=128, blank=True)),

diff --git a/postgresqleu/confreg/migrations/0006_jinjadir.py b/postgresqleu/confreg/migrations/0006_jinjadir.py
index 12a8055c8237a1577887e766caf56b55e573dac1..c123ec89f9dbef483093b9626bfcebf9f046b038 100644 (file)
--- a/postgresqleu/confreg/migrations/0006_jinjadir.py
+++ b/postgresqleu/confreg/migrations/0006_jinjadir.py
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='conference',
             name='jinjadir',
-            field=models.CharField(default=None, max_length=200, null=True, help_text=b'Full path to new style jinja repository root', blank=True),
+            field=models.CharField(default=None, max_length=200, null=True, help_text=b'Full path to new style jinja repository root', blank=True, verbose_name='Jinja directory'),
         ),
     ]

diff --git a/postgresqleu/confreg/models.py b/postgresqleu/confreg/models.py
index 2a88ec04d9a17833c4efc5801ae60300173eba20..219e9c8c7a73f0109a94db72ea494331e086c713 100644 (file)
--- a/postgresqleu/confreg/models.py
+++ b/postgresqleu/confreg/models.py
@@ -90,14 +90,14 @@ class GlobalOptOut(models.Model):
 
 
 class Conference(models.Model):
-       urlname = models.CharField(max_length=32, blank=False, null=False, unique=True, validators=[validate_lowercase,])
-       conferencename = models.CharField(max_length=64, blank=False, null=False)
-       startdate = models.DateField(blank=False, null=False)
-       enddate = models.DateField(blank=False, null=False)
+       urlname = models.CharField(max_length=32, blank=False, null=False, unique=True, validators=[validate_lowercase,], verbose_name="URL name")
+       conferencename = models.CharField(max_length=64, blank=False, null=False, verbose_name="Conference name")
+       startdate = models.DateField(blank=False, null=False, verbose_name="Start date")
+       enddate = models.DateField(blank=False, null=False, verbose_name="End date")
        location = models.CharField(max_length=128, blank=False, null=False)
        timediff = models.IntegerField(null=False, blank=False, default=0)
-       contactaddr = models.EmailField(blank=False,null=False)
-       sponsoraddr = models.EmailField(blank=False,null=False)
+       contactaddr = models.EmailField(blank=False,null=False, verbose_name="Contact address")
+       sponsoraddr = models.EmailField(blank=False,null=False, verbose_name="Sponsor address")
        active = models.BooleanField(blank=False,null=False,default=False, verbose_name="Registration open")
        callforpapersopen = models.BooleanField(blank=False,null=False,default=False, verbose_name="Call for papers open")
        callforsponsorsopen = models.BooleanField(blank=False,null=False,default=False, verbose_name="Call for sponsors open")
@@ -108,7 +108,7 @@ class Conference(models.Model):
        sessionsactive = models.BooleanField(blank=False,null=False,default=False,verbose_name="Session list publishing active")
        schedulewidth = models.IntegerField(blank=False, default=600, null=False, verbose_name="Width of HTML schedule")
        pixelsperminute = models.FloatField(blank=False, default=1.5, null=False, verbose_name="Vertical pixels per minute")
-       confurl = models.CharField(max_length=128, blank=False, null=False, validators=[validate_lowercase,])
+       confurl = models.CharField(max_length=128, blank=False, null=False, validators=[validate_lowercase,], verbose_name="Conference URL")
        listadminurl = models.CharField(max_length=128, blank=True, null=False)
        listadminpwd = models.CharField(max_length=128, blank=True, null=False)
        speakerlistadminurl = models.CharField(max_length=128, blank=True, null=False)
@@ -134,7 +134,7 @@ class Conference(models.Model):
        askphotoconsent = models.BooleanField(null=False, blank=False, default=True, verbose_name="Field: photo consent", help_text="Include field for getting photo consent")
        skill_levels = models.BooleanField(blank=False, null=False, default=True)
        additionalintro = models.TextField(blank=True, null=False, help_text="Additional text shown just before the list of available additional options")
-       jinjadir = models.CharField(max_length=200, blank=True, null=True, default=None, help_text="Full path to new style jinja repository root")
+       jinjadir = models.CharField(max_length=200, blank=True, null=True, default=None, help_text="Full path to new style jinja repository root", verbose_name="Jinja directory")
        callforpapersintro = models.TextField(blank=True, null=False)
 
        sendwelcomemail = models.BooleanField(blank=False, null=False, default=False, verbose_name="Send welcome email", help_text="Send an email to attendees once their registration is completed.")