Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
This commit is contained in:
@@ -79,15 +79,15 @@ class MenuPlanController extends Controller
|
||||
|
||||
$news->name = "Ny menuplan";
|
||||
$news->subname = "Uge " . $menuPlan->week;
|
||||
$news->arrangement_id = $menuPlan->id;
|
||||
$news->type_id = '2';
|
||||
$news->content = $menuPlan->menu;
|
||||
$news->type_id = '2';
|
||||
$news->arrangement_id = $menuPlan->id;
|
||||
|
||||
if($request->file("resource")) {
|
||||
$news->resource_id = ResourceController::store($request)->id;
|
||||
}
|
||||
|
||||
$news->save();
|
||||
NewsController::storeAndGet($news);
|
||||
}
|
||||
|
||||
return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]);
|
||||
@@ -142,18 +142,15 @@ class MenuPlanController extends Controller
|
||||
$menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
|
||||
|
||||
if($request->newsoption == true){
|
||||
$news = [
|
||||
"name" => "Opdateret menuplan",
|
||||
"subname" => "Uge " . $menuplan->week,
|
||||
"content" => $menuplan->menu
|
||||
];
|
||||
//Sæt ind i $news array'et
|
||||
$news = new News();
|
||||
|
||||
$news->name = "Opdateret menuplan";
|
||||
$news->subname = "Uge " . $menuplan->week;
|
||||
$news->arrangement_id = $menuplan->id;
|
||||
$news->type_id = '2';
|
||||
$news->content = $menuplan->menu;
|
||||
|
||||
|
||||
NewsController::storeAndGet($news);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user