FEATURE #2042: refactorize widgets

app/Http/Controllers/Admin/Widgets/CreateNewWidget.php

@@ -23,14 +23,13 @@ class CreateNewWidget extends Controller
     /**
      * Form for new widget area
      *
-     * @param $type
+     * @param WidgetType $widgetType
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     *
      */
-    public function getNew($type)
+    public function getNew(WidgetType $widgetType)
     {
-        $widgetType = WidgetType::findOrFail($type);
-
         $presenter = call_user_func([$widgetType->handler, 'getPresenter']);
 
         return call_user_func([$presenter, 'renderAddForm'], $widgetType);
@@ -40,23 +39,22 @@ class CreateNewWidget extends Controller
      * Create new instance of given widget type
      *
      * @param NewWidgetRequest $request
-     * @param                  $type
+     *
+     * @param WidgetType       $widgetType
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postNew(NewWidgetRequest $request, $type)
+    public function postNew(NewWidgetRequest $request, WidgetType $widgetType)
     {
-        $widgetType = WidgetType::findOrFail($type);
-
         // try to save this widget
         try {
             $this->widget->createNew($widgetType, $request);
         } catch (MissingParameterException $e) {
             // user omitted some value
-            return $this->invalidWidget($type, $e->getMessage());
-            //        } catch (\Exception $e) {
-            //            // something went wrong
-            //            return $this->invalidWidget($type, trans('admin/widgets.cannotSave', ['exception' => $e->getMessage()]));
+            return redirect()
+                ->back()
+                ->withInput()
+                ->with('error', $e->getMessage());
         }
 
         // redirect with success notification
@@ -64,12 +62,4 @@ class CreateNewWidget extends Controller
             ->route('widgets.overview')
             ->with('success', trans('admin/widgets.successfullyCreated'));
     }
-
-    private function invalidWidget($widgetType, $error)
-    {
-        return redirect()
-            ->route('widgets.new', ['type' => $widgetType])
-            ->withInput()
-            ->with('error', $error);
-    }
 }