From ddf5905fe0c875239df88d549641da51607d272a Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 23 Apr 2018 10:34:25 +0200 Subject: [PATCH] Fix adding mgr posters --- Changelog | 1 + app/Http/Controllers/Admin/MgrPosterController.php | 13 +++++++------ app/Models/MultigroupPoster.php | 5 ----- resources/views/themes/admin/posters-list.tpl | 6 +++--- routes/web.php | 4 ++-- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Changelog b/Changelog index ef4779793..ef32fb7d9 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-04-23 DariusIII + * Fix: Fix adding mgr posters * Chg: Remove opcache statistics page from admin * Fix: Fix bad logic in RoleController * Fix: Fix Sharing and SharingSite models definitions diff --git a/app/Http/Controllers/Admin/MgrPosterController.php b/app/Http/Controllers/Admin/MgrPosterController.php index f46ccd482..5c220336b 100644 --- a/app/Http/Controllers/Admin/MgrPosterController.php +++ b/app/Http/Controllers/Admin/MgrPosterController.php @@ -45,12 +45,13 @@ class MgrPosterController extends BasePageController } /** + * @param string $id * @param \Illuminate\Http\Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @throws \Exception */ - public function edit(Request $request) + public function edit($id = '', Request $request) { $this->setAdminPrefs(); @@ -59,12 +60,12 @@ class MgrPosterController extends BasePageController switch ($action) { case 'submit': - if ($request->input('id') === '') { + if ($id === '') { // Add a new mg poster. - $poster = MultigroupPoster::query()->create(['poster' => $request->input('poster')]); + $poster = MultigroupPoster::query()->insertGetId(['poster' => $request->input('poster')]); } else { // Update an existing mg poster. - $poster = MultigroupPoster::query()->where('id', '=', $request->input('id'))->update(['poster' => $request->input('poster')]); + $poster = MultigroupPoster::query()->where('id', '=', $id)->update(['poster' => $request->input('poster')]); } $this->smarty->assign('poster', $poster); @@ -73,9 +74,9 @@ class MgrPosterController extends BasePageController case 'view': default: - if (! empty($request->input('id'))) { + if (! empty($id)) { $title = 'MultiGroup Poster Edit'; - $poster = MultigroupPoster::query()->where('id', '=', $request->input('id'))->firstOrFail(); + $poster = MultigroupPoster::query()->where('id', '=', $id)->firstOrFail(); } else { $title = 'MultiGroup Poster Add'; $poster = ''; diff --git a/app/Models/MultigroupPoster.php b/app/Models/MultigroupPoster.php index 5e62a019a..7be6f98c9 100644 --- a/app/Models/MultigroupPoster.php +++ b/app/Models/MultigroupPoster.php @@ -38,11 +38,6 @@ class MultigroupPoster extends Model */ public $timestamps = false; - /** - * @var bool - */ - public $incrementing = false; - /** * @return string */ diff --git a/resources/views/themes/admin/posters-list.tpl b/resources/views/themes/admin/posters-list.tpl index 5184a47e7..125577e7d 100644 --- a/resources/views/themes/admin/posters-list.tpl +++ b/resources/views/themes/admin/posters-list.tpl @@ -1,6 +1,6 @@

{$title}

- {if !empty($check)} + {if $check != null}

Below is a list of MultiGroup posters

@@ -8,10 +8,10 @@ Poster name - {foreach from=$posters item=$poster} + {foreach $posters as $poster} - {$poster->poster} + {$poster->poster} prefix('admin')->group(function () { Route::post('tmux-edit', 'TmuxController@edit'); Route::get('posters-list', 'MgrPosterController@index'); Route::post('posters-list', 'MgrPosterController@index'); - Route::get('posters-edit', 'MgrPosterController@edit'); - Route::post('posters-edit', 'MgrPosterController@edit'); + Route::get('posters-edit/{id?}', 'MgrPosterController@edit'); + Route::post('posters-edit{id?}', 'MgrPosterController@edit'); Route::get('poster-delete/{id}', 'MgrPosterController@destroy'); Route::post('poster-delete/{id}', 'MgrPosterController@destroy'); Route::get('release-list', 'ReleasesController@index');