Merge pull request #104 from Laravel-Backpack/fix-95

Fixed wrong condition causing fields and columns to not be filled

Author: tabacitu

src/Console/Commands/CrudControllerBackpackCommand.php

@@ -96,7 +96,7 @@ protected function getAttributes($model)
         $model = new $model;
 
         // if fillable was defined, use that as the attributes
-        if (! count($model->getFillable())) {
+        if (count($model->getFillable())) {
             $attributes = $model->getFillable();
         } else {
             // otherwise, if guarded is used, just pick up the columns straight from the bd table
@@ -116,8 +116,8 @@ protected function getAttributes($model)
      */
     protected function replaceSetFromDb(&$stub, $name)
     {
-        $class = str_replace($this->getNamespace($name).'\\', '', $name);
-        $model = 'App\Models\\'.$class;
+        $class = Str::afterLast($name, '\\');
+        $model = "App\\Models\\$class";
 
         if (! class_exists($model)) {
             return $this;
@@ -126,24 +126,20 @@ protected function replaceSetFromDb(&$stub, $name)
         $attributes = $this->getAttributes($model);
 
         // create an array with the needed code for defining fields
-        $fields = Arr::where($attributes, function ($value, $key) {
-            return ! in_array($value, ['id', 'created_at', 'updated_at', 'deleted_at']);
-        });
-        if (count($fields)) {
-            foreach ($fields as $key => $field) {
-                $fields[$key] = "CRUD::field('".$field."');";
-            }
-        }
+        $fields = Arr::except($attributes, ['id', 'created_at', 'updated_at', 'deleted_at']);
+        $fields = collect($fields)
+            ->map(function ($field) {
+                return "CRUD::column('$field');";
+            })
+            ->toArray();
 
         // create an array with the needed code for defining columns
-        $columns = Arr::where($attributes, function ($value, $key) {
-            return ! in_array($value, ['id']);
-        });
-        if (count($columns)) {
-            foreach ($columns as $key => $column) {
-                $columns[$key] = "CRUD::column('".$column."');";
-            }
-        }
+        $columns = Arr::except($attributes, ['id']);
+        $columns = collect($columns)
+            ->map(function ($column) {
+                return "CRUD::column('$column');";
+            })
+            ->toArray();
 
         // replace setFromDb with actual fields and columns
         $stub = str_replace('CRUD::setFromDb(); // fields', implode(PHP_EOL.'        ', $fields), $stub);