Laravel-Backpack / CRUD

src/CrudTrait.php

Spacing +4 added lines, -4 removed lines

@@ -12,14 +12,14 @@
     |--------------------------------------------------------------------------
     */
 
-    public static function getPossibleEnumValues($field_name){
+    public static function getPossibleEnumValues($field_name) {
         $instance = new static; // create an instance of the model to be able to get the table name
-        $type = DB::select( DB::raw('SHOW COLUMNS FROM '.$instance->getTable().' WHERE Field = "'.$field_name.'"') )[0]->Type;
+        $type = DB::select(DB::raw('SHOW COLUMNS FROM '.$instance->getTable().' WHERE Field = "'.$field_name.'"'))[0]->Type;
         preg_match('/^enum\((.*)\)$/', $type, $matches);
         $enum = array();
         $exploded = explode(',', $matches[1]);
-        foreach($exploded as $value){
-            $v = trim( $value, "'" );
+        foreach ($exploded as $value) {
+            $v = trim($value, "'");
             $enum[] = $v;
         }
         return $enum;

src/app/Http/Controllers/ExampleCrudController.php

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 										'model' => "App\Models\Example"
 									],
 								];
-		$this->crud->fields =  [
+		$this->crud->fields = [
 								[
 									'name' => 'name',
 									'label' => "Example item text"

src/Crud.php

Spacing +17 added lines, -17 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function getCreateFields()
     {
-        return $this->prepareFields(empty($this->create_fields)?$this->fields:$this->create_fields);
+        return $this->prepareFields(empty($this->create_fields) ? $this->fields : $this->create_fields);
     }
 
 
@@ -90,11 +90,11 @@ 
     {
         foreach ($this->relations as $key => $relation)
         {
-            if ($relation['pivot']){
+            if ($relation['pivot']) {
                 $model->{$relation['name']}()->sync($data[$key]);
 
-                foreach($relation['pivotFields'] as $pivotField){
-                   foreach($data[$pivotField] as $pivot_id =>  $field){
+                foreach ($relation['pivotFields'] as $pivotField) {
+                   foreach ($data[$pivotField] as $pivot_id =>  $field) {
                      $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
                    }
                 }
@@ -252,7 +252,7 @@ 
      */
     public function getUpdateFields($id)
     {
-        $fields = $this->prepareFields(empty($this->update_fields)?$this->fields:$this->update_fields);
+        $fields = $this->prepareFields(empty($this->update_fields) ? $this->fields : $this->update_fields);
         $entry = $this->getEntry($id);
 
         foreach ($fields as $k => $field) {
@@ -376,13 +376,13 @@ 
     public function allowAccess($access)
     {
         // $this->addButtons((array)$access);
-        return $this->access = array_merge(array_diff((array)$access, $this->access), $this->access);
+        return $this->access = array_merge(array_diff((array) $access, $this->access), $this->access);
     }
 
     public function denyAccess($access)
     {
         // $this->removeButtons((array)$access);
-        return $this->access = array_diff($this->access, (array)$access);
+        return $this->access = array_diff($this->access, (array) $access);
     }
 
     /**
@@ -595,7 +595,7 @@ 
      */
     public function addDefaultTypeToColumn($column)
     {
-        if (array_key_exists('name', (array)$column))
+        if (array_key_exists('name', (array) $column))
         {
             $default_type = $this->getFieldTypeFromDbColumnType($column['name']);
             return array_merge(['type' => $default_type], $column);
@@ -611,7 +611,7 @@ 
      * @param [field or column]
      */
     public function addDefaultLabel($array) {
-        if (!array_key_exists('label', (array)$array) && array_key_exists('name', (array)$array)) {
+        if (!array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) {
             $array = array_merge(['label' => ucfirst($this->makeLabel($array['name']))], $array);
             return $array;
         }
@@ -785,7 +785,7 @@ 
         array_map(function($field) {
             // $this->labels[$field] = $this->makeLabel($field);
 
-            $this->fields[] =  [
+            $this->fields[] = [
                                 'name' => $field,
                                 'label' => ucfirst($field),
                                 'value' => '', 'default' => $this->field_types[$field]['default'],
@@ -1127,7 +1127,7 @@ 
 
     public function orderColumns($order)
     {
-        $this->setSort('columns', (array)$order);
+        $this->setSort('columns', (array) $order);
     }
 
 
@@ -1202,13 +1202,13 @@ 
 
     public function orderFields($order)
     {
-        $this->setSort('fields', (array)$order);
+        $this->setSort('fields', (array) $order);
     }
 
 
     public function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array) $field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
 
         return false;
     }
@@ -1247,7 +1247,7 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array) $fields)) $field = array_merge($field, $attributes);
 
                 return $field;
             }, $this->{$type});
@@ -1258,7 +1258,7 @@ 
 
     public function remove($entity, $fields)
     {
-        return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);}));
+        return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array) $fields); }));
     }
 
     public function setSort($items, $order)
@@ -1277,7 +1277,7 @@ 
                 if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
             }
 
-            return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
+            return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]); }));
         }
 
         return $this->{$items};
