CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #428 -- Timezone handling on event creation/update (#432)

Browse Source 
* add event timezone during event creation

* add timezone handling in EventUpdate

* added event creation test cases & form cleaning bug fix
This commit is contained in:
jlwt90
2017-03-14 00:44:05 +09:00
committed by Raphael Michel
parent 811c498080
commit af3e811f94
3 changed files with 119 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pretix/control/forms/event.py
View File

@@ -5,7 +5,7 @@ from django.core.validators import RegexValidator
from django.utils.timezone import get_current_timezone_name
from django.utils.translation import ugettext_lazy as _
from i18nfield.forms import I18nFormField, I18nTextarea
from pytz import common_timezones
from pytz import common_timezones, timezone
from pretix.base.forms import I18nModelForm, SettingsForm
from pretix.base.models import Event, Organizer
@@ -80,8 +80,23 @@ class EventWizardBasicsForm(I18nModelForm):
raise ValidationError({
'locale': _('Your default locale must also be enabled for your event (see box above).')
})
if data.get('timezone') not in common_timezones:
raise ValidationError({
'timezone': _('Your default locale must be specified.')
})
# change timezone
zone = timezone(data.get('timezone'))
data['date_from'] = self.reset_timezone(zone, data.get('date_from'))
data['date_to'] = self.reset_timezone(zone, data.get('date_to'))
data['presale_start'] = self.reset_timezone(zone, data.get('presale_start'))
data['presale_end'] = self.reset_timezone(zone, data.get('presale_end'))
return data
@staticmethod
def reset_timezone(tz, dt):
return tz.localize(dt.replace(tzinfo=None)) if dt is not None else None
def clean_slug(self):
slug = self.cleaned_data['slug']
if Event.objects.filter(slug=slug, organizer=self.organizer).exists():