Merge branch 'Code4SA-upstream-edit-after-create'

flask_admin/contrib/appengine/view.py

@@ -56,7 +56,7 @@ class NdbModelView(BaseModelView):
 			model = self.model()
 			form.populate_obj(model)
 			model.put()
-			return True
+			return model
 		except Exception as ex:
 			if not self.handle_view_exception(ex):
 				#flash(gettext('Failed to create record. %(error)s',
@@ -137,7 +137,7 @@ class DbModelView(BaseModelView):
 			model = self.model()
 			form.populate_obj(model)
 			model.put()
-			return True
+			return model
 		except Exception as ex:
 			if not self.handle_view_exception(ex):
 				#flash(gettext('Failed to create record. %(error)s',

flask_admin/contrib/mongoengine/view.py

@@ -544,7 +544,7 @@ class ModelView(BaseModelView):
         else:
             self.after_model_change(form, model, True)
 
-        return True
+        return model
 
     def update_model(self, form, model):
         """

flask_admin/contrib/peewee/view.py

@@ -384,7 +384,7 @@ class ModelView(BaseModelView):
         else:
             self.after_model_change(form, model, True)
 
-        return True
+        return model
 
     def update_model(self, form, model):
         try:

flask_admin/contrib/pymongo/view.py

@@ -288,7 +288,7 @@ class ModelView(BaseModelView):
         else:
             self.after_model_change(form, model, True)
 
-        return True
+        return model
 
     def update_model(self, form, model):
         """

flask_admin/contrib/sqla/view.py

@@ -894,7 +894,7 @@ class ModelView(BaseModelView):
         else:
             self.after_model_change(form, model, True)
 
-        return True
+        return model
 
     def update_model(self, form, model):
         """

flask_admin/model/base.py

@@ -1243,7 +1243,7 @@ class BaseModelView(BaseView, ActionsMixin):
         """
             Create model from the form.
 
-            Returns `True` if operation succeeded.
+            Returns the model instance if operation succeeded.
 
             Must be implemented in the child class.
 
@@ -1550,12 +1550,20 @@ class BaseModelView(BaseView, ActionsMixin):
             self._validate_form_instance(ruleset=self._form_create_rules, form=form)
 
         if self.validate_form(form):
-            if self.create_model(form):
+            # in versions 1.1.0 and before, this returns a boolean
+            # in later versions, this is the model itself
+            model = self.create_model(form)
+            if model:
                 flash(gettext('Record was successfully created.'))
                 if '_add_another' in request.form:
                     return redirect(request.url)
                 else:
-                    return redirect(return_url)
+                    # if we have a valid model, try to go to the edit view
+                    if model is not True:
+                        url = self.get_url('.edit_view', id=self.get_pk_value(model), url=return_url)
+                    else:
+                        url = return_url
+                    return redirect(url)
 
         form_opts = FormOpts(widget_args=self.form_widget_args,
                              form_rules=self._form_create_rules)

flask_admin/tests/sqla/test_basic.py

-from nose.tools import eq_, ok_, raises
+from nose.tools import eq_, ok_, raises, assert_true
 
 from wtforms import fields
 
@@ -1669,10 +1669,14 @@ def test_safe_redirect():
                      data=dict(test1='test1large', test2='test2'))
 
     eq_(rv.status_code, 302)
-    eq_(rv.location, 'http://localhost/admin/model2view/')
+    assert_true(rv.location.startswith('http://localhost/admin/model1/edit/'))
+    assert_true('url=http%3A%2F%2Flocalhost%2Fadmin%2Fmodel2view%2F' in rv.location)
+    assert_true('id=1' in rv.location)
 
     rv = client.post('/admin/model1/new/?url=http://google.com/evil/',
                      data=dict(test1='test1large', test2='test2'))
 
     eq_(rv.status_code, 302)
-    eq_(rv.location, 'http://localhost/admin/model1/')
+    assert_true(rv.location.startswith('http://localhost/admin/model1/edit/'))
+    assert_true('url=%2Fadmin%2Fmodel1%2F' in rv.location)
+    assert_true('id=2' in rv.location)