Laravel-Backpack / CRUD

src/Crud.php

Indentation +10 added lines, -10 removed lines

@@ -136,9 +136,9 @@ 
 
                 if( isset($field['pivotFields']) ){
                     foreach($field['pivotFields'] as $pivotField){
-                       foreach($data[$pivotField] as $pivot_id =>  $field){
-                         $model->{$field['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
-                       }
+                        foreach($data[$pivotField] as $pivot_id =>  $field){
+                            $model->{$field['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
+                        }
                     }
                 }
             }
@@ -180,7 +180,7 @@ 
     }
 
 
-   /*
+    /*
     |--------------------------------------------------------------------------
     |                                   READ
     |--------------------------------------------------------------------------
@@ -262,7 +262,7 @@ 
 
 
 
-   /*
+    /*
     |--------------------------------------------------------------------------
     |                                   UPDATE
     |--------------------------------------------------------------------------
@@ -327,7 +327,7 @@ 
 
 
 
-   /*
+    /*
     |--------------------------------------------------------------------------
     |                                   DELETE
     |--------------------------------------------------------------------------
@@ -418,7 +418,7 @@ 
 
 
 
-   /*
+    /*
     |--------------------------------------------------------------------------
     |                                   CRUD ACCESS
     |--------------------------------------------------------------------------
@@ -963,7 +963,7 @@ 
 
             if (!in_array($field, $this->model->getHidden()))
             {
-                 $this->columns[] = [
+                    $this->columns[] = [
                                     'name' => $field,
                                     'label' => ucfirst($field),
                                     'type' => $this->getFieldTypeFromDbColumnType($field)
@@ -1340,10 +1340,10 @@ 
 
     public function addCreateField($field)
     {
-       return $this->add('create_fields', $field);
+        return $this->add('create_fields', $field);
     }
 
-     public function setUpdateFields($fields)
+        public function setUpdateFields($fields)
     {
         $this->addMultiple('update_fields', $fields);
     }

Spacing +22 added lines, -22 removed lines

@@ -101,7 +101,7 @@ 
 
         $relationFields = [];
 
-        foreach($fields as $field){
+        foreach ($fields as $field) {
             if (isset($field['model']))
             {
                 array_push($relationFields, $field);
@@ -129,14 +129,14 @@ 
 
         foreach ($fields_with_relationships as $key => $field)
         {
-            if (isset($field['pivot']) && $field['pivot'] )
+            if (isset($field['pivot']) && $field['pivot'])
             {
-                $values = isset($data[$field['name']])?$data[$field['name']]:[];
+                $values = isset($data[$field['name']]) ? $data[$field['name']] : [];
                 $model->{$field['name']}()->sync($values);
 
-                if( isset($field['pivotFields']) ){
-                    foreach($field['pivotFields'] as $pivotField){
-                       foreach($data[$pivotField] as $pivot_id =>  $field){
+                if (isset($field['pivotFields'])) {
+                    foreach ($field['pivotFields'] as $pivotField) {
+                       foreach ($data[$pivotField] as $pivot_id =>  $field) {
                          $model->{$field['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
                        }
                     }
@@ -304,11 +304,11 @@ 
                 if (isset($field['subfields']))
                     {
                     $fields[$k]['value'] = [];
-                    foreach($field['subfields'] as $key => $subfield){
+                    foreach ($field['subfields'] as $key => $subfield) {
                         $fields[$k]['value'][] = $entry->{$subfield['name']};
                     }
 
-                }else{
+                } else {
                     $fields[$k]['value'] = $entry->{$field['name']};
                 }
             }
@@ -427,13 +427,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);
     }
 
     /**
@@ -646,7 +646,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);
@@ -662,7 +662,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;
         }
@@ -738,7 +738,7 @@ 
      * @param [array] $options Field-type-specific information.
      * @param string $form    The form to add the field to (create/update/both)
      */
-    public function addField($field, $form='both')
+    public function addField($field, $form = 'both')
     {
         // if the field_defition_array array is a string, it means the programmer was lazy and has only passed the name
         // set some default values, so the field will still work
@@ -776,7 +776,7 @@ 
         }
     }
 
-    public function addFields($fields, $form='both')
+    public function addFields($fields, $form = 'both')
     {
         if (count($fields)) {
             foreach ($fields as $field) {
@@ -790,7 +790,7 @@ 
      * @param  string $name Field name (as defined with the addField() procedure)
      * @param  string $form update/create/both
      */
-    public function removeField($name, $form='both')
+    public function removeField($name, $form = 'both')
     {
         switch (strtolower($form)) {
             case 'create':
@@ -813,7 +813,7 @@ 
      * @param  array $array_of_names A simple array of the names of the fields to be removed.
      * @param  string $form          update/create/both
      */
-    public function removeFields($array_of_names, $form='both')
+    public function removeFields($array_of_names, $form = 'both')
     {
         if (!empty($array_of_names)) {
             foreach ($array_of_names as $name) {
@@ -950,7 +950,7 @@ 
         array_map(function($field) {
             // $this->labels[$field] = $this->makeLabel($field);
 
-            $new_field =  [
+            $new_field = [
                                 'name' => $field,
                                 'label' => ucfirst($field),
                                 'value' => '', 'default' => $this->field_types[$field]['default'],
@@ -1303,7 +1303,7 @@ 
 
     public function orderColumns($order)
     {
-        $this->setSort('columns', (array)$order);
+        $this->setSort('columns', (array) $order);
     }
 
 
@@ -1378,7 +1378,7 @@ 
 
     public function orderFields($order)
     {
-        $this->setSort('fields', (array)$order);
+        $this->setSort('fields', (array) $order);
     }
 
 
@@ -1424,7 +1424,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});
@@ -1454,7 +1454,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};
@@ -1467,7 +1467,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 +53 added lines, -27 removed lines

@@ -93,8 +93,7 @@ 
         if ($form == 'create')
         {
             $fields = $this->create_fields;
-        }
-        else
+        } else
         {
             $fields = $this->update_fields;
         }
@@ -308,7 +307,7 @@ 
                         $fields[$k]['value'][] = $entry->{$subfield['name']};
                     }
 
-                }else{
+                } else{
                     $fields[$k]['value'] = $entry->{$field['name']};
                 }
             }
@@ -487,7 +486,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('*');
@@ -529,7 +530,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();
@@ -585,8 +588,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,
@@ -745,19 +747,20 @@ 
         if (is_string($field))
         {
             $complete_field_array['name'] = $field;
-        }
-        else
+        } else
         {
             $complete_field_array = $field;
         }
 
         // if the label is missing, we should set it
-        if (!isset($complete_field_array['label']))
-            $complete_field_array['label'] = ucfirst($complete_field_array['name']);
+        if (!isset($complete_field_array['label'])) {
+                    $complete_field_array['label'] = ucfirst($complete_field_array['name']);
+        }
 
         // if the field type is missing, we should set it
-        if (!isset($complete_field_array['type']))
-            $complete_field_array['type'] = $this->getFieldTypeFromDbColumnType($complete_field_array['name']);
+        if (!isset($complete_field_array['type'])) {
+                    $complete_field_array['type'] = $this->getFieldTypeFromDbColumnType($complete_field_array['name']);
+        }
 
         // store the field information into the correct variable on the CRUD object
         switch (strtolower($form)) {
@@ -840,8 +843,9 @@ 
      * @return bool  true/false
      */
     public function checkIfFieldIsFirstOfItsType($field, $fields_array) {
-        if ($field['name'] == $this->getFirstOfItsTypeInArray($field['type'], $fields_array)['name'])
-            return true;
+        if ($field['name'] == $this->getFirstOfItsTypeInArray($field['type'], $fields_array)['name']) {
+                    return true;
+        }
 
         return false;
     }
@@ -998,11 +1002,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'])
         {
@@ -1075,7 +1085,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']));
@@ -1403,8 +1415,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']};
+                    }
             }
         }
     }
@@ -1424,7 +1439,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});
@@ -1451,7 +1468,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]);}));
@@ -1470,9 +1489,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();
     }
