Add the option to separate the validation by sections

eliurkis · Jan 26, 2018 · b0f9793 · b0f9793
1 parent e710552
commit b0f9793
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/CrudController.php b/src/CrudController.php
@@ -173,7 +173,7 @@ protected function manageFiles($row, $request)
 
     public function store(Request $request)
     {
-        $this->validateRequest($request);
+        $this->validateRequest($request, 'store');
 
         DB::beginTransaction();
 
@@ -222,7 +222,7 @@ public function edit($id)
 
     public function update(Request $request, $id)
     {
-        $this->validateRequest($request);
+        $this->validateRequest($request, 'update');
 
         DB::beginTransaction();
 
@@ -477,8 +477,9 @@ protected function prepareLinks()
 
     /**
      * @param Request $request
+     * @param         $type
      */
-    protected function validateRequest($request)
+    protected function validateRequest($request, $type)
     {
         $validations = [
             'rules'            => [],
@@ -487,8 +488,15 @@ protected function validateRequest($request)
         ];
 
         foreach ($this->fields as $field => $options) {
-            if (isset($options['validation'])) {
-                $validations['rules'][$field] = $options['validation'];
+            $validation = null;
+            if (isset($options['validation'][$type])) {
+                $validation = $options['validation'][$type];
+            } elseif (isset($options['validation']) && is_string($options['validation'])) {
+                $validation = $options['validation'];
+            }
+
+            if ($validation != '') {
+                $validations['rules'][$field] = $validation;
                 $validations['customAttributes'][$field] = $options['label'];
             }
         }