From aeabe039117cb3e5edc7738b032c9c55828abe13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Fri, 5 Feb 2016 16:18:18 +0100 Subject: [PATCH] FEATURE #1373: add link to history for static pages --- .../Http/Controllers/Admin/EditStaticPage.php | 16 +++++++++++++++- modules/StaticPages/Resources/lang/en/admin.php | 3 ++- .../Resources/views/admin/editForm.blade.php | 10 +++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php b/modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php index 412be1dd..17adae46 100644 --- a/modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php +++ b/modules/StaticPages/Http/Controllers/Admin/EditStaticPage.php @@ -3,6 +3,7 @@ namespace Modules\StaticPages\Http\Controllers\Admin; use App\Enumerations\ContentStatuses; use App\Models\Content; +use App\Models\ContentHistory; use Illuminate\Support\Facades\Event; use Modules\StaticPages\Events\DeleteStaticPage; use Modules\StaticPages\Events\EditStaticPage as EditStaticPageEvent; @@ -13,6 +14,16 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class EditStaticPage extends Controller { + /** + * @var ContentHistory + */ + private $history; + + public function __construct(ContentHistory $history) + { + $this->history = $history; + } + /** * Display form for editing static page * @@ -29,10 +40,13 @@ class EditStaticPage extends Controller $page = Content::where('module_handler', config('staticpages.handler')) ->findOrFail($id); + $history = $this->history->getStructuredHistoryOf($page); + // render view return view('staticpages::admin.edit', [ 'contentStatuses' => $statuses, - 'page' => $page + 'page' => $page, + 'historySize' => count($history['changesets']) ]); } diff --git a/modules/StaticPages/Resources/lang/en/admin.php b/modules/StaticPages/Resources/lang/en/admin.php index f0bfb95b..fa7ddca3 100644 --- a/modules/StaticPages/Resources/lang/en/admin.php +++ b/modules/StaticPages/Resources/lang/en/admin.php @@ -26,6 +26,7 @@ return [ 'invalidPage' => 'Specified page does not exist.', 'pageDeleted' => 'Page :name (:url) successfully deleted.', 'nothingToEdit' => 'You did not submit any changes. Nothing was edited.', - 'successfullyEdited' => 'Edit successfull' + 'successfullyEdited' => 'Edit successfull', + 'showHistory' => 'History (:count)' ]; \ No newline at end of file diff --git a/modules/StaticPages/Resources/views/admin/editForm.blade.php b/modules/StaticPages/Resources/views/admin/editForm.blade.php index 15842660..73917027 100644 --- a/modules/StaticPages/Resources/views/admin/editForm.blade.php +++ b/modules/StaticPages/Resources/views/admin/editForm.blade.php @@ -13,6 +13,7 @@
{!! csrf_field() !!} + +
-
+
+ + @if ($historySize > 0) + + @endif