@@ -1481,8 +1504,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

Indentation +23 added lines, -23 removed lines

@@ -2,34 +2,34 @@ 
   <div class="form-group checklist_dependency"  data-entity ="{{ $field['field_unique_name'] }}">
     <label>{{ $field['label'] }}</label>
     <?php
-      $entity_model = $crud->getModel();
+        $entity_model = $crud->getModel();
 
-      //short name for dependency fields
-      $primary_dependency = $field['subfields']['primary'];
-      $secondary_dependency = $field['subfields']['secondary'];
+        //short name for dependency fields
+        $primary_dependency = $field['subfields']['primary'];
+        $secondary_dependency = $field['subfields']['secondary'];
 
 
-      //all items with relation
-      $dependencies = $primary_dependency['model']::with($primary_dependency['entity_secondary'])->get();
+        //all items with relation
+        $dependencies = $primary_dependency['model']::with($primary_dependency['entity_secondary'])->get();
 
-      $dependencyArray = [];
+        $dependencyArray = [];
 
-      //convert dependency array to simple matrix ( prymary id as key and array with secondaries id )
-      foreach($dependencies as $primary){
-          $dependencyArray[$primary->id] = [];
+        //convert dependency array to simple matrix ( prymary id as key and array with secondaries id )
+        foreach($dependencies as $primary){
+            $dependencyArray[$primary->id] = [];
         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 ){
+        //for update form, get initial state of the entity
+        if( isset($id) && $id ){
 
         //get entity with relations for primary dependency
         $entity_dependencies = $entity_model->with($primary_dependency['entity'])
-          ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary'])
-          ->where('id', $id)
-          ->first();
+            ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary'])
+            ->where('id', $id)
+            ->first();
 
         $secondaries_from_primary = [];
 
@@ -40,23 +40,23 @@ 
 
         //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( 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_array as $primary_item ){
             foreach($primary_item[$secondary_dependency['entity']] as $second_item ){
                 $secondary_ids[$second_item['id']] = $second_item['id'];
             }
-          }
+            }
         }
 
-      }
+        }
 
-      //json encode of dependency matrix
-      $dependencyJson = json_encode($dependencyArray);
+        //json encode of dependency matrix
+        $dependencyJson = json_encode($dependencyArray);
     ?>
     <script>
      var  {{ $field['field_unique_name'] }} = {!! $dependencyJson !!};