ticket 369
This commit is contained in:
Vincent BRIDIER
parent
4f522db2b9
commit
1ac87290fa
14 changed files with 661 additions and 364 deletions
|
|
@ -5,10 +5,11 @@ namespace App\Http\Controllers;
|
|||
use App\User;
|
||||
use App\Models\Marque;
|
||||
use App\Models\Sujet;
|
||||
use App\Models\Dossier;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Adldap\Laravel\Facades\Adldap;
|
||||
use App\Http\Requests\DestroyUserRequest;
|
||||
use App\Models\Media;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
|
|
@ -19,10 +20,15 @@ class UserController extends Controller
|
|||
*/
|
||||
public function index()
|
||||
{
|
||||
Auth::user()->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$users = User::all();
|
||||
$sujets = Sujet::where('sujet_dam', 1)->get();
|
||||
return view('users.index')->with(['users'=> $users, 'sujets'=> $sujets]);
|
||||
/** @var \App\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
$localUser->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$users = User::all();
|
||||
$sujets = Sujet::where('sujet_dam', 1)->get();
|
||||
return view('users.index')->with([
|
||||
'users' => $users,
|
||||
'sujets' => $sujets
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -32,244 +38,306 @@ class UserController extends Controller
|
|||
*/
|
||||
public function create()
|
||||
{
|
||||
Auth::user()->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$roles = config('roles.label');
|
||||
$marques = Marque::orderBy('libMarq', 'asc')->get();
|
||||
$sujets = Sujet::where('sujet_dam', 1)->orderBy('libelle', 'asc')->get();
|
||||
return view('users.create')->with(['roles'=> $roles, 'marques'=> $marques, 'sujets'=> $sujets]);
|
||||
/** @var \App\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
$localUser->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$roles = config('roles.label');
|
||||
$marques = Marque::orderBy('libMarq', 'asc')->get();
|
||||
$sujets = Sujet::where('sujet_dam', 1)->orderBy('libelle', 'asc')->get();
|
||||
return view('users.create')->with([
|
||||
'roles' => $roles, 'marques' => $marques,
|
||||
'sujets' => $sujets
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
Auth::user()->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$validatedData = $request->validate([
|
||||
'matricule' => 'required',
|
||||
'firstname' => 'required',
|
||||
'lastname' => 'required',
|
||||
'email' => 'email',
|
||||
'role' => 'required'
|
||||
]);
|
||||
/** @var \App\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
$localUser->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$validatedData = $request->validate([
|
||||
'matricule' => 'required',
|
||||
'firstname' => 'required',
|
||||
'lastname' => 'required',
|
||||
'email' => 'email',
|
||||
'role' => 'required'
|
||||
]);
|
||||
|
||||
$user = User::where('matricule', $request->matricule)->first();
|
||||
if($user){
|
||||
session()->flash('error', "Ce matricule est déjà présent dans l'application. Ajout impossible.");
|
||||
return redirect()->route('user.create');
|
||||
}else{
|
||||
// ---- L'utilisateur
|
||||
$user = new User();
|
||||
$user->matricule = $request->matricule;
|
||||
$user->firstname = $request->firstname;
|
||||
$user->lastname = $request->lastname;
|
||||
$user->email = $request->email;
|
||||
$user->role = $request->role;
|
||||
$user = User::where('matricule', $request->matricule)->first();
|
||||
if ($user) {
|
||||
session()->flash('error', "Ce matricule est déjà présent dans l'application. Ajout impossible.");
|
||||
return redirect()->route('user.create');
|
||||
} else {
|
||||
// ---- L'utilisateur
|
||||
$user = new User();
|
||||
$user->matricule = $request->matricule;
|
||||
$user->firstname = $request->firstname;
|
||||
$user->lastname = $request->lastname;
|
||||
$user->email = $request->email;
|
||||
$user->role = $request->role;
|
||||
|
||||
if ($user->save()){
|
||||
if ($user->save()) {
|
||||
// ---- Les marques
|
||||
$sMarques = $request->marques;
|
||||
if ($sMarques != "") {
|
||||
$marques = explode(",", $sMarques);
|
||||
foreach ($marques as $marqueId) {
|
||||
$user->marques()->attach($marqueId);
|
||||
}
|
||||
}
|
||||
|
||||
// ---- Les marques
|
||||
$sMarques = $request->marques;
|
||||
if($sMarques != ""){
|
||||
$marques = explode(",", $sMarques);
|
||||
foreach($marques as $marqueId){
|
||||
$user->marques()->attach($marqueId);
|
||||
}
|
||||
}
|
||||
// ---- Les sujets
|
||||
$sSujets = $request->sujets;
|
||||
if ($sSujets != "") {
|
||||
$sujets = explode(",", $sSujets);
|
||||
foreach ($sujets as $sujetId) {
|
||||
$user->sujets()->attach($sujetId);
|
||||
}
|
||||
} else {
|
||||
session()->flash('error', "Vous devez ajouter au moins un sujet.");
|
||||
return redirect()->route('user.create');
|
||||
}
|
||||
|
||||
// ---- Les sujets
|
||||
$sSujets = $request->sujets;
|
||||
if($sSujets != ""){
|
||||
$sujets = explode(",", $sSujets);
|
||||
foreach($sujets as $sujetId){
|
||||
$user->sujets()->attach($sujetId);
|
||||
}
|
||||
}else{
|
||||
session()->flash('error', "Vous devez ajouter au moins un sujet.");
|
||||
return redirect()->route('user.create');
|
||||
}
|
||||
|
||||
session()->flash('message', "L'utilisateur a été enregistré");
|
||||
return redirect()->route('user.edit', ['user' => $user]);
|
||||
}else{
|
||||
session()->flash('error', "Une erreur s'est produite, ajout impossible");
|
||||
return redirect()->route('user.create');
|
||||
}
|
||||
}
|
||||
session()->flash('success', "L'utilisateur a été enregistré");
|
||||
return redirect()->route(
|
||||
'user.edit',
|
||||
['user' => $user]
|
||||
);
|
||||
} else {
|
||||
session()->flash('error', "Une erreur s'est produite, ajout impossible");
|
||||
return redirect()->route('user.create');
|
||||
} //end if
|
||||
}//end if
|
||||
}
|
||||
|
||||
/**
|
||||
* Check le matricule avant ajout de l'utilisateur
|
||||
*
|
||||
*/
|
||||
public function checkMatricule(Request $request)
|
||||
{
|
||||
Auth::user()->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$response = array();
|
||||
$response["exist_bdd"] = false;
|
||||
$response["exist_ldap"] = false;
|
||||
/**
|
||||
* Check le matricule avant ajout de l'utilisateur
|
||||
*
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function checkMatricule(Request $request)
|
||||
{
|
||||
/** @var \App\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
$localUser->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$response = [];
|
||||
$response["exist_bdd"] = false;
|
||||
$response["exist_ldap"] = false;
|
||||
|
||||
$data = $request->all(); // This will get all the request data.
|
||||
$matricule = $request->input('matricule');
|
||||
// This will get all the request data.
|
||||
$data = $request->all();
|
||||
$matricule = $request->input('matricule');
|
||||
|
||||
// ---- Ctrl de la présence du matricule en base
|
||||
$user = User::where('matricule', $request->matricule)->first();
|
||||
if($user){
|
||||
$response["exist_bdd"] = true;
|
||||
}
|
||||
// ---- Ctrl de la présence du matricule en base
|
||||
$user = User::where('matricule', $request->matricule)->first();
|
||||
if ($user) {
|
||||
$response["exist_bdd"] = true;
|
||||
}
|
||||
|
||||
$adldap = Adldap::getFacadeRoot();
|
||||
$results = $adldap->search()->where('uid', '=', $matricule)->first();
|
||||
$adldap = Adldap::getFacadeRoot();
|
||||
$results = $adldap->search()->where('uid', '=', $matricule)->first();
|
||||
|
||||
if($results){
|
||||
$response["exist_ldap"] = true;
|
||||
$ldap_user = array();
|
||||
$ldap_user['firstname'] = $results->getAttribute('givenname')[0];
|
||||
$ldap_user['lastname'] = $results->getAttribute('sn')[0];
|
||||
$ldap_user['email'] = $results->getAttribute('mail')[0];
|
||||
$response["ldap_user"] = $ldap_user;
|
||||
}
|
||||
if ($results) {
|
||||
$response["exist_ldap"] = true;
|
||||
$ldap_user = [];
|
||||
$ldap_user['firstname'] = $results->getAttribute('givenname')[0];
|
||||
$ldap_user['lastname'] = $results->getAttribute('sn')[0];
|
||||
$ldap_user['email'] = $results->getAttribute('mail')[0];
|
||||
$response["ldap_user"] = $ldap_user;
|
||||
}
|
||||
|
||||
return json_encode($response);
|
||||
}
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\User $user
|
||||
* @param \App\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(User $user)
|
||||
{
|
||||
$roles = config('roles.label');
|
||||
$marques = $user->marques;
|
||||
$sujets = $user->sujets;
|
||||
return view('users.show')->with(['user'=> $user, 'roles'=> $roles, 'marques' => $marques, 'sujets' => $sujets]);
|
||||
$roles = config('roles.label');
|
||||
$marques = $user->marques;
|
||||
$sujets = $user->sujets;
|
||||
return view('users.show')->with([
|
||||
'user' => $user, 'roles' => $roles,
|
||||
'marques' => $marques,
|
||||
'sujets' => $sujets
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\User $user
|
||||
* @param \App\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(User $user)
|
||||
{
|
||||
Auth::user()->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$roles = config('roles.label');
|
||||
$userMarques = $user->marques;
|
||||
$marques = Marque::orderBy('libMarq', 'asc')->get();
|
||||
$userSujets = $user->sujets;
|
||||
$sujets = Sujet::where('sujet_dam', 1)->orderBy('libelle', 'asc')->get();
|
||||
return view('users.edit')->with(['user'=> $user, 'roles'=> $roles, 'userMarques' => $userMarques, 'marques' => $marques, 'userSujets' => $userSujets, 'sujets'=> $sujets]);
|
||||
/** @var \App\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
$localUser->authorizeRoles(config('roles.const.ADMIN'));
|
||||
|
||||
$roles = config('roles.label');
|
||||
$userMarques = $user->marques;
|
||||
$marques = Marque::orderBy('libMarq', 'asc')->get();
|
||||
$userSujets = $user->sujets;
|
||||
$sujets = Sujet::where('sujet_dam', 1)->orderBy('libelle', 'asc')->get();
|
||||
$users = User::select(['id', 'email'])->whereIn('role', [
|
||||
config('roles.const.ADMIN'), config('roles.const.CONTRIBUTEUR'),
|
||||
config('roles.const.REDACTEUR')
|
||||
])->where('id', '!=', $user->id)->get();
|
||||
return view('users.edit')->with([
|
||||
'user' => $user, 'roles' => $roles, 'users' => $users,
|
||||
'userMarques' => $userMarques, 'marques' => $marques,
|
||||
'userSujets' => $userSujets, 'sujets' => $sujets
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\User $user
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, User $user)
|
||||
{
|
||||
Auth::user()->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$validatedData = $request->validate([
|
||||
'firstname' => 'required',
|
||||
'lastname' => 'required',
|
||||
'email' => 'email',
|
||||
'role' => 'required'
|
||||
]);
|
||||
/** @var \App\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
$localUser->authorizeRoles(config('roles.const.ADMIN'));
|
||||
$validatedData = $request->validate([
|
||||
'firstname' => 'required',
|
||||
'lastname' => 'required',
|
||||
'email' => 'email',
|
||||
'role' => 'required'
|
||||
]);
|
||||
|
||||
// ---- L'utilisateur
|
||||
$user->firstname = $request->firstname;
|
||||
$user->lastname = $request->lastname;
|
||||
$user->email = $request->email;
|
||||
$user->role = $request->role;
|
||||
$user->save();
|
||||
// ---- L'utilisateur
|
||||
$user->firstname = $request->firstname;
|
||||
$user->lastname = $request->lastname;
|
||||
$user->email = $request->email;
|
||||
$user->role = $request->role;
|
||||
$user->save();
|
||||
|
||||
// ---- Les marques
|
||||
$user->marques()->detach();
|
||||
$sMarques = $request->marques;
|
||||
if($sMarques != ""){
|
||||
$marques = explode(",", $sMarques);
|
||||
foreach($marques as $marqueId){
|
||||
$user->marques()->attach($marqueId);
|
||||
}
|
||||
}
|
||||
// ---- Les marques
|
||||
$user->marques()->detach();
|
||||
$sMarques = $request->marques;
|
||||
if ($sMarques != "") {
|
||||
$marques = explode(",", $sMarques);
|
||||
foreach ($marques as $marqueId) {
|
||||
$user->marques()->attach($marqueId);
|
||||
}
|
||||
}
|
||||
|
||||
// ---- Les Sujets
|
||||
$user->sujets()->detach();
|
||||
$sSujets = $request->sujets;
|
||||
if($sSujets != ""){
|
||||
$sujets = explode(",", $sSujets);
|
||||
foreach($sujets as $sujetId){
|
||||
$user->sujets()->attach($sujetId);
|
||||
}
|
||||
}else{
|
||||
session()->flash('error', "Vous devez ajouter au moins un sujet.");
|
||||
return redirect()->route('user.edit', ['user' => $user]);
|
||||
}
|
||||
// ---- Les Sujets
|
||||
$user->sujets()->detach();
|
||||
$sSujets = $request->sujets;
|
||||
if ($sSujets != "") {
|
||||
$sujets = explode(",", $sSujets);
|
||||
foreach ($sujets as $sujetId) {
|
||||
$user->sujets()->attach($sujetId);
|
||||
}
|
||||
} else {
|
||||
session()->flash('error', "Vous devez ajouter au moins un sujet.");
|
||||
return redirect()->route('user.edit', ['user' => $user]);
|
||||
}
|
||||
|
||||
session()->flash('message', "L'utilisateur a été mis à jour");
|
||||
return redirect()->route('user.edit', ['user' => $user]);
|
||||
session()->flash('success', "L'utilisateur a été mis à jour");
|
||||
return redirect()->route('user.edit', ['user' => $user]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\User $user
|
||||
* @param \App\Http\Requests\DestroyUserRequest $request
|
||||
* @param \App\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(User $user)
|
||||
public function destroy(DestroyUserRequest $request, User $user)
|
||||
{
|
||||
Auth::user()->authorizeRoles(config('roles.const.ADMIN'));
|
||||
if ($user->delete()) {
|
||||
return redirect(route('user.index'));
|
||||
} else {
|
||||
session()->flash('error', 'Erreur lors de la suppression');
|
||||
return redirect()->route('user.edit', ['user' => $user]);
|
||||
}
|
||||
/** @var \App\Models\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
$localUser->authorizeRoles(config('roles.const.ADMIN'));
|
||||
|
||||
/** @var \App\User */
|
||||
$userPourRemplacer = User::whereId($request->created_by)->firstOrFail();
|
||||
|
||||
try {
|
||||
return DB::transaction(function () use ($user, $userPourRemplacer) {
|
||||
Media::whereCreatedBy($user->id)->get()
|
||||
->map(function (Media $media) use ($userPourRemplacer) {
|
||||
$media->owner()->associate($userPourRemplacer);
|
||||
$media->saveOrFail();
|
||||
});
|
||||
// TODO: use deleteOrFail after upgrate to laravel 8.
|
||||
if ($user->delete()) {
|
||||
session()->flash('success', trans('L\'utilisateur à été supprimé'));
|
||||
return redirect(route('user.index'));
|
||||
}
|
||||
session()->flash('error', 'Erreur lors de la suppression');
|
||||
return redirect()->back();
|
||||
});
|
||||
} catch (\Exception $e) {
|
||||
report($e);
|
||||
session()->flash('error', 'Erreur lors de la suppression');
|
||||
return redirect()->back();
|
||||
}//end try
|
||||
}
|
||||
|
||||
/**
|
||||
* ajouter un dossier en favoris
|
||||
*
|
||||
*/
|
||||
public function favorisFolder(Request $request)
|
||||
{
|
||||
$dossier_id = $request->input('dossier_id');
|
||||
$favoris = $request->input('favoris');
|
||||
/**
|
||||
* Ajouter un dossier en favoris
|
||||
*
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function favorisFolder(Request $request)
|
||||
{
|
||||
/** @var \App\Models\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
|
||||
$dossierFav = Auth::user()->dossiers()->where('id', $dossier_id)->first();
|
||||
$dossier_id = $request->input('dossier_id');
|
||||
$favoris = $request->input('favoris');
|
||||
|
||||
if($favoris === false && $dossierFav){
|
||||
Auth::user()->dossiers()->detach($dossier_id);
|
||||
}elseif ($favoris === true && !$dossierFav) {
|
||||
Auth::user()->dossiers()->attach($dossier_id);
|
||||
}
|
||||
return json_encode(true);
|
||||
}
|
||||
$dossierFav = $localUser->dossiers()->where('id', $dossier_id)->first();
|
||||
|
||||
/**
|
||||
* ajouter un panier en favoris
|
||||
*
|
||||
*/
|
||||
public function favorisBasket(Request $request)
|
||||
{
|
||||
$basket_id = $request->input('basket_id');
|
||||
$favoris = $request->input('favoris');
|
||||
if ($favoris === false && $dossierFav) {
|
||||
$localUser->dossiers()->detach($dossier_id);
|
||||
} elseif ($favoris === true && !$dossierFav) {
|
||||
$localUser->dossiers()->attach($dossier_id);
|
||||
}
|
||||
return response()->json();
|
||||
}
|
||||
|
||||
$basketFav = Auth::user()->paniersFavoris()->where('id', $basket_id)->first();
|
||||
/**
|
||||
* Ajouter un panier en favoris
|
||||
*
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function favorisBasket(Request $request)
|
||||
{
|
||||
/** @var \App\Models\User $localUser */
|
||||
$localUser = auth()->user();
|
||||
|
||||
if($favoris == "false" && $basketFav){
|
||||
Auth::user()->paniersFavoris()->detach($basket_id);
|
||||
}elseif ($favoris == "true" && !$basketFav) {
|
||||
Auth::user()->paniersFavoris()->attach($basket_id);
|
||||
}
|
||||
return json_encode(true);
|
||||
}
|
||||
$basket_id = $request->input('basket_id');
|
||||
$favoris = $request->input('favoris');
|
||||
|
||||
$basketFav = $localUser->paniersFavoris()->where('id', $basket_id)->first();
|
||||
|
||||
if ($favoris == "false" && $basketFav) {
|
||||
$localUser->paniersFavoris()->detach($basket_id);
|
||||
} elseif ($favoris == "true" && !$basketFav) {
|
||||
$localUser->paniersFavoris()->attach($basket_id);
|
||||
}
|
||||
return response()->json();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
49
app/Http/Requests/DestroyUserRequest.php
Normal file
49
app/Http/Requests/DestroyUserRequest.php
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Rules\HasMinimumRole;
|
||||
use App\Rules\IsValidRole;
|
||||
use App\User;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class DestroyUserRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
$this->merge([
|
||||
'minimumrole' => optional(User::whereId($this->created_by)->first())->role ?? null
|
||||
]);
|
||||
return auth()->check();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'created_by' => 'required|exists:users,id',
|
||||
'minimumrole' => [new IsValidRole(), new HasMinimumRole('CONTRIBUTEUR')]
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get custom attributes for validator errors.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function attributes()
|
||||
{
|
||||
return [
|
||||
'minimumrole' => trans('rôle')
|
||||
];
|
||||
}
|
||||
}
|
||||
89
app/Rules/HasMinimumRole.php
Normal file
89
app/Rules/HasMinimumRole.php
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
<?php
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
|
||||
class HasMinimumRole implements Rule
|
||||
{
|
||||
/**
|
||||
* The minimum role the user must have
|
||||
* @var integer
|
||||
*/
|
||||
protected $minimumRole;
|
||||
|
||||
/**
|
||||
* Ordre permettant une comparaison
|
||||
* ! EN DUR est n'est pas la value de arcadia puisqu'il n'a pas de sens.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $roles = [
|
||||
'ADMIN' => 1, 'REDACTEUR' => 2,
|
||||
'CONTRIBUTEUR' => 3, 'LECTEUR' => 4
|
||||
];
|
||||
|
||||
/**
|
||||
* Create a new rule instance.
|
||||
*
|
||||
* @param string $role
|
||||
* @throws \ErrorException If role is unknown.
|
||||
*/
|
||||
public function __construct(string $role)
|
||||
{
|
||||
if (!in_array(\intval($role), \array_keys($this->roles))) {
|
||||
throw new \ErrorException("Unknown role $role");
|
||||
}
|
||||
|
||||
$this->minimumRole = \intval($this->roles[$role]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert Arcadia role to usable roles
|
||||
*
|
||||
* 1 (ADMIN) => 1
|
||||
* 2 (LECTEUR) => 4
|
||||
* 3 (ADMIN) => 3
|
||||
* 4 (REDACTEUR) => 2
|
||||
*
|
||||
* Donc :
|
||||
* 1 (ADMIN)
|
||||
* 2 (REDACTEUR)
|
||||
* 3 (ADMIN)
|
||||
* 4 (LECTEUR)
|
||||
*
|
||||
* @param integer $value
|
||||
* @return integer
|
||||
*/
|
||||
private function translateRoleValue(int $value): int
|
||||
{
|
||||
$translation = [2 => 4, 4 => 2];
|
||||
return in_array($value, $translation) ? $translation[$value] : $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if the validation rule passes.
|
||||
*
|
||||
* @param mixed $attribute
|
||||
* @param mixed $value
|
||||
* @return boolean
|
||||
* @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceBeforeLastUsed
|
||||
*/
|
||||
public function passes($attribute, $value)
|
||||
{
|
||||
if (!\ctype_digit(strval($value))) {
|
||||
return false;
|
||||
};
|
||||
return $this->translateRoleValue(\intval($value)) <= $this->minimumRole;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation error message.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function message()
|
||||
{
|
||||
return 'L\'attribut :attribute :input n\'est pas suffisament élevé.';
|
||||
}
|
||||
}
|
||||
34
app/Rules/IsValidRole.php
Normal file
34
app/Rules/IsValidRole.php
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
<?php
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
|
||||
class IsValidRole implements Rule
|
||||
{
|
||||
/**
|
||||
* Determine if the validation rule passes.
|
||||
*
|
||||
* @param mixed $attribute
|
||||
* @param mixed $value
|
||||
* @return boolean
|
||||
* @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceBeforeLastUsed
|
||||
*/
|
||||
public function passes($attribute, $value)
|
||||
{
|
||||
if (!\ctype_digit(strval($value))) {
|
||||
return false;
|
||||
};
|
||||
return in_array(\strval($value), config('roles.const'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation error message.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function message()
|
||||
{
|
||||
return 'L\'attribut :attribute n\'est pas valide.';
|
||||
}
|
||||
}
|
||||
233
app/User.php
233
app/User.php
|
|
@ -2,23 +2,20 @@
|
|||
|
||||
namespace App;
|
||||
|
||||
use App\Models\Dossier;
|
||||
use App\Models\Historique;
|
||||
use App\Models\Marque;
|
||||
use App\Models\Media;
|
||||
use App\Models\Panier;
|
||||
use App\Models\Recherche;
|
||||
use App\Models\Sujet;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
|
||||
class User extends Authenticatable
|
||||
{
|
||||
use Notifiable;
|
||||
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
// protected $fillable = [
|
||||
// 'name', 'email', 'password',
|
||||
// ];
|
||||
|
||||
/**
|
||||
* The attributes that should be hidden for arrays.
|
||||
*
|
||||
|
|
@ -37,98 +34,136 @@ class User extends Authenticatable
|
|||
'email_verified_at' => 'datetime',
|
||||
];
|
||||
|
||||
/**
|
||||
* @param string|array $roles
|
||||
*/
|
||||
public function authorizeRoles($roles){
|
||||
if (is_array($roles)) {
|
||||
return in_array($this->role, $roles) ||
|
||||
abort(401, 'Cette action n\'est pas autorisée.');
|
||||
}
|
||||
return $this->role == $roles ||
|
||||
abort(401, 'Cette action n\'est pas autorisée.');
|
||||
}
|
||||
// * METHODS
|
||||
|
||||
/**
|
||||
* Check one role
|
||||
* @param string $role
|
||||
*/
|
||||
public function hasRole($roles) {
|
||||
if (is_array($roles)) {
|
||||
return in_array($this->role, $roles);
|
||||
}
|
||||
return $this->role == $roles;
|
||||
}
|
||||
|
||||
/**
|
||||
* get one role label
|
||||
* @param string $role
|
||||
*/
|
||||
public function getRoleLabel() {
|
||||
return config('roles.label.'.$this->role);
|
||||
}
|
||||
|
||||
/**
|
||||
* The marques that belong to the user.
|
||||
*/
|
||||
public function marques()
|
||||
{
|
||||
return $this->belongsToMany('App\Models\Marque', 'marques_users', 'user_id', 'marque_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* The dossiers that belong to the user.
|
||||
*/
|
||||
public function dossiers()
|
||||
{
|
||||
return $this->belongsToMany('App\Models\Dossier', 'dossiers_users', 'user_id', 'dossier_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* The sujet that belong to the user.
|
||||
*/
|
||||
public function sujets()
|
||||
{
|
||||
return $this->belongsToMany('App\Models\Sujet', 'sujets_users', 'user_id', 'sujet_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the medias for the user.
|
||||
*/
|
||||
public function medias()
|
||||
{
|
||||
return $this->hasMany('App\Models\Media');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the historiques for the user.
|
||||
*/
|
||||
public function historiques()
|
||||
{
|
||||
return $this->hasMany('App\Models\Historique');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the recherches for the user.
|
||||
*/
|
||||
public function recherches()
|
||||
/**
|
||||
* Authorize role
|
||||
*
|
||||
* @param string|array $roles
|
||||
* @return boolean
|
||||
*/
|
||||
public function authorizeRoles($roles): bool
|
||||
{
|
||||
return $this->hasMany('App\Models\Recherche');
|
||||
if (is_array($roles) and in_array($this->role, $roles)) {
|
||||
return true;
|
||||
}
|
||||
if (is_string($roles) and $this->role == $roles) {
|
||||
return true;
|
||||
}
|
||||
abort(401, 'Cette action n\'est pas autorisée.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the paniers for the user.
|
||||
*/
|
||||
public function paniersOwner()
|
||||
{
|
||||
return $this->hasMany('App\Models\Panier', 'owner')->with('medias');
|
||||
}
|
||||
/**
|
||||
* Check one role
|
||||
*
|
||||
* @param array|string $roles
|
||||
* @return boolean
|
||||
*/
|
||||
public function hasRole($roles): bool
|
||||
{
|
||||
if (is_array($roles)) {
|
||||
return in_array($this->role, $roles);
|
||||
}
|
||||
return $this->role == $roles;
|
||||
}
|
||||
|
||||
/**
|
||||
* The paniers that belong to the user.
|
||||
*/
|
||||
public function paniersFavoris()
|
||||
{
|
||||
return $this->belongsToMany('App\Models\Panier', 'paniers_users', 'user_id', 'panier_id');
|
||||
}
|
||||
/**
|
||||
* Get role label
|
||||
*
|
||||
* @return string|null
|
||||
*/
|
||||
public function getRoleLabel(): ?string
|
||||
{
|
||||
return config('roles.label.' . $this->role);
|
||||
}
|
||||
|
||||
// * RELATIONSHIPS
|
||||
|
||||
/**
|
||||
* BelongsToMany marque relation
|
||||
* The marques that belong to the user.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
|
||||
*/
|
||||
public function marques()
|
||||
{
|
||||
return $this->belongsToMany(Marque::class, 'marques_users', 'user_id', 'marque_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* BelongsToMany dossier relation
|
||||
* The dossiers that belong to the user.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
|
||||
*/
|
||||
public function dossiers()
|
||||
{
|
||||
return $this->belongsToMany(Dossier::class, 'dossiers_users', 'user_id', 'dossier_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* BelongsToMany sujet relation
|
||||
* The sujet that belong to the user.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
|
||||
*/
|
||||
public function sujets()
|
||||
{
|
||||
return $this->belongsToMany(Sujet::class, 'sujets_users', 'user_id', 'sujet_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* HasMany medias relation
|
||||
* Get the medias for the user.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function medias()
|
||||
{
|
||||
return $this->hasMany(Media::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* HasMany historiques relation
|
||||
* Get the historiques for the user.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function historiques()
|
||||
{
|
||||
return $this->hasMany(Historique::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* HasMany recherches relation
|
||||
* Get the recherches for the user.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function recherches()
|
||||
{
|
||||
return $this->hasMany(Recherche::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* HasMany paniers relation
|
||||
* Get the paniers for the user.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
*/
|
||||
public function paniersOwner()
|
||||
{
|
||||
return $this->hasMany(Panier::class, 'owner')->with('medias');
|
||||
}
|
||||
|
||||
/**
|
||||
* BelongsToMany paniers relation
|
||||
* The paniers that belong to the user.
|
||||
*
|
||||
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
|
||||
*/
|
||||
public function paniersFavoris()
|
||||
{
|
||||
return $this->belongsToMany(Panier::class, 'paniers_users', 'user_id', 'panier_id');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
'const' => [
|
||||
'ADMIN' => '1',
|
||||
'LECTEUR' => '2',
|
||||
'CONTRIBUTEUR' => '3',
|
||||
'REDACTEUR' => '4',
|
||||
],
|
||||
'label' => [
|
||||
'1' => 'Administrateur',
|
||||
'2' => 'Lecteur',
|
||||
'3' => 'Contributeur',
|
||||
'4' => 'Rédacteur',
|
||||
],
|
||||
'const' => [
|
||||
'ADMIN' => '1',
|
||||
'LECTEUR' => '2',
|
||||
'CONTRIBUTEUR' => '3',
|
||||
'REDACTEUR' => '4',
|
||||
],
|
||||
'label' => [
|
||||
'1' => 'Administrateur',
|
||||
'2' => 'Lecteur',
|
||||
'3' => 'Contributeur',
|
||||
'4' => 'Rédacteur',
|
||||
]
|
||||
];
|
||||
|
|
|
|||
BIN
resources/documents/arcadiar_roles.png
Normal file
BIN
resources/documents/arcadiar_roles.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
39
resources/js/admin.js
vendored
39
resources/js/admin.js
vendored
|
|
@ -33,21 +33,36 @@ $(document).ready(function() {
|
|||
tableGlobalSearch('.datatable tr.data_row', search, [1]);
|
||||
});
|
||||
|
||||
// ---- Edition des utilisateurs : validation formulaire
|
||||
$('#submitEdit').on('click', () => {
|
||||
$('.dataform').trigger('submit')
|
||||
})
|
||||
|
||||
// ---- Edition des utilisateurs : suppression d'utilisateur
|
||||
$(".btn_delete_user").on('click', function(event) {
|
||||
event.preventDefault();
|
||||
var form = $(".deleteform");
|
||||
$.fancyConfirm({
|
||||
title : "Suppression d'un utilisateur",
|
||||
message : "Êtes-vous sûr de vouloir supprimer cet utilisateur ?",
|
||||
okButton : 'Supprimer',
|
||||
noButton : 'Annuler',
|
||||
callback : function (value) {
|
||||
if (value) {
|
||||
form.submit();
|
||||
}
|
||||
}
|
||||
});
|
||||
let form = $('.deleteform'), created_by = $('select[name="created_by"]').val(),
|
||||
created_by_text = $('select[name="created_by"] option:selected').text()
|
||||
if (!created_by.length) {
|
||||
$.fancyConfirm({
|
||||
title: 'Impossible de lancer cet action.',
|
||||
message: 'Vous devez choisir autre un utilisateur à qui assigner les fiches.',
|
||||
okButton: 'Compris',
|
||||
noButton: 'Retour'
|
||||
})
|
||||
return;
|
||||
}
|
||||
$.fancyConfirm({
|
||||
title: 'Suppression d\'un utilisateur',
|
||||
message: 'Les média seront assignés à ' + created_by_text + '. Êtes-vous sûr de vouloir supprimer cet utilisateur ?',
|
||||
okButton: 'Supprimer',
|
||||
noButton: 'Annuler',
|
||||
callback: function (value) {
|
||||
if (value) {
|
||||
form.trigger('submit')
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
// ---- Edition des dossiers : suppression d'un dossier
|
||||
|
|
|
|||
1
resources/sass/partials/form.scss
vendored
1
resources/sass/partials/form.scss
vendored
|
|
@ -70,6 +70,7 @@ input[type="submit"].btn, button.btn, a.btn{
|
|||
}
|
||||
}
|
||||
|
||||
.mt-10{margin-top: 10px; }
|
||||
.ml-10{margin-left: 10px; }
|
||||
.mr-10{margin-right: 10px; }
|
||||
.floatr{float: right;}
|
||||
|
|
|
|||
43
resources/views/modules/flashMessage.blade.php
Normal file
43
resources/views/modules/flashMessage.blade.php
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
@if ($message = Session::get('success'))
|
||||
<div class="alert alert-ok alert-dismissible fade show" role="alert">
|
||||
<i class="fas fa-check"></i>
|
||||
<strong>{!! nl2br(e($message)) !!}</strong>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($message = Session::get('error'))
|
||||
<div class="alert alert-danger alert-dismissible fade show" role="alert">
|
||||
<i class="fas fa-times"></i>
|
||||
<strong>{!! nl2br(e($message)) !!}</strong>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
@if ($message = Session::get('warning'))
|
||||
<div class="alert alert-warning alert-dismissible fade show" role="alert">
|
||||
<i class="fas fa-times"></i>
|
||||
<strong>{!! nl2br(e($message)) !!}</strong>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
@if ($message = Session::get('info'))
|
||||
<div class="alert alert-info alert-dismissible fade show" role="alert">
|
||||
<i class="fas fa-times"></i>
|
||||
<strong>{!! nl2br(e($message)) !!}</strong>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger alert-dismissible fade show" role="alert">
|
||||
<i class="fas fa-times"></i>
|
||||
@if ($errors->any())
|
||||
<ul class="list-unstyled">
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -9,32 +9,7 @@
|
|||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger">
|
||||
<i class="fas fa-times"></i>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ __($error) }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@if (session()->has('error'))
|
||||
<div class="alert alert-danger">
|
||||
<i class="fas fa-times"></i>
|
||||
<ul>
|
||||
<li>{{ Session::get('error') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@if (session()->has('message'))
|
||||
<div class="alert alert-ok">
|
||||
<i class="fas fa-check"></i>
|
||||
<ul>
|
||||
<li>{{ Session::get('message') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@include('modules.flashMessage')
|
||||
<div class="heading">
|
||||
<h1>Ajouter un utilisateur</h1>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,32 +9,7 @@
|
|||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger">
|
||||
<i class="fas fa-times"></i>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ __($error) }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@if (session()->has('error'))
|
||||
<div class="alert alert-danger">
|
||||
<i class="fas fa-times"></i>
|
||||
<ul>
|
||||
<li>{{ Session::get('error') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@if (session()->has('message'))
|
||||
<div class="alert alert-ok">
|
||||
<i class="fas fa-check"></i>
|
||||
<ul>
|
||||
<li>{{ Session::get('message') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@include('modules.flashMessage')
|
||||
<div class="heading">
|
||||
<h1>Edition d'un utilisateur</h1>
|
||||
</div>
|
||||
|
|
@ -61,7 +36,11 @@
|
|||
</div>
|
||||
<div class="form-field">
|
||||
{!! Form::label("", "") !!}
|
||||
{!! Form::select('role', $roles) !!}
|
||||
<select id="role" name="role" required>
|
||||
@foreach($roles as $value => $label)
|
||||
<option value="{{ $value }}" @if(old('role', optional($user)->role) === $value)selected @endif>{{ $label }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-section">
|
||||
{!! Form::label('marques', 'Marques associées') !!}
|
||||
|
|
@ -108,15 +87,22 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
|
||||
<div class="button-row">
|
||||
{!! Form::submit('Enregistrer', [ 'class' => 'btn']) !!} <a href="{{ route('user.index') }}" class="btn btn-black ml-10">Annuler</a>
|
||||
<a href="#" class="btn btn-black floatr btn_delete_user">Supprimer cet utilisateur</a>
|
||||
<div class="button-row mt-10">
|
||||
{!! Form::submit('Enregistrer', [ 'class' => 'btn', 'id' => 'submitEdit']) !!}
|
||||
<a href="{{ route('user.index') }}" class="btn btn-black ml-10">Annuler</a>
|
||||
{!! Form::model($user, ['route' => ['user.destroy', $user], 'enctype' => 'multipart/form-data', 'class' => 'deleteform floatr']) !!}
|
||||
@method('DELETE')
|
||||
<select class="custom-select" name="created_by" required>
|
||||
<option value="" selected>{{ __('Sélectionnez un utilisateur à qui assigner les fiches') }}</option>
|
||||
@foreach($users as $user)
|
||||
<option value="{{ $user->id }}">{{ $user->email }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
<button class="btn btn-black btn_delete_user">{{ __('Supprimer cet utilisateur') }}</button>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
{!! Form::model($user, ['route' => ['user.destroy', $user], 'enctype' => 'multipart/form-data', 'class' => 'deleteform']) !!}
|
||||
@method('DELETE')
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
</main>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
<a href="{{ route('arcadialink.index') }}"><span>Anomalies du lien Arcadia</span><i class="fas fa-bug"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@include('modules.flashMessage')
|
||||
<div class="heading">
|
||||
<h1>Gestion des utilisateurs</h1>
|
||||
<a href="{{ route('user.create') }}" class=" btn"><i class="fa fa-plus"></i> Ajouter</a>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<a class="active" href="{{ route('user.index') }}"><span>Mes informations</span><i class="fas fa-user"></i></a>
|
||||
</div>
|
||||
<div class="main_content">
|
||||
@include('modules.flashMessage')
|
||||
<div class="heading">
|
||||
<h1>Mes informations</h1>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue