This commit is contained in:
Hillel Coren 2016-12-08 22:51:53 +02:00
parent ce4571a187
commit 249965df5c
4 changed files with 19 additions and 16 deletions

View File

@ -58,7 +58,7 @@ class MakeModule extends Command
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'request']);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'request', 'prefix' => 'create']);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'request', 'prefix' => 'edit']);
Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'request', 'prefix' => 'update']);
Artisan::call('module:dump');
}

View File

@ -10,6 +10,9 @@ use App\Http\Controllers\BaseController;
use App\Services\DatatableService;
use Modules\$STUDLY_NAME$\Repositories\$STUDLY_NAME$Repository;
use Modules\$STUDLY_NAME$\Datatables\$STUDLY_NAME$Datatable;
use Modules\$STUDLY_NAME$\Http\Requests\$STUDLY_NAME$Request;
use Modules\$STUDLY_NAME$\Http\Requests\Create$STUDLY_NAME$Request;
use Modules\$STUDLY_NAME$\Http\Requests\Update$STUDLY_NAME$Request;
class $CLASS$ extends BaseController
{
@ -51,7 +54,7 @@ class $CLASS$ extends BaseController
* Show the form for creating a new resource.
* @return Response
*/
public function create()
public function create($STUDLY_NAME$Request $request)
{
$data = [
'$LOWER_NAME$' => null,
@ -68,7 +71,7 @@ class $CLASS$ extends BaseController
* @param Request $request
* @return Response
*/
public function store(Request $request)
public function store(Create$STUDLY_NAME$Request $request)
{
$$LOWER_NAME$ = $this->$LOWER_NAME$Repo->save($request->input());
@ -98,7 +101,7 @@ class $CLASS$ extends BaseController
* Show the form for editing a resource.
* @return Response
*/
public function show(Request $request)
public function show($STUDLY_NAME$Request $request)
{
return redirect()->to("$LOWER_NAME$/{$request->$LOWER_NAME$}/edit");
}
@ -108,8 +111,12 @@ class $CLASS$ extends BaseController
* @param Request $request
* @return Response
*/
public function update(Request $request)
public function update(Update$STUDLY_NAME$Request $request)
{
$$LOWER_NAME$ = $this->$LOWER_NAME$Repo->save($request->input(), $request->entity());
return redirect()->to($$LOWER_NAME$->present()->editUrl)
->with('message', trans('texts.updated_$LOWER_NAME$'));
}
/**

View File

@ -3,6 +3,7 @@
use Input;
use Utils;
use App\Libraries\HistoryUtils;
use App\Models\EntityModel;
class EntityRequest extends Request {
@ -34,13 +35,13 @@ class EntityRequest extends Request {
return null;
}
$class = Utils::getEntityClass($this->entityType);
$class = EntityModel::getClassName($this->entityType);
if (method_exists($class, 'trashed')) {
$this->entity = $class::scope($publicId)->withTrashed()->firstOrFail();
} else {
$this->entity = $class::scope($publicId)->firstOrFail();
}
if (method_exists($class, 'trashed')) {
$this->entity = $class::scope($publicId)->withTrashed()->firstOrFail();
} else {
$this->entity = $class::scope($publicId)->firstOrFail();
}
return $this->entity;
}

View File

@ -714,11 +714,6 @@ class Utils
return $year + $offset;
}
public static function getEntityClass($entityType)
{
return 'App\\Models\\' . static::getEntityName($entityType);
}
public static function getEntityName($entityType)
{
return ucwords(Utils::toCamelCase($entityType));