This commit is contained in:
Hillel Coren 2016-12-09 11:51:18 +02:00
parent a0af7f4b96
commit d8ff4a3c05
3 changed files with 21 additions and 19 deletions

View File

@ -12,7 +12,7 @@ class MakeModule extends Command
*
* @var string
*/
protected $signature = 'ninja:make-module {name} {fields?}';
protected $signature = 'ninja:make-module {name} {fields?} {--migrate=}';
/**
* The console command description.
@ -40,6 +40,7 @@ class MakeModule extends Command
{
$name = $this->argument('name');
$fields = $this->argument('fields');
$migrate = $this->option('migrate');
$lower = strtolower($name);
// convert 'name:string,description:text' to 'name,description'
@ -53,7 +54,6 @@ class MakeModule extends Command
Artisan::call('module:make', ['name' => [$name]]);
Artisan::call('module:make-migration', ['name' => "create_{$lower}_table", '--fields' => $fields, 'module' => $name]);
Artisan::call('module:migrate', ['module' => $name]);
Artisan::call('module:make-model', ['model' => $name, 'module' => $name, '--fillable' => $fillable]);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'views', '--fields' => $fields, '--filename' => 'edit.blade']);
@ -68,6 +68,12 @@ class MakeModule extends Command
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'api-controller']);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'transformer', '--fields' => $fields]);
if ($migrate) {
Artisan::call('module:migrate', ['module' => $name]);
} else {
$this->info("Use the following command to run the migrations:\nphp artisan module:migrate $name");
}
Artisan::call('module:dump');
}
@ -79,4 +85,11 @@ class MakeModule extends Command
];
}
protected function getOptions()
{
return array(
array('migrate', null, InputOption::VALUE_OPTIONAL, 'The model attributes.', null),
);
}
}

View File

@ -37,19 +37,14 @@ class $STUDLY_NAME$Repository extends BaseRepository
$this->applyFilters($query, '$LOWER_NAME$');
/*
if ($filter) {
$query->where(function ($query) use ($filter) {
$query->where('clients.name', 'like', '%'.$filter.'%')
->orWhere('contacts.first_name', 'like', '%'.$filter.'%')
->orWhere('contacts.last_name', 'like', '%'.$filter.'%')
->orWhere('contacts.email', 'like', '%'.$filter.'%');
});
}
if ($userId) {
$query->where('clients.user_id', '=', $userId);
}
/*
if ($filter) {
$query->where();
}
*/
return $query;
@ -59,12 +54,6 @@ class $STUDLY_NAME$Repository extends BaseRepository
{
$entity = $$LOWER_NAME$ ?: $STUDLY_NAME$::createNew();
/*
if ($entity->is_deleted) {
return $entity;
}
*/
$entity->fill($data);
$entity->save();

View File

@ -7,7 +7,7 @@
<i class="fa fa-question-circle" style="width:20px" title="{{ trans('texts.help') }}"></i>
</a>
@elseif (Auth::user()->can('create', substr($option, 0, -1)))
@elseif (Auth::user()->can('create', $option) || Auth::user()->can('create', substr($option, 0, -1)))
<a type="button" class="btn btn-primary btn-sm pull-right"
href="{{ url("/{$option}/create") }}">