prod
Dmitriy Shesterkin 9 years ago
parent 27d064edd1
commit f59d895fb0
  1. 32
      src/docs/views/base_views.py

@ -678,8 +678,6 @@ class BaseItemsViews(BaseViews):
receiver_choice = None receiver_choice = None
sender_choice = None sender_choice = None
# import ipdb;ipdb.set_trace()
if self.request.method == 'POST': if self.request.method == 'POST':
form = self.FORM_CLASS(self.request.user, data=self.request.POST) form = self.FORM_CLASS(self.request.user, data=self.request.POST)
@ -750,20 +748,25 @@ class BaseItemsViews(BaseViews):
if obj_items: if obj_items:
kwargs['initial_items'] = [] kwargs['initial_items'] = []
for item in obj_items: for item in obj_items:
d = model_to_dict( if getattr(self.ITEM_FORM_CLASS.Meta, 'fields', None) == '__all__':
item, md = model_to_dict(
fields=getattr(self.ITEM_FORM_CLASS.Meta, 'fields', None), item,
exclude=getattr(self.ITEM_FORM_CLASS.Meta, 'exclude', None) exclude=getattr(self.ITEM_FORM_CLASS.Meta, 'exclude', None)
) )
else:
md = model_to_dict(
item,
fields=getattr(self.ITEM_FORM_CLASS.Meta, 'fields', None),
exclude=getattr(self.ITEM_FORM_CLASS.Meta, 'exclude', None)
)
# обязательно убрать ключи # обязательно убрать ключи
d.pop('pk', None) md.pop('pk', None)
d.pop('id', None) md.pop('id', None)
d.pop('created_at', None) md.pop('created_at', None)
d.pop('updated_at', None) md.pop('updated_at', None)
kwargs['initial_items'].append(d) kwargs['initial_items'].append(md)
self.set_item_formset_class(extra_count=len(kwargs['initial_items'])) self.set_item_formset_class(extra_count=len(kwargs['initial_items']))
return self.add(self.request, *args, **kwargs) return self.add(self.request, *args, **kwargs)
@method_decorator(csrf_protect) @method_decorator(csrf_protect)
@ -804,8 +807,7 @@ class BaseItemsViews(BaseViews):
new_obj.receiver = new_obj.client new_obj.receiver = new_obj.client
elif receiver == 'nobody': elif receiver == 'nobody':
new_obj.receiver = None new_obj.receiver = None
#
#
sender = form.data.get('sender_group', None) sender = form.data.get('sender_group', None)
if sender == 'he_is': if sender == 'he_is':
new_obj.user_is_sender = True new_obj.user_is_sender = True

Loading…
Cancel
Save