From 456c833ac956d4a93b08cba9e175caf8050f1677 Mon Sep 17 00:00:00 2001 From: "Jonathan S. Katz" Date: Sun, 4 Nov 2018 10:47:54 -0500 Subject: [PATCH] Remove "Description for Community Event" from form and deprecrate for admins. This was used primarily to collect information about potential community events in the beginning of the process. Now that we have about a years' worth of data, we don't need this form anymore, and can start to sunset it out. --- pgweb/events/forms.py | 7 +------ pgweb/events/migrations/0002_event_badged.py | 2 +- pgweb/events/models.py | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pgweb/events/forms.py b/pgweb/events/forms.py index b0028b9a..9dfce0c8 100644 --- a/pgweb/events/forms.py +++ b/pgweb/events/forms.py @@ -11,11 +11,6 @@ class EventForm(forms.ModelForm): 'invert': True, 'fields': ['city', 'state', 'country',] }, - { - 'name': 'badged', - 'invert': False, - 'fields': ['description_for_badged',] - }, ] def __init__(self, *args, **kwargs): super(EventForm, self).__init__(*args, **kwargs) @@ -51,4 +46,4 @@ class EventForm(forms.ModelForm): class Meta: model = Event - exclude = ('submitter', 'approved', ) + exclude = ('submitter', 'approved', 'description_for_badged') diff --git a/pgweb/events/migrations/0002_event_badged.py b/pgweb/events/migrations/0002_event_badged.py index 8f0c79e5..e10e720a 100644 --- a/pgweb/events/migrations/0002_event_badged.py +++ b/pgweb/events/migrations/0002_event_badged.py @@ -19,6 +19,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='event', name='description_for_badged', - field=models.TextField(help_text=b'Please describe how this is a community recognized event following the community event guidelines. Please be as detailed as possible.', null=True, blank=True, verbose_name=b'Description for community event'), + field=models.TextField(help_text=b'DEPRECRATED: This was used in the beginning of community events to collect additional information.', null=True, blank=True, verbose_name=b'Description for community event'), ), ] diff --git a/pgweb/events/models.py b/pgweb/events/models.py index 45add272..02a37146 100644 --- a/pgweb/events/models.py +++ b/pgweb/events/models.py @@ -15,7 +15,7 @@ class Event(models.Model): training = models.BooleanField(null=False, blank=False, default=False) badged = models.BooleanField(null=False, blank=False, default=False, verbose_name='Community event', help_text='Choose "Community event" if this is a community recognized event following the community event guidelines.') - description_for_badged = models.TextField(blank=True, null=True, verbose_name='Description for community event', help_text='Please describe how this is a community recognized event following the community event guidelines. Please be as detailed as possible.') + description_for_badged = models.TextField(blank=True, null=True, verbose_name='Description for community event', help_text='DEPRECRATED: This was used in the beginning of community events to collect additional information.') startdate = models.DateField(null=False, blank=False, verbose_name="Start date") enddate = models.DateField(null=False, blank=False, verbose_name="End date") -- 2.39.5