DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

Fixed bug in form initial handling.

Browse Source
This commit is contained in:
heinzel
2018-02-24 16:33:06 +01:00
parent 85d57ea48e
commit 883d6f308a
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dav_events/forms/events.py
View File

@@ -490,7 +490,8 @@ class DescriptionForm(EventCreateForm):
widget=forms.Textarea(attrs={'rows': 5}))
def get_initial_for_field(self, field, field_name):
if field_name == 'title':
value = super(DescriptionForm, self).get_initial_for_field(field, field_name)
if field_name == 'title' and value is None:
mode = self._session_data.get('mode', None)
sport = self._session_data.get('sport', None)
level = self._session_data.get('level', None)
@@ -521,8 +522,6 @@ class DescriptionForm(EventCreateForm):
if app_config.settings.forms_development_init:
if not value:
value = u'%s' % choices.SPORT_CHOICES.get_label(sport)
else:
value = super(DescriptionForm, self).get_initial_for_field(field, field_name)
return value

12
dav_events/forms/generic.py
View File

@@ -103,12 +103,12 @@ class ChainedForm(forms.Form):
return cls._next_form_name
def get_initial_for_field(self, field, field_name):
form_name = self.__class__.__name__
form_initials = app_config.settings.form_initials
if form_name in form_initials and field_name in form_initials[form_name]:
value = app_config.settings.form_initials[form_name][field_name].get_value(self._session_data)
else:
value = super(ChainedForm, self).get_initial_for_field(field, field_name)
value = super(ChainedForm, self).get_initial_for_field(field, field_name)
if value is None:
form_name = self.__class__.__name__
form_initials = app_config.settings.form_initials
if form_name in form_initials and field_name in form_initials[form_name]:
value = app_config.settings.form_initials[form_name][field_name].get_value(self._session_data)
return value
def save(self):