Switch to using DataType name instead of slug in BREAD unique validat…

…ion (#3040)
thedevdojo · Apr 30, 2018 · f3eb501 · f3eb501
1 parent c127d06
commit f3eb501
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Http/Controllers/Controller.php b/src/Http/Controllers/Controller.php
@@ -136,12 +136,12 @@ public function insertUpdateData($request, $slug, $rows, $data)
      *
      * @return mixed
      */
-    public function validateBread($request, $data, $slug = null, $id = null)
+    public function validateBread($request, $data, $name = null, $id = null)
     {
         $rules = [];
         $messages = [];
         $customAttributes = [];
-        $is_update = $slug && $id;
+        $is_update = $name && $id;
 
         $fieldsWithValidationRules = $this->getFieldsWithValidationRules($data);
 
@@ -162,7 +162,7 @@ public function validateBread($request, $data, $slug = null, $id = null)
             if ($is_update) {
                 foreach ($rules[$fieldName] as &$fieldRule) {
                     if (strpos(strtoupper($fieldRule), 'UNIQUE') !== false) {
-                        $fieldRule = \Illuminate\Validation\Rule::unique($slug)->ignore($id);
+                        $fieldRule = \Illuminate\Validation\Rule::unique($name)->ignore($id);
                     }
                 }
             }

diff --git a/src/Http/Controllers/VoyagerBaseController.php b/src/Http/Controllers/VoyagerBaseController.php
@@ -218,7 +218,7 @@ public function update(Request $request, $id)
         $this->authorize('edit', $data);
 
         // Validate fields with ajax
-        $val = $this->validateBread($request->all(), $dataType->editRows, $slug, $id);
+        $val = $this->validateBread($request->all(), $dataType->editRows, $dataType->name, $id);
 
         if ($val->fails()) {
             return response()->json(['errors' => $val->messages()]);