Update RecordController update

Author: maab16

publishable/assets/js/app.js

@@ -10342,13 +10342,16 @@ __webpack_require__.r(__webpack_exports__);
               field: field
             }
           }).then(function (res) {
-            // console.log(res.data);
+            console.log(res.data);
+
             if (res.data.success == true) {
               toastr.success("Relation Deleted Successfully");
 
               _this4.fetchDatabaseTables();
             }
           })["catch"](function (err) {
+            console.log(err);
+
             _this4.displayError(err.response);
           });
         } else if (result.dismiss === Swal.DismissReason.cancel) {

resources/assets/js/views/crud/CrudFields.vue

@@ -303,13 +303,14 @@
                       }
                     })
                     .then(res => {
-                        // console.log(res.data);
+                        console.log(res.data);
                         if( res.data.success == true ){
                             toastr.success("Relation Deleted Successfully");
                             this.fetchDatabaseTables();
                         }
                     })
                     .catch(err => {
+                      console.log(err);
                       this.displayError(err.response);
                     });
 

src/Http/Controllers/RecordController.php

@@ -86,62 +86,68 @@ public function update(Request $request)
                 return $response;
             }
 
-            $tableName       = $request->table;
-            $originalColumns = Table::getColumnsName($tableName);
-            $columns         = json_decode($request->columns);
-            $fields          = json_decode($request->fields);
+            $tableName = $request->table;
+            $columns   = json_decode($request->columns);
+            $fields    = json_decode($request->fields);
 
             $errors = $this->validation($fields, $columns, 'update');
 
             if (count($errors) > 0) {
                 return $this->generateError($errors);
             }
 
-            $object  = DBM::Object()->where('name', $tableName)->first();
-            $model   = $object->model;
-            $details = $object->details;
-            $key     = $details['findColumn'];
+            $object = DBM::Object()->where('name', $tableName)->first();
 
-            if (!class_exists($model)) {
+            if (!class_exists($object->model)) {
                 return $this->generateError(["Model not found. Please create model first"]);
             }
 
             try {
+                $this->updateData($request, $object);
+                return response()->json(['success' => true]);
+            } catch (\Exception $e) {
+                return $this->generateError([$e->getMessage()]);
+            }
+        }
 
-                $table = DBM::model($model, $tableName)->where($key, $columns->{$key})->first();
+        return response()->json(['success' => false]);
+    }
 
-                foreach ($columns as $column => $value) {
+    public function updateData($request, $object)
+    {
+        $tableName       = $request->table;
+        $originalColumns = Table::getColumnsName($tableName);
+        $columns         = json_decode($request->columns);
+        $fields          = json_decode($request->fields);
+        $key             = $object->details['findColumn'];
 
-                    if (in_array($column, $originalColumns)) {
+        $table = DBM::model($object->model, $tableName)->where($key, $columns->{$key})->first();
 
-                        if ($request->hasFile($column)) {
-                            $value = $this->saveFiles($request, $column, $tableName);
-                        }
+        foreach ($columns as $column => $value) {
 
-                        if ($value !== null && $value !== "") {
+            if (in_array($column, $originalColumns)) {
 
-                            if (!Driver::isMongoDB()) {
-                                if ($functionName = $this->hasFunction($fields, $column)) {
-                                    $value = $this->executeFunction($functionName, $value);
-                                }
-                            }
+                if ($request->hasFile($column)) {
+                    $value = $this->saveFiles($request, $column, $tableName);
+                }
 
-                            $table->{$column} = $this->prepareStoreField($value, $tableName, $column);
+                if ($value !== null && $value !== "") {
+
+                    if (!Driver::isMongoDB()) {
+                        if ($functionName = $this->hasFunction($fields, $column)) {
+                            $value = $this->executeFunction($functionName, $value);
                         }
                     }
-                }
 
-                if ($table->update()) {
-                    $this->updateRelationshipData($fields, $columns, $object, $table);
-                    return response()->json(['success' => true]);
+                    $table->{$column} = $this->prepareStoreField($value, $tableName, $column);
                 }
-
-            } catch (\Exception $e) {
-                return $this->generateError([$e->getMessage()]);
             }
         }
 
-        return response()->json(['success' => false]);
+        if ($table->update()) {
+            $this->updateRelationshipData($fields, $columns, $object, $table);
+            return response()->json(['success' => true]);
+        }
     }
 
     public function delete(Request $request)