From f59d895fb0491ff7149f4248560ebe4cae571847 Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Sun, 13 Aug 2017 11:15:20 +0300 Subject: [PATCH] fix copy --- src/docs/views/base_views.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/docs/views/base_views.py b/src/docs/views/base_views.py index 0e32d98..ff272aa 100644 --- a/src/docs/views/base_views.py +++ b/src/docs/views/base_views.py @@ -678,8 +678,6 @@ class BaseItemsViews(BaseViews): receiver_choice = None sender_choice = None - # import ipdb;ipdb.set_trace() - if self.request.method == 'POST': form = self.FORM_CLASS(self.request.user, data=self.request.POST) @@ -750,20 +748,25 @@ class BaseItemsViews(BaseViews): if obj_items: kwargs['initial_items'] = [] for item in obj_items: - d = model_to_dict( - item, - fields=getattr(self.ITEM_FORM_CLASS.Meta, 'fields', None), - exclude=getattr(self.ITEM_FORM_CLASS.Meta, 'exclude', None) - ) + if getattr(self.ITEM_FORM_CLASS.Meta, 'fields', None) == '__all__': + md = model_to_dict( + item, + 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) - d.pop('id', None) - d.pop('created_at', None) - d.pop('updated_at', None) - kwargs['initial_items'].append(d) + md.pop('pk', None) + md.pop('id', None) + md.pop('created_at', None) + md.pop('updated_at', None) + kwargs['initial_items'].append(md) self.set_item_formset_class(extra_count=len(kwargs['initial_items'])) - return self.add(self.request, *args, **kwargs) @method_decorator(csrf_protect) @@ -804,8 +807,7 @@ class BaseItemsViews(BaseViews): new_obj.receiver = new_obj.client elif receiver == 'nobody': new_obj.receiver = None - # - # + sender = form.data.get('sender_group', None) if sender == 'he_is': new_obj.user_is_sender = True