@@ -1290,7 +1290,7 @@ 
     // cred ca ia valorile din tabela de legatura ca sa ti le afiseze in select
     public function getRelationValues($model, $field, $where = [], $order = [])
     {
-        $order = (array)$order;
+        $order = (array) $order;
         $values = $model->select('*');
 
         if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));

Braces +47 added lines, -18 removed lines

@@ -238,7 +238,9 @@ 
         $item = $this->model->findOrFail($id);
         $updated = $item->update($this->compactFakeFields($data));
 
-        if ($updated) $this->syncPivot($item, $data);
+        if ($updated) {
+            $this->syncPivot($item, $data);
+        }
 
         return $item;
     }
@@ -436,7 +438,9 @@ 
      */
     public function setModel($model_namespace)
     {
-        if (!class_exists($model_namespace)) throw new \Exception('This model does not exist.', 404);
+        if (!class_exists($model_namespace)) {
+            throw new \Exception('This model does not exist.', 404);
+        }
 
         $this->model = new $model_namespace();
         $this->query = $this->model->select('*');
@@ -478,7 +482,9 @@ 
     {
         $complete_route = $route.'.index';
 
-        if (!\Route::has($complete_route)) throw new \Exception('There are no routes for this route name.', 404);
+        if (!\Route::has($complete_route)) {
+            throw new \Exception('There are no routes for this route name.', 404);
+        }
 
         $this->route = route($complete_route, $parameters);
         $this->initButtons();
@@ -534,8 +540,7 @@ 
                 // if label and other details have been defined in the array
                 if (is_array($columns[0])) {
                     $this->addColumn($column);
-                }
-                else
+                } else
                 {
                     $this->addColumn([
                                     'name' => $column,
@@ -831,11 +836,17 @@ 
      */
     public function getFieldTypeFromDbColumnType($field)
     {
-        if (!array_key_exists($field, $this->field_types)) return 'text';
+        if (!array_key_exists($field, $this->field_types)) {
+            return 'text';
+        }
 
-        if ($field == 'password') return 'password';
+        if ($field == 'password') {
+            return 'password';
+        }
 
-        if ($field == 'email') return 'email';
+        if ($field == 'email') {
+            return 'email';
+        }
 
         switch ($this->field_types[$field]['type'])
         {
@@ -908,7 +919,9 @@ 
         $columns = \Schema::getColumnListing($this->model->getTable());
         $fillable = $this->model->getFillable();
 
-        if (!empty($fillable)) $columns = array_intersect($columns, $fillable);
+        if (!empty($fillable)) {
+            $columns = array_intersect($columns, $fillable);
+        }
 
         // but not updated_at, deleted_at
         return array_values(array_diff($columns, [$this->model->getKeyName(), 'updated_at', 'deleted_at']));
@@ -1208,7 +1221,9 @@ 
 
     public function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array)$field)) {
+            return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        }
 
         return false;
     }
@@ -1226,8 +1241,11 @@ 
 
             foreach ($this->{$fields} as $key => $field)
             {
-                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) $this->{$fields}[$key]['value'] = $this->entry->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
-                    else $this->{$fields}[$key]['value'] = $this->entry->{$field['name']};
+                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) {
+                    $this->{$fields}[$key]['value'] = $this->entry->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
+                } else {
+                        $this->{$fields}[$key]['value'] = $this->entry->{$field['name']};
+                    }
             }
         }
     }
