Move handling related models to form.

michaelkuty · Mar 21, 2016 · c496279 · c496279
1 parent b930e08
commit c496279
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/horizon_contrib/forms/forms.py b/horizon_contrib/forms/forms.py
@@ -98,4 +98,10 @@ def handle(self, request, data):
                 messages.error(request, e.message)
                 messages.error(request, data)
             return False
+
+        else:
+            if hasattr(self, 'handle_related_models'):
+                # handle related models
+                self.handle_related_models(self.request, saved_model)
+
         return saved_model
diff --git a/horizon_contrib/forms/views.py b/horizon_contrib/forms/views.py
@@ -114,10 +114,6 @@ def form_valid(self, form):
 
         if handled:
 
-            if hasattr(form, 'handle_related_models'):
-                # handle related models
-                form.handle_related_models(self.request, handled)
-
             if ADD_TO_FIELD_HEADER in self.request.META:
                 field_id = self.request.META[ADD_TO_FIELD_HEADER]
                 data = [self.get_object_id(handled),
@@ -251,10 +247,7 @@ def form_valid(self, form):
         # handle is priotiry
         if hasattr(form, 'handle'):
 
-            try:
-                handled = super(CreateView, self).form_valid(form)
-            except Exception as e:
-                raise e
+            handled = super(CreateView, self).form_valid(form)
 
         elif hasattr(form, 'save'):