From e38ec2ab40104e4b654fd5c382bec5dee3cc97eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Raskovsky?= Date: Mon, 1 Jun 2015 15:49:30 -0300 Subject: [PATCH] Moved calling instantiate_enhanced_formsets to Process views and not Mixins --- enhanced_cbv/views/edit.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/enhanced_cbv/views/edit.py b/enhanced_cbv/views/edit.py index 8997501..6c55685 100644 --- a/enhanced_cbv/views/edit.py +++ b/enhanced_cbv/views/edit.py @@ -127,10 +127,6 @@ class FormSetsMixin(object): formsets = [] # must be a list of BaseGenericFormSet success_url = None - def dispatch(self, request, *args, **kwargs): - self.instantiate_enhanced_formsets() - return super(FormSetsMixin, self).dispatch(request, *args, **kwargs) - def get_formsets(self): return self.formsets @@ -280,6 +276,11 @@ class ProcessFormSetsView(View): """ A mixin that processes formsets on POST """ + + def dispatch(self, request, *args, **kwargs): + self.instantiate_enhanced_formsets() + return super(ProcessFormSetsView, self).dispatch(request, *args, **kwargs) + def get(self, request, *args, **kwargs): self.construct_formsets() return self.render_to_response(self.get_context_data()) @@ -295,7 +296,7 @@ def put(self, request, *args, **kwargs): return self.post(*args, **kwargs) -class ProcessInlineFormSetsView(View): +class ProcessInlineFormSetsView(ProcessFormSetsView): """ A mixin that processes a model instance and it's inline formsets on POST @@ -347,9 +348,6 @@ def post(self, request, *args, **kwargs): self.construct_formsets() return self.form_invalid(form) - def put(self, request, *args, **kwargs): - return self.post(*args, **kwargs) - class BaseFormSetsView(FormSetsMixin, ProcessFormSetsView): """