FEATURE #2042: refactorize widgets

This commit is contained in:
Michal Kváček
2017-04-24 00:01:03 +02:00
parent 4a5c9ab1e6
commit e262473f36
23 changed files with 336 additions and 289 deletions
@@ -1,26 +1,39 @@
<?php
namespace App\Http\Controllers\Admin\Widgets;
use App\CMS\Repositories\Widgets\Widget as WidgetRepository;
use App\CMS\Widgets\Exceptions\MissingParameterException;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\EditWidgetRequest;
use App\Models\Widgets\Widget;
use Illuminate\Support\Facades\Event;
class EditWidget extends Controller
{
/**
* @var WidgetRepository
*/
private $widgetRepository;
/**
* EditWidget constructor.
*
* @param WidgetRepository $widgetRepository
*/
public function __construct(WidgetRepository $widgetRepository)
{
$this->widgetRepository = $widgetRepository;
}
/**
* Render edit form
*
* @param $id
* @param Widget $widget
*
* @return mixed
*/
public function getEdit($id)
public function getEdit(Widget $widget)
{
$widget = Widget::findOrFail($id);
$widget->settings = json_decode($widget->settings);
$presenter = call_user_func([$widget->widget_type_handler, 'getPresenter']);
return call_user_func([$presenter, 'renderEditForm'], $widget);
@@ -30,24 +43,14 @@ class EditWidget extends Controller
* Save changes into database
*
* @param EditWidgetRequest $request
* @param $widget
* @param Widget $widget
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postEdit(EditWidgetRequest $request, $widget)
public function postEdit(EditWidgetRequest $request, Widget $widget)
{
// create new widget
$widget = Widget::findOrFail($widget);
// update name
$widget->name = $request->name;
$widget->container_class = $request->containerClass;
$widget->container_id = empty($request->containerId) ? null : $request->containerId;
$widget->description = $request->description;
// try to save this widget
try {
$widget->settings = json_encode(call_user_func([$widget->widget_type_handler, 'save'], $request));
$this->widgetRepository->edit($widget, $request);
} catch (MissingParameterException $e) {
// user omitted some value
return $this->invalidWidget($e->getMessage());
@@ -56,12 +59,6 @@ class EditWidget extends Controller
return $this->invalidWidget(trans('admin/widgets.cannotSave', ['exception' => $e->getMessage()]));
}
// save into database
$widget->save();
// fire event with editing widget
Event::fire(new \App\Events\EditWidget($widget));
// redirect with success notification
return redirect()
->back()
@@ -71,15 +68,12 @@ class EditWidget extends Controller
/**
* Deletes widget
*
* @param $id
* @param Widget $widget
*
* @return \Illuminate\Http\RedirectResponse
*/
public function deleteWidget($id)
public function deleteWidget(Widget $widget)
{
// create new widget
$widget = Widget::findOrFail($id);
// check if widget area is deletable
if (!$widget->deletable) {
return redirect()