vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

This commit is contained in:
frederikpyt 2020-08-31 13:20:57 +02:00
parent f29fe0180a b6f4fdb138
commit a6ffea7016
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
skolehjem/app/Http/Controllers/EventController.php
View File

@ -237,8 +237,7 @@ class EventController extends Controller
$userEvent->delete();
}
$news = News::query()->where("type_id", "=", "3")->where("arrangement_id", "=", $event->id)->first();
if($news !== null)
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "Activity")->where("arrangement_id", "=", $id);
$news->delete();
$event->delete();

13
skolehjem/app/Http/Controllers/GuideController.php
View File

@ -159,17 +159,18 @@ class GuideController extends Controller
/**
* Remove the specified resource from storage.
*
* @param Guide $guide
* @param Guide $id
* @return \Illuminate\Http\Response
*/
public function destroy($guide)
public function destroy($id)
{
$guide = Guide::find($guide);
$news = News::query()->where("type_id", "=", "4")->where("arrangement_id", "=", $guide->id)->first();
// Find the guide you want to remove
$guide = Guide::find($id);
// Find the news the you made when creating the guide (if there is a news)
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "Guide")->where("arrangement_id", "=", $id);
if($news !== null)
//Delete the news or/and guide
$news->delete();
$guide->delete();

6
skolehjem/app/Http/Controllers/MenuPlanController.php
View File

@ -193,7 +193,13 @@ class MenuPlanController extends Controller
*/
public function destroy($id)
{
// Find the menu you want to remove
$menuplan = MenuPlan::find($id);
// Find the news the you made when creating the menu (if there is a news)
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where('type', '=', 'Menu')->where('arrangement_id', '=', $id);
//Delete the news or/and menu
$news->delete();
$menuplan->delete();
return redirect()->route("menu-plans.index");
}