Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -70,9 +70,10 @@ class EventController extends Controller
|
||||
* @param int $id
|
||||
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function edit(Event $id)
|
||||
public function edit($id)
|
||||
{
|
||||
return Response::detect("events.edit", [ "event" => $id ]);
|
||||
$event = Event::find($id);
|
||||
return Response::detect("events.edit", [ "event" => $event ]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -82,17 +83,15 @@ class EventController extends Controller
|
||||
* @param int $id
|
||||
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function update(Request $request, Event $id)
|
||||
public function update(Request $request, $id)
|
||||
{
|
||||
$requestBody = $request->validate([
|
||||
"name" => "unique:events|max:255",
|
||||
"description" => "max:255"
|
||||
]);
|
||||
$data = $request->all();
|
||||
|
||||
$id->update($requestBody);
|
||||
$id->save();
|
||||
$event = Event::find($id);
|
||||
$event->update($data);
|
||||
$event->save();
|
||||
|
||||
return Response::detect("events.update");
|
||||
return Response::detect("events.update", [ "event" => $event]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user