summaryrefslogtreecommitdiff
path: root/postgresqleu
diff options
context:
space:
mode:
Diffstat (limited to 'postgresqleu')
-rw-r--r--postgresqleu/confreg/backendforms.py4
-rw-r--r--postgresqleu/confreg/migrations/0082_conference_showvotes.py18
-rw-r--r--postgresqleu/confreg/models.py1
3 files changed, 21 insertions, 2 deletions
diff --git a/postgresqleu/confreg/backendforms.py b/postgresqleu/confreg/backendforms.py
index 1f1bf695..71f8c04e 100644
--- a/postgresqleu/confreg/backendforms.py
+++ b/postgresqleu/confreg/backendforms.py
@@ -74,7 +74,7 @@ class BackendConferenceForm(BackendForm):
'schedulewidth', 'pixelsperminute', 'notifyregs', 'notifysessionstatus', 'notifyvolunteerstatus',
'testers', 'talkvoters', 'staff', 'volunteers', 'checkinprocessors',
'asktshirt', 'askfood', 'asknick', 'asktwitter', 'askbadgescan', 'askshareemail', 'askphotoconsent',
- 'skill_levels', 'additionalintro', 'callforpapersintro', 'callforpaperstags', 'sendwelcomemail', 'welcomemail',
+ 'skill_levels', 'additionalintro', 'callforpapersintro', 'showvotes', 'callforpaperstags', 'sendwelcomemail', 'welcomemail',
'tickets', 'queuepartitioning', 'invoice_autocancel_hours', 'attendees_before_waitlist',
'initial_common_countries', 'jinjaenabled']
widgets = {
@@ -95,7 +95,7 @@ class BackendConferenceForm(BackendForm):
{'id': 'twitter', 'legend': 'Twitter settings', 'fields': ['twitter_timewindow_start', 'twitter_timewindow_end', 'twitter_postpolicy', ]},
{'id': 'fields', 'legend': 'Registration fields', 'fields': ['asktshirt', 'askfood', 'asknick', 'asktwitter', 'askbadgescan', 'askshareemail', 'askphotoconsent', 'additionalintro', ]},
{'id': 'steps', 'legend': 'Steps', 'fields': ['active', 'allowedit', 'callforpapersopen', 'callforsponsorsopen', 'scheduleactive', 'sessionsactive', 'cardsactive', 'checkinactive', 'conferencefeedbackopen', 'feedbackopen']},
- {'id': 'callforpapers', 'legend': 'Call for papers', 'fields': ['skill_levels', 'callforpaperstags', 'callforpapersintro']},
+ {'id': 'callforpapers', 'legend': 'Call for papers', 'fields': ['skill_levels', 'callforpaperstags', 'callforpapersintro', 'showvotes']},
{'id': 'roles', 'legend': 'Roles', 'fields': ['testers', 'talkvoters', 'staff', 'volunteers', 'checkinprocessors', ]},
{'id': 'display', 'legend': 'Display', 'fields': ['jinjaenabled', ]},
{'id': 'legacy', 'legend': 'Legacy', 'fields': ['schedulewidth', 'pixelsperminute']},
diff --git a/postgresqleu/confreg/migrations/0082_conference_showvotes.py b/postgresqleu/confreg/migrations/0082_conference_showvotes.py
new file mode 100644
index 00000000..8b48f41b
--- /dev/null
+++ b/postgresqleu/confreg/migrations/0082_conference_showvotes.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-05-08 09:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('confreg', '0081_conferenceregistration_localoptout'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='conference',
+ name='showvotes',
+ field=models.BooleanField(default=False, help_text="Show other people's votes on the talkvote page", verbose_name='Show votes'),
+ ),
+ ]
diff --git a/postgresqleu/confreg/models.py b/postgresqleu/confreg/models.py
index c20f6ec8..e56032eb 100644
--- a/postgresqleu/confreg/models.py
+++ b/postgresqleu/confreg/models.py
@@ -200,6 +200,7 @@ class Conference(models.Model):
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, verbose_name="Call for papers intro")
callforpaperstags = models.BooleanField(blank=False, null=False, default=False, verbose_name='Use tags')
+ showvotes = models.BooleanField(blank=False, null=False, default=False, verbose_name="Show votes", help_text="Show other people's votes on the talkvote page")
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.")
welcomemail = models.TextField(blank=True, null=False, verbose_name="Welcome email contents")