fix js roles and add back button on card header
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
namespace App\Http\Controllers\Api;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\RoleRequest;
|
||||
use App\Models\Role;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
@@ -13,7 +14,7 @@ class RolesController extends Controller
|
||||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$query = Role::query();
|
||||
$query = Role::query()->orderBy('id', 'desc');
|
||||
|
||||
if($request->has('search') && !empty($request->get('search'))){
|
||||
$query = $query->where('name', 'like', '%'. $request->get('search') . '%');
|
||||
@@ -25,9 +26,14 @@ class RolesController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*/
|
||||
public function store(Request $request)
|
||||
public function store(RoleRequest $request)
|
||||
{
|
||||
//
|
||||
try{
|
||||
$role = Role::create($request->validated());
|
||||
return response()->json(['message' => 'Successfully created', 'data' => $role]);
|
||||
}catch(\Exception $e){
|
||||
return response()->json(['message' => 'Error when creating role', 'error' => $e->getMessage()], 500);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -35,15 +41,34 @@ class RolesController extends Controller
|
||||
*/
|
||||
public function show(string $id)
|
||||
{
|
||||
//
|
||||
try{
|
||||
$role = Role::find($id);
|
||||
if($role){
|
||||
return response()->json(['data' => $role]);
|
||||
} else {
|
||||
return response()->json(['message' => 'Role not found'], 404);
|
||||
}
|
||||
}catch(\Exception $e){
|
||||
return response()->json(['message' => 'Error when getting role', 'error' => $e->getMessage()], 500);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*/
|
||||
public function update(Request $request, string $id)
|
||||
public function update(RoleRequest $request, string $id)
|
||||
{
|
||||
//
|
||||
try{
|
||||
$role = Role::find($id);
|
||||
if($role){
|
||||
$role->update($request->validated());
|
||||
return response()->json(['message' => 'Successfully updated', 'data' => $role]);
|
||||
} else {
|
||||
return response()->json(['message' => 'Role not found'], 404);
|
||||
}
|
||||
}catch(\Exception $e){
|
||||
return response()->json(['message' => 'Error when updating role', 'error' => $e->getMessage()], 500);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -51,6 +76,16 @@ class RolesController extends Controller
|
||||
*/
|
||||
public function destroy(string $id)
|
||||
{
|
||||
//
|
||||
try{
|
||||
$role = Role::find($id);
|
||||
if($role){
|
||||
$role->delete();
|
||||
return response()->json(['message' => 'Successfully deleted']);
|
||||
} else {
|
||||
return response()->json(['message' => 'Role not found'], 404);
|
||||
}
|
||||
}catch(\Exception $e){
|
||||
return response()->json(['message' => 'Error when deleting role', 'error' => $e->getMessage()], 500);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ class RoleRequest extends FormRequest
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
$roleId = $this->route('role');
|
||||
$roleId = $this->route('role_id');
|
||||
return [
|
||||
'name' => 'required|string|max:255|unique:roles,name,' . ($roleId ?? 'NULL') . ',id',
|
||||
'description' => 'nullable|string',
|
||||
|
||||
Reference in New Issue
Block a user