From cff01551dec4933de479408a4543199fdf5efd22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Thu, 16 Aug 2018 21:43:10 +0200 Subject: [PATCH] add revision reverting option --- app/Http/Controllers/TableController.php | 20 +++++++++- app/Models/Table.php | 24 ++++++++++++ .../views/table/_panel-metadata.blade.php | 5 ++- resources/views/table/revisions.blade.php | 38 +++++-------------- routes/web.php | 1 + 5 files changed, 58 insertions(+), 30 deletions(-) diff --git a/app/Http/Controllers/TableController.php b/app/Http/Controllers/TableController.php index a0dd03b..442bc37 100644 --- a/app/Http/Controllers/TableController.php +++ b/app/Http/Controllers/TableController.php @@ -31,6 +31,25 @@ class TableController extends Controller return $tableModel; } + public function revertTo(Request $request, User $user, string $table) + { + $input = $this->validate($request, [ + 'rev' => 'int' + ]); + + $tableModel = $this->resolveTable($request, $user, $table); + $this->authorize('edit', $tableModel); + + $revisionNum = (int)$input->rev; + $revision = $tableModel->revisions()->orderBy('created_at')->skip($revisionNum - 1)->first(); + if ($revision === null) abort(404, "No such revision"); + + $tableModel->revision()->associate($revision); + $tableModel->save(); + + return redirect($tableModel->revisionsRoute); + } + public function view(Request $request, User $user, string $table) { $input = $this->validate($request, [ @@ -72,7 +91,6 @@ class TableController extends Controller public function delete(Request $request, User $user, string $table) { - /** @var Table $tableModel */ $tableModel = $this->resolveTable($request, $user, $table); $this->authorize('delete', $tableModel); diff --git a/app/Models/Table.php b/app/Models/Table.php index c0e83ea..9ae63d7 100644 --- a/app/Models/Table.php +++ b/app/Models/Table.php @@ -3,6 +3,8 @@ namespace App\Models; use App\Models\Concerns\Reportable; +use function GuzzleHttp\Psr7\build_query; +use http\QueryString; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; @@ -153,6 +155,28 @@ class Table extends BaseModel return parent::__get($name); } + /** + * Get route to some action (so we dont have to add xxRoute for everything) + * + * @param $action + * @param array $getargs + * @return string + */ + public function actionRoute($action, $getargs = []) + { + $user = $this->cachedOwner()->name; + $table = $this->name; + + $base = "/@$user/$table"; + if ($action != 'view') $base .= "/$action"; + + if ($getargs) { + return $base . '?' . build_query($getargs); + } else { + return $base; + } + } + public function getDraftRoute($tab=null) { return route('table.draft', [ diff --git a/resources/views/table/_panel-metadata.blade.php b/resources/views/table/_panel-metadata.blade.php index e1f2f92..d2100a1 100644 --- a/resources/views/table/_panel-metadata.blade.php +++ b/resources/views/table/_panel-metadata.blade.php @@ -1,6 +1,9 @@ {{-- args: $table --}} +@php +/** @var \App\Models\Table $table */ +@endphp
{{-- Description field --}} @@ -68,7 +71,7 @@ Revisions {{ $table->revisions_count }} - (see changes) + (see changes) diff --git a/resources/views/table/revisions.blade.php b/resources/views/table/revisions.blade.php index 322f3a6..148770f 100644 --- a/resources/views/table/revisions.blade.php +++ b/resources/views/table/revisions.blade.php @@ -24,19 +24,20 @@

Table Revisions

@php - $revIds = $revisions->pluck('id'); + $revIds = $revisions->pluck('id')->reverse()->values(); @endphp @foreach($revisions as $i => $revision) @php $num = count($revisions) - $i; + $isCurrent = $revision->id == $table->revision_id; @endphp
#{{$num}} – {{ $revision->created_at->format('Y-m-d, G:i:s') }} - @if($i == 0) + @if($isCurrent) (current) @else @@ -47,7 +48,7 @@
@if($revision->ancestor_id) @if ($revIds->contains($revision->ancestor_id)) - Show parent + Based on #{{ 1+$revIds->search($revision->ancestor_id) }} @else Forked from elsewhere @endif @@ -56,36 +57,17 @@
-
+
{{ $revision->note }}
+
+ @if(!$isCurrent && user()->ownsTable($table)) + Set as current + @endif +
@endforeach
- @endsection - -@push('scripts') - - - -@endpush diff --git a/routes/web.php b/routes/web.php index 03c2ce1..2f3965d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -59,6 +59,7 @@ Route::group(['middleware' => ['auth', 'activated']], function () { Route::get('@{user}/{table}/settings', 'TableController@settings')->name('table.conf'); Route::post('@{user}/{table}/settings', 'TableController@storeSettings')->name('table.storeConf'); Route::post('@{user}/{table}/delete', 'TableController@delete')->name('table.delete'); + Route::get('@{user}/{table}/revert-to', 'TableController@revertTo')->name('table.revertTo'); Route::post('@{user}/{table}/draft/update', 'TableEditController@draftUpdate')->name('table.draft-update'); Route::post('@{user}/{table}/draft/submit', 'TableEditController@draftSubmit')->name('table.draft-submit');