This commit is contained in:
Hillel Coren 2016-12-09 00:18:10 +02:00
parent da55195b8a
commit 07f76067e0
5 changed files with 20 additions and 3 deletions

View File

@ -65,8 +65,9 @@ class MakeClass extends GeneratorCommand
'LOWER_NAME' => $module->getLowerName(), 'LOWER_NAME' => $module->getLowerName(),
'CLASS' => $this->getClass(), 'CLASS' => $this->getClass(),
'STUDLY_NAME' => Str::studly($module->getLowerName()), 'STUDLY_NAME' => Str::studly($module->getLowerName()),
'COLUMNS' => $this->getColumns(), 'DATATABLE_COLUMNS' => $this->getColumns(),
'FORM_FIELDS' => $this->getFormFields(), 'FORM_FIELDS' => $this->getFormFields(),
'DATABASE_FIELDS' => $this->getDatabaseFields($module),
]))->render(); ]))->render();
} }
@ -122,4 +123,18 @@ class MakeClass extends GeneratorCommand
return $str; return $str;
} }
protected function getDatabaseFields($module)
{
$fields = $this->option('fields');
$fields = explode(',', $fields);
$str = '';
foreach ($fields as $field) {
$field = explode(':', $field)[0];
$str .= "'" . $module->getLowerName() . ".{$field}', ";
}
return $str;
}
} }

View File

@ -58,7 +58,7 @@ class MakeModule extends Command
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'views', '--fields' => $fields, '--filename' => 'edit.blade']); Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'views', '--fields' => $fields, '--filename' => 'edit.blade']);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'datatable', '--fields' => $fields]); Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'datatable', '--fields' => $fields]);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'repository']); Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'repository', '--fields' => $fields]);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'policy']); Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'policy']);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'auth-provider']); Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'auth-provider']);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'presenter']); Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'presenter']);

View File

@ -15,7 +15,7 @@ class $CLASS$Datatable extends EntityDatatable
public function columns() public function columns()
{ {
return [ return [
$COLUMNS$ $DATATABLE_COLUMNS$
[ [
'created_at', 'created_at',
function ($model) { function ($model) {

View File

@ -20,6 +20,7 @@ class $STUDLY_NAME$Repository extends BaseRepository
$query = DB::table('$LOWER_NAME$') $query = DB::table('$LOWER_NAME$')
->where('$LOWER_NAME$.account_id', '=', \Auth::user()->account_id) ->where('$LOWER_NAME$.account_id', '=', \Auth::user()->account_id)
->select( ->select(
$DATABASE_FIELDS$
'$LOWER_NAME$.public_id', '$LOWER_NAME$.public_id',
'$LOWER_NAME$.deleted_at', '$LOWER_NAME$.deleted_at',
'$LOWER_NAME$.created_at', '$LOWER_NAME$.created_at',

View File

@ -2263,6 +2263,7 @@ $LANG = array(
'toggle_menu' => 'Toggle Menu', 'toggle_menu' => 'Toggle Menu',
'new_...' => 'New ...', 'new_...' => 'New ...',
'list_...' => 'List ...', 'list_...' => 'List ...',
'created_at' => 'Created',
); );