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

DO NOT TOUCH MENUPLAN-STUFF!!!

Browse Source
This commit is contained in:
Sebastian Davaris
2020-06-29 09:08:49 +02:00
parent 0adc1ebf02
commit c1877cd180
4 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/MenuPlanController.php
+1 -1
View File
@@ -89,7 +89,7 @@ class MenuPlanController extends Controller
public function update(Request $request, $id)
{
$data = $request->all();
//FORCED UPDATE
$menuplan = MenuPlan::find($id);
$menuplan->update($data);
skolehjem/app/Http/Controllers/UserController.php
+35 -28
View File
@@ -117,35 +117,42 @@ class UserController extends Controller
*/
public function update(Request $request, $id)
{
$data = $request->validate([
"name_first" => "max:255",
"name_last" => "max:255",
"email" => "email|unique:users",
"password" => "max:60",
"phone" => "unique:users",
]);
$data = $request->all();
// $data = $request->validate([
// "name_first" => "max:255",
// "name_last" => "max:255",
// "email" => "email|unique:users",
// "password" => "max:60",
// "phone" => "unique:users",
// ]);
// Validates if the user is updating itself or another user.
if($id === Auth::id()) {
$user = Auth::user();
$user->update($data);
$user->save();
}
//TODO: Implement when security's ready!!!
// else if(Auth::user()->hasPermissionTo("user.edit")) {
// $user = User::find($id);
// if($id === Auth::id()) {
// $user = Auth::user();
//
// /** @var User $user */
// $user->update($data);
//
// $user->save();
// return Response::detect("users.edit", [
// "user" => $user
// ]);
// }
return Response::detect("users.edit", [
"user" => $user
//TODO: Implement when security's ready!!!
// else if(Auth::user()->hasPermissionTo("user.edit")) {
$user = User::find($id);
/** @var User $user */
$user->update($data);
$user->save();
// }
$users = User::query()->paginate(20);
return Response::detect("users.index", [
"users" => $users
]);
}
@@ -157,17 +164,17 @@ class UserController extends Controller
*/
public function destroy($id)
{
if($id === Auth::id()) {
$user = Auth::user();
$user->delete();
}
else if(Auth::user()->hasPermissionTo("user.delete")) {
// if($id === Auth::id()) {
// $user = Auth::user();
// $user->delete();
// }
// else if(Auth::user()->hasPermissionTo("user.delete")) {
$user = User::find($id);
$user->delete();
}
// }
return view("users.delete");
return redirect()->route("users.index");
}
/*******************************************/