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

Bugfix in copy event feature: load_from_instance() initialized empty

Browse Source 
fields.
This commit is contained in:
heinzel
2018-03-14 16:33:18 +01:00
parent 369e2d55fc
commit 24e2a2effc
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dav_events/forms/events.py
View File

@@ -897,6 +897,8 @@ class SummaryForm(EventCreateForm):
widget=forms.Textarea(attrs={'rows': 5})) widget=forms.Textarea(attrs={'rows': 5}))
def proceed_session_data(self, session_data): def proceed_session_data(self, session_data):
super(SummaryForm, self).proceed_session_data(session_data)
registration_required = self._session_data.get('registration_required', False) registration_required = self._session_data.get('registration_required', False)
if registration_required: if registration_required:
deadline = self._session_data.get('deadline', None) deadline = self._session_data.get('deadline', None)

4
dav_events/forms/generic.py
View File

@@ -164,7 +164,9 @@ class ModelMixin(object):
raise TypeError('Expected %s' % model.__class__.__name__) raise TypeError('Expected %s' % model.__class__.__name__)
data = {} data = {}
for field in instance._meta.get_fields(): for field in instance._meta.get_fields():
data[field.name] = getattr(instance, field.name) v = getattr(instance, field.name)
if v is not None:
data[field.name] = getattr(instance, field.name)
self.is_bound = True self.is_bound = True
self.data = data self.data = data
return data return data

6
dav_events/views/events.py
View File

@@ -312,9 +312,11 @@ class EventCreateView(EventPermissionMixin, generic.FormView):
'publication_confirmed_at', 'publication_confirmed_by', 'publication_confirmed_at', 'publication_confirmed_by',
'number', 'number',
'planned_publication_date', 'internal_note',): 'planned_publication_date', 'internal_note',):
setattr(event, field, None) if hasattr(event, field):
setattr(event, field, None)
for field in ('accepted', 'publication_confirmed'): for field in ('accepted', 'publication_confirmed'):
setattr(event, field, False) if hasattr(event, field):
setattr(event, field, False)
initial_form_name = self.form_class.get_initial_form_name() initial_form_name = self.form_class.get_initial_form_name()
form_class = getattr(forms.events, initial_form_name) form_class = getattr(forms.events, initial_form_name)