Working proposal apply code, fixed schema (need reset - artisan migrate:fresh)

2018-08-11 18:42:12 +02:00
parent 8efc31d820
commit f2910f977f
12 changed files with 168 additions and 69 deletions
@@ -28,7 +28,7 @@ class TableController extends Controller
        ]);

        /** @var Table $tableModel */
-        $tableModel = $user->tables()->withCount(['favourites', 'forks', 'revisions', 'comments', 'proposals'])
+        $tableModel = $user->tables()->withCount(['favourites', 'forks', 'revisions', 'comments'])
            ->where('name', $table)->first();
        if ($tableModel === null) abort(404, "No such table.");

@@ -50,6 +50,7 @@ class TableController extends Controller
        return view('table.view', [
            'table' => $tableModel,
            'revision' => $revision,
+            'proposals_count' => $tableModel->proposals()->unmerged($tableModel)->count(),
            'columns' => $columns,
            'rows' => $rows,
        ]);