diff --git a/journals/migrations/0047_auto_20171101_0944.py b/journals/migrations/0047_auto_20171101_0944.py new file mode 100644 index 0000000000000000000000000000000000000000..93121c17b006fd00cf0526b76b923287d52f3edc --- /dev/null +++ b/journals/migrations/0047_auto_20171101_0944.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2017-11-01 08:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('journals', '0046_auto_20171019_1942'), + ] + + operations = [ + migrations.AlterField( + model_name='journal', + name='name', + field=models.CharField(choices=[('SciPostPhys', 'SciPost Physics'), ('SciPostPhysLectNotes', 'SciPost Physics Lecture Notes'), ('SciPostPhysProc', 'SciPost Physics Proceedings'), ('SciPostPhysSel', 'SciPost Physics Select'), ('SciPostPhysProc', 'SciPost Physics Proceedings')], max_length=100, unique=True), + ), + ] diff --git a/proceedings/forms.py b/proceedings/forms.py index bd8be93f0fc8c85e6fe364db1c978d2ea4da9c4b..f72822659eaaa1470c4deda196bce17d95ebf927 100644 --- a/proceedings/forms.py +++ b/proceedings/forms.py @@ -9,6 +9,7 @@ class ProceedingsForm(forms.ModelForm): fields = ( 'issue', 'event_name', + 'event_suffix', 'event_description', 'event_start_date', 'event_end_date', diff --git a/proceedings/migrations/0003_proceedings_event_suffix.py b/proceedings/migrations/0003_proceedings_event_suffix.py new file mode 100644 index 0000000000000000000000000000000000000000..106d87cee4a495cb2b9390cfc8c355d8a7131f66 --- /dev/null +++ b/proceedings/migrations/0003_proceedings_event_suffix.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2017-11-01 08:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('proceedings', '0002_remove_proceedings_issue_name'), + ] + + operations = [ + migrations.AddField( + model_name='proceedings', + name='event_suffix', + field=models.CharField(blank=True, max_length=256), + ), + ] diff --git a/proceedings/models.py b/proceedings/models.py index 83408cac946556362879ca29e7787118a50c2e6b..e651b807bb09ee2ed786b46058dbffd95582bb4c 100644 --- a/proceedings/models.py +++ b/proceedings/models.py @@ -19,6 +19,7 @@ class Proceedings(TimeStampedModel): # Event the Proceedings is for event_name = models.CharField(max_length=256, blank=True) + event_suffix = models.CharField(max_length=256, blank=True) event_description = models.TextField(blank=True) event_start_date = models.DateField(null=True, blank=True) event_end_date = models.DateField(null=True, blank=True) @@ -41,7 +42,10 @@ class Proceedings(TimeStampedModel): default_related_name = 'proceedings' def __str__(self): - return self.event_name + _str = self.event_name + if self.event_suffix: + _str += ' ({s})'.format(s=self.event_suffix) + return _str def get_absolute_url(self): return reverse('proceedings:proceedings_details', args=(self.id,)) diff --git a/submissions/migrations/0080_auto_20171101_0944.py b/submissions/migrations/0080_auto_20171101_0944.py new file mode 100644 index 0000000000000000000000000000000000000000..3091fb09b6fac14a9a50fb64ad25f25a1b9a8039 --- /dev/null +++ b/submissions/migrations/0080_auto_20171101_0944.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2017-11-01 08:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('submissions', '0079_auto_20171021_1456'), + ] + + operations = [ + migrations.AlterField( + model_name='submission', + name='submitted_to_journal', + field=models.CharField(choices=[('SciPostPhys', 'SciPost Physics'), ('SciPostPhysLectNotes', 'SciPost Physics Lecture Notes'), ('SciPostPhysProc', 'SciPost Physics Proceedings')], max_length=30, verbose_name='Journal to be submitted to'), + ), + ]