@@ -1247,7 +1265,9 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array)$fields)) {
+                    $field = array_merge($field, $attributes);
+                }
 
                 return $field;
             }, $this->{$type});
@@ -1274,7 +1294,9 @@ 
 
             foreach ($this->sort[$items] as $item)
             {
-                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
+                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) {
+                    $elements[] = $this->{$items}[$key];
+                }
             }
 
             return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
@@ -1293,9 +1315,13 @@ 
         $order = (array)$order;
         $values = $model->select('*');
 
-        if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        if (!empty($where)) {
+            call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        }
 
-        if (!empty($order)) call_user_func_array([$values, 'orderBy'], $order);
+        if (!empty($order)) {
+            call_user_func_array([$values, 'orderBy'], $order);
+        }
 
         return $values->get()->lists($field, $model->getKeyName())->toArray();
     }
@@ -1304,8 +1330,11 @@ 
     public function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {
-            if ($relation['pivot']) $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
-                else $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+            if ($relation['pivot']) {
+                $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
+            } else {
+                    $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+                }
         }
     }
 

src/resources/views/fields/checklist_dependency.blade.php

Spacing +9 added lines, -9 removed lines

@@ -15,15 +15,15 @@ 
       $dependencyArray = [];
 
       //convert dependency array to simple matrix ( prymary id as key and array with secondaries id )
-      foreach($dependencies as $primary){
+      foreach ($dependencies as $primary) {
           $dependencyArray[$primary->id] = [];
-        foreach($primary->{$primary_dependency['entity_secondary']} as $secondary){
+        foreach ($primary->{$primary_dependency['entity_secondary']} as $secondary) {
             $dependencyArray[$primary->id][] = $secondary->id;
         }
       }
 
       //for update form, get initial state of the entity
-      if( isset($id) && $id ){
+      if (isset($id) && $id) {
         
         //get entity with relations for primary dependency
         $entity_dependencies = $entity_model->with($primary_dependency['entity'])
@@ -39,15 +39,15 @@ 
         $secondary_ids = [];
         
         //create secondary dependency from primary relation, used to check what chekbox must be check from second checklist
-        if( old($primary_dependency['name']) ) {
-          foreach( old($primary_dependency['name']) as $primary_item ){
-            foreach($dependencyArray[$primary_item] as $second_item ){
+        if (old($primary_dependency['name'])) {
+          foreach (old($primary_dependency['name']) as $primary_item) {
+            foreach ($dependencyArray[$primary_item] as $second_item) {
                 $secondary_ids[$second_item] = $second_item;
             }
           }
-        }else{ //create dependecies from relation if not from validate error
-          foreach( $primary_array as $primary_item ){
-            foreach($primary_item[$secondary_dependency['entity']] as $second_item ){
+        } else { //create dependecies from relation if not from validate error
+          foreach ($primary_array as $primary_item) {
+            foreach ($primary_item[$secondary_dependency['entity']] as $second_item) {
                 $secondary_ids[$second_item['id']] = $second_item['id'];
             }
           }

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
                 $secondary_ids[$second_item] = $second_item;
             }
           }
-        }else{ //create dependecies from relation if not from validate error
+        } else{ //create dependecies from relation if not from validate error
           foreach( $primary_array as $primary_item ){
             foreach($primary_item[$secondary_dependency['entity']] as $second_item ){
                 $secondary_ids[$second_item['id']] = $second_item['id'];

src/resources/views/fields/checklist.blade.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <!-- select2 -->
   <div class="form-group">
     <label>{{ $field['label'] }}</label>
-    <?php $entity_model = $crud->getModel();?>
+    <?php $entity_model = $crud->getModel(); ?>
    
     <div class="row">
         @foreach ($field['model']::all() as $connected_entity_entry)

src/ToneCrud.php

Spacing +15 added lines, -15 removed lines

@@ -125,9 +125,9 @@ 
 
     public function removePermissions($permissions) // DONE
     {
-        $this->removeButtons((array)$permissions);
+        $this->removeButtons((array) $permissions);
 
-        return $this->permissions = array_diff($this->permissions, (array)$permissions);
+        return $this->permissions = array_diff($this->permissions, (array) $permissions);
     }
 
     public function setColumns($columns)
@@ -158,7 +158,7 @@ 
 
     public function orderColumns($order)
     {
-        $this->setSort('columns', (array)$order);
+        $this->setSort('columns', (array) $order);
     }
 
     public function setFields($fields)
@@ -228,7 +228,7 @@ 
 
     public function orderFields($order)
     {
-        $this->setSort('fields', (array)$order);
+        $this->setSort('fields', (array) $order);
     }
 
     public function items()
@@ -287,7 +287,7 @@ 
 
     public function unsetListActions($actions)
     {
-        return $this->listActions = array_diff($this->listActions, (array)$actions);
+        return $this->listActions = array_diff($this->listActions, (array) $actions);
     }
 
     public function checkListAction($action)
@@ -312,7 +312,7 @@ 
 
     public function setRequired($fields)
     {
-        $this->required = array_merge($this->required, (array)$fields);
+        $this->required = array_merge($this->required, (array) $fields);
     }
 
     public function required()
@@ -380,14 +380,14 @@ 
 
     private function syncColumn($column)
     {
-        if (array_key_exists('name', (array)$column)) return array_merge(['type' => $this->getType($column['name'])], $column);
+        if (array_key_exists('name', (array) $column)) return array_merge(['type' => $this->getType($column['name'])], $column);
 
         return false;
     }
 
     private function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array) $field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
 
         return false;
     }
@@ -499,7 +499,7 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array) $fields)) $field = array_merge($field, $attributes);
 
                 return $field;
             }, $this->{$type});
@@ -508,7 +508,7 @@ 
 
     private function remove($entity, $fields)
     {
-        return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);}));
+        return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array) $fields); }));
     }
 
     private function setSort($items, $order)
