Merge pull request #32 from CottaCush/features/action-upgrades

Allow for extra fields update while deleting
CottaCush · Nov 3, 2017 · cf08523 · cf08523
2 parents f4958a6 + 563509a
commit cf08523
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/Action/DeleteAction.php b/src/Action/DeleteAction.php
@@ -19,6 +19,9 @@ class DeleteAction extends BaseAction
     public $deleteStatus = 0;
     public $errorMessage = 'Record not found';
 
+    public $extraFields = null;
+    public $formName = '';
+
     /**
      * @author Adegoke Obasa <goke@cottacush.com>
      * @author Akinwunmi Taiwo <taiwo@cottacush.com>
@@ -33,16 +36,18 @@ public function run()
         $controller->isPostCheck($referrerUrl);
 
         if (!$this->model) {
-            $controller->flashError($this->errorMessage);
-        } else {
-            $this->model->{$this->deleteAttribute} = $this->deleteStatus;
-            if (!$this->model->save()) {
-                $controller->flashError($this->model->getErrors());
-            } else {
-                $controller->flashSuccess($this->successMessage);
-            }
+            return $controller->returnError($this->errorMessage, $this->returnUrl);
+        }
+
+        $this->model->{$this->deleteAttribute} = $this->deleteStatus;
+        if ($this->extraFields) {
+            $this->model->load($this->extraFields,$this->formName);
+        }
+
+        if (!$this->model->save()) {
+            return $controller->returnError($this->model->getErrors(), $this->returnUrl);
         }
 
-        return $controller->redirect($this->returnUrl);
+        return $controller->returnSuccess($this->successMessage, $this->returnUrl);
     }
 }