Improve create and update process

mcwebb · Jul 9, 2014 · 34d3596 · 34d3596
1 parent bce1cd2
commit 34d3596
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/Admin/Admin.php b/Admin/Admin.php
@@ -611,12 +611,18 @@ public function update($object)
             $extension->preUpdate($this, $object);
         }
 
-        $this->getModelManager()->update($object);
+        $result = $this->getModelManager()->update($object);
+        // BC compatibility
+        if (null !== $result) {
+            $object = $result;
+        }
 
         $this->postUpdate($object);
         foreach ($this->extensions as $extension) {
             $extension->postUpdate($this, $object);
         }
+
+        return $object;
     }
 
     /**
@@ -629,14 +635,20 @@ public function create($object)
             $extension->prePersist($this, $object);
         }
 
-        $this->getModelManager()->create($object);
+        $result = $this->getModelManager()->create($object);
+        // BC compatibility
+        if (null !== $result) {
+            $object = $result;
+        }
 
         $this->postPersist($object);
         foreach ($this->extensions as $extension) {
             $extension->postPersist($this, $object);
         }
 
         $this->createObjectSecurity($object);
+
+        return $object;
     }
 
     /**

diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php
@@ -317,7 +317,7 @@ public function editAction($id = null)
 
             // persist if the form was valid and if in preview mode the preview was approved
             if ($isFormValid && (!$this->isInPreviewMode() || $this->isPreviewApproved())) {
-                $this->admin->update($object);
+                $object = $this->admin->update($object);
 
                 if ($this->isXmlHttpRequest()) {
                     return $this->renderJson(array(
@@ -530,7 +530,7 @@ public function createAction()
                     throw new AccessDeniedException();
                 }
 
-                $this->admin->create($object);
+                $object = $this->admin->create($object);
 
                 if ($this->isXmlHttpRequest()) {
                     return $this->renderJson(array(

diff --git a/Model/ModelManagerInterface.php b/Model/ModelManagerInterface.php
@@ -35,14 +35,14 @@ public function getNewFieldDescriptionInstance($class, $name, array $options = a
     /**
      * @param mixed $object
      *
-     * @return void
+     * @return mixed
      */
     public function create($object);
 
     /**
      * @param mixed $object
      *
-     * @return void
+     * @return mixed
      */
     public function update($object);