@@ -527,7 +527,7 @@ 
                 if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
             }
 
-            return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
+            return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]); }));
         }
 
         return $this->{$items};
@@ -537,11 +537,11 @@ 
     {
         foreach ($this->relations as $key => $relation)
         {
-            if ($relation['pivot']){
+            if ($relation['pivot']) {
                 $model->{$relation['name']}()->sync($data[$key]);
 
-                foreach($relation['pivotFields'] as $pivotField){
-                   foreach($data[$pivotField] as $pivot_id =>  $field){
+                foreach ($relation['pivotFields'] as $pivotField) {
+                   foreach ($data[$pivotField] as $pivot_id =>  $field) {
                      $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
                    }
                 }
@@ -551,7 +551,7 @@ 
 
     private function getRelationValues($model, $field, $where = [], $order = [])
     {
-        $order = (array)$order;
+        $order = (array) $order;
         $values = $model->select('*');
 
         if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));

Braces +64 added lines, -22 removed lines

@@ -40,7 +40,9 @@ 
 
     public function setModel($model)
     {
-        if (!class_exists($model)) throw new \Exception('This model does not exist.', 404);
+        if (!class_exists($model)) {
+            throw new \Exception('This model does not exist.', 404);
+        }
 
         $this->model = new $model();
         $this->query = $this->model->select('*');
@@ -56,7 +58,9 @@ 
     // TODO: make this work without having to specify "index"
     public function setRoute($route, $parameters = [])
     {
-        if (!\Route::has($route)) throw new \Exception('This route does not exist.', 404);
+        if (!\Route::has($route)) {
+            throw new \Exception('This route does not exist.', 404);
+        }
 
         $this->route = route($route, $parameters);
         $this->initButtons();
@@ -254,7 +258,9 @@ 
     {
         $model = $this->model->findOrFail($id);
         $updated = $model->update($data);
-        if ($updated) $this->syncPivot($model, $data);
+        if ($updated) {
+            $this->syncPivot($model, $data);
+        }
 
         return $model;
     }
@@ -282,7 +288,9 @@ 
 
     public function checkPermission($permission) // DONE
     {
-        if (!in_array($permission, $this->permissions)) abort(403);
+        if (!in_array($permission, $this->permissions)) {
+            abort(403);
+        }
     }
 
     public function unsetListActions($actions)
@@ -351,11 +359,17 @@ 
 
         $this->state = 'list';
 
-        if (in_array('create', $segments)) $this->state = 'add';
+        if (in_array('create', $segments)) {
+            $this->state = 'add';
+        }
 
-        if (in_array('edit', $segments)) $this->state = 'edit';
+        if (in_array('edit', $segments)) {
+            $this->state = 'edit';
+        }
 
-        if (is_numeric(end($segments))) $this->state = 'view';
+        if (is_numeric(end($segments))) {
+            $this->state = 'view';
+        }
     }
 
     private function removeButtons($buttons)
@@ -373,21 +387,27 @@ 
         $columns = \Schema::getColumnListing($this->model->getTable());
         $fillable = $this->model->getFillable();
 
-        if (!empty($fillable)) $columns = array_intersect($columns, $fillable);
+        if (!empty($fillable)) {
+            $columns = array_intersect($columns, $fillable);
+        }
 
         return array_values(array_diff($columns, [$this->model->getKeyName(), 'updated_at', 'deleted_at']));
     }
 
     private function syncColumn($column)
     {
-        if (array_key_exists('name', (array)$column)) return array_merge(['type' => $this->getType($column['name'])], $column);
+        if (array_key_exists('name', (array)$column)) {
+            return array_merge(['type' => $this->getType($column['name'])], $column);
+        }
 
         return false;
     }
 
     private function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array)$field)) {
+            return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        }
 
         return false;
     }
@@ -404,11 +424,17 @@ 
 
     private function getType($field) // DONE
     {
-        if (!array_key_exists($field, $this->fieldTypes)) return 'text';
+        if (!array_key_exists($field, $this->fieldTypes)) {
+            return 'text';
+        }
 
-        if ($field == 'password') return 'password';
+        if ($field == 'password') {
+            return 'password';
+        }
 
-        if ($field == 'email') return 'email';
+        if ($field == 'email') {
+            return 'email';
+        }
 
         switch ($this->fieldTypes[$field]['type'])
         {
@@ -466,7 +492,9 @@ 
 
             $this->fields[] = ['name' => $field, 'value' => '', 'default' => $this->fieldTypes[$field]['default'], 'type' => $this->getType($field), 'values' => [], 'attributes' => []];
 
-            if (!in_array($field, $this->model->getHidden())) $this->columns[] = ['name' => $field, 'type' => $this->getType($field)];
+            if (!in_array($field, $this->model->getHidden())) {
+                $this->columns[] = ['name' => $field, 'type' => $this->getType($field)];
+            }
         }, $this->getColumns());
     }
 
