diff --git a/dav_events/forms/events.py b/dav_events/forms/events.py index 1c1eb94..c865556 100644 --- a/dav_events/forms/events.py +++ b/dav_events/forms/events.py @@ -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 diff --git a/dav_events/forms/generic.py b/dav_events/forms/generic.py index 9a86b16..2760290 100644 --- a/dav_events/forms/generic.py +++ b/dav_events/forms/generic.py @@ -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):