minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: lots of bugfixes, sorry for ugly commit

Browse Source
This commit is contained in:
Michal Kváček
2017-02-09 23:10:11 +01:00
parent 99ed8806da
commit b7d4ab9515
47 changed files with 180 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/Widgets/AssociateWidget.php
+2 -2
View File
@@ -6,8 +6,8 @@ use App\Events\AssignWidget;
use App\Events\RemoveWidgetFromArea;
use App\Http\Controllers\Admin\Controller;
use App\Models\Widgets\Widget;
use App\Models\WidgetArea;
use App\Models\WidgetInWidgetArea;
use App\Models\Widgets\WidgetArea;
use App\Models\Widgets\WidgetInWidgetArea;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Event;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
app/Http/Controllers/Admin/Widgets/EditWidget.php
+3 -3
View File
@@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\Admin\Widgets;
use App\CMS\Widgets\Exceptions\MissingParameterException;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\EditWidgetRequest;
use App\Models\Widgets\Widget;
use App\CMS\Widgets\Exceptions\MissingParameterException;
use Illuminate\Support\Facades\Event;
class EditWidget extends Controller
@@ -47,7 +47,7 @@ class EditWidget extends Controller
// try to save this widget
try {
$widget = call_user_func([$widget->widget_type_handler, 'save'], $widget, (object)$request->all());
$widget->settings = json_encode(call_user_func([$widget->widget_type_handler, 'save'], $request));
} catch (MissingParameterException $e) {
// user omitted some value
return $this->invalidWidget($e->getMessage());
@@ -64,7 +64,7 @@ class EditWidget extends Controller
// redirect with success notification
return redirect()
->route('widgets.overview')
->back()
->with('success', trans('admin/widgets.successfullyEdited'));
}