@@ -478,8 +506,11 @@ 
 
             foreach ($this->{$fields} as $key => $field)
             {
-                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) $this->{$fields}[$key]['value'] = $this->item->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
-                    else $this->{$fields}[$key]['value'] = $this->item->{$field['name']};
+                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) {
+                    $this->{$fields}[$key]['value'] = $this->item->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
+                } else {
+                        $this->{$fields}[$key]['value'] = $this->item->{$field['name']};
+                    }
             }
         }
     }
@@ -499,7 +530,9 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array)$fields)) {
+                    $field = array_merge($field, $attributes);
+                }
 
                 return $field;
             }, $this->{$type});
@@ -524,7 +557,9 @@ 
 
             foreach ($this->sort[$items] as $item)
             {
-                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
+                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) {
+                    $elements[] = $this->{$items}[$key];
+                }
             }
 
             return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
@@ -554,9 +589,13 @@ 
         $order = (array)$order;
         $values = $model->select('*');
 
-        if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        if (!empty($where)) {
+            call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        }
 
-        if (!empty($order)) call_user_func_array([$values, 'orderBy'], $order);
+        if (!empty($order)) {
+            call_user_func_array([$values, 'orderBy'], $order);
+        }
 
         return $values->get()->lists($field, $model->getKeyName())->toArray();
     }
@@ -564,8 +603,11 @@ 
     private function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {
-            if ($relation['pivot']) $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
-                else $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+            if ($relation['pivot']) {
+                $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
+            } else {
+                    $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+                }
         }
     }