Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/MenuPlan.php
This commit is contained in:
Anders
2020-06-30 12:40:02 +02:00
70 changed files with 990 additions and 504 deletions
@@ -10,6 +10,17 @@ use Illuminate\Http\Response;
class MenuPlanController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:menuplan.list" ])->only("index");
$this->middleware([ "check.auth:menuplan.show" ])->only("show");
$this->middleware([ "check.auth:menuplan.create" ])->only("create", "store");
$this->middleware([ "check.auth:menuplan.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:menuplan.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
@@ -100,7 +111,7 @@ class MenuPlanController extends Controller
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy($id)
{