MightyPork/datatable.directory
1
0
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

added a revisions page

Browse Source
This commit is contained in:
MightyPork
2018-08-16 21:17:32 +02:00
parent a69c3e6cf6
commit 34e432fe87
11 changed files with 154 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TableController.php
+28 -20
View File
@@ -23,6 +23,14 @@ use MightyPork\Utils\Utils;
class TableController extends Controller
{
private function resolveTable(Request $request, User $user, string $table)
{
/** @var Table $tableModel */
$tableModel = $user->tables()->where('name', $table)->first();
if ($tableModel === null) abort(404, "No such table.");
return $tableModel;
}
public function view(Request $request, User $user, string $table)
{
$input = $this->validate($request, [
@@ -35,9 +43,10 @@ class TableController extends Controller
if ($tableModel === null) abort(404, "No such table.");
// option to show other revisions
$revisionNum = $tableModel->revisions_count;
if ($input->has('rev')) {
$rev = (int)$input->rev;
$revision = $tableModel->revisions()->orderBy('created_at')->skip($rev - 1)->first();
$revisionNum = (int)$input->rev;
$revision = $tableModel->revisions()->orderBy('created_at')->skip($revisionNum - 1)->first();
if ($revision === null) abort(404, "No such revision");
} else {
$revision = $tableModel->revision;
@@ -54,6 +63,7 @@ class TableController extends Controller
return view('table.view', [
'table' => $tableModel,
'revision' => $revision,
'revisionNum' => $revisionNum,
'proposals_count' => $tableModel->proposals()->unmerged($tableModel)->count(),
'columns' => $columns,
'rows' => $rows,
@@ -63,8 +73,7 @@ class TableController extends Controller
public function delete(Request $request, User $user, string $table)
{
/** @var Table $tableModel */
$tableModel = $user->tables()->where('name', $table)->first();
if ($tableModel === null) abort(404, "No such table.");
$tableModel = $this->resolveTable($request, $user, $table);
$this->authorize('delete', $tableModel);
if ($request->get('table-name', null) !== $table) {
@@ -84,16 +93,9 @@ class TableController extends Controller
public function create()
{
$exampleData = "";
// "Mercenaria mercenaria,hard clam,40\n" .
// "Magallana gigas,pacific oyster,30\n" .
// "Patella vulgata,common limpet,20";
$columns = Column::columnsFromJson([
// fake 'id' to satisfy the check in Column constructor
['id' => 1, 'name' => 'column_1', 'type' => 'string', 'title' => 'First Column'],
// ['id' => 1, 'name' => 'latin', 'type' => 'string', 'title' => 'Latin Name'],
// ['id' => 2, 'name' => 'common', 'type' => 'string', 'title' => 'Common Name'],
// ['id' => 3, 'name' => 'lifespan', 'type' => 'int', 'title' => 'Lifespan (years)']
]);
return view('table.create', [
@@ -108,9 +110,7 @@ class TableController extends Controller
*/
public function settings(Request $request, User $user, string $table)
{
/** @var Table $tableModel */
$tableModel = $user->tables()->where('name', $table)->first();
if ($tableModel === null) abort(404, "No such table.");
$tableModel = $this->resolveTable($request, $user, $table);
$this->authorize('edit', $tableModel);
return view('table.conf', [
@@ -123,9 +123,7 @@ class TableController extends Controller
*/
public function storeSettings(Request $request, User $user, string $table)
{
/** @var Table $tableModel */
$tableModel = $user->tables()->where('name', $table)->first();
if ($tableModel === null) abort(404, "No such table.");
$tableModel = $this->resolveTable($request, $user, $table);
$this->authorize('edit', $tableModel);
$input = $this->validate($request, [
@@ -152,6 +150,18 @@ class TableController extends Controller
return redirect($tableModel->viewRoute); // the route now changed
}
public function viewRevisions(Request $request, User $user, string $table)
{
$tableModel = $this->resolveTable($request, $user, $table);
$revisions = $tableModel->revisions()->orderBy('created_at', 'desc')->get();
return view('table.revisions', [
'table' => $tableModel,
'revisions' => $revisions,
]);
}
public function storeNew(Request $request)
{
/** @var User $u */
@@ -334,9 +344,7 @@ class TableController extends Controller
*/
public function export(Request $request, User $user, string $table)
{
/** @var Table $tableModel */
$tableModel = $user->tables()->where('name', $table)->first();
if ($tableModel === null) abort(404, "No such table.");
$tableModel = $this->resolveTable($request, $user, $table);
$exporter = null;