Merge del branch devel

app/Http/Controllers/Utenti.php

@@ -86,5 +86,20 @@ class Utenti extends Controller
         }
         return redirect('/admin/users/givepermission');
     }
+
+    function giveRoleToUser()
+    {
+        $users=User::all();
+        $roles=Role::all();
+        return view('users.assignrole',['users'=>$users,'roles'=>$roles]);
+    }
+    
+    function assignRole(Request $request)
+    {
+       //$user=User::getUserbyId($request['user']);
+       $user=User::findOrFail($request['user']);
+       $user->assignRole($request['role']);
+       return redirect('/admin/users/giverole');
+    }
 }
 

resources/views/components/menu.blade.php

@@ -62,6 +62,7 @@
 		<li><a class="active" href="/admin/users/newPermission">Permessi</a></li>
 		-->
 		<li><a class="active" href="/admin/users/givepermission">Assegna Permessi</a></li>
+		<li><a class="active" href="/admin/users/giverole">Assegna Ruoli</a></li>
 		<!--
 		<li><a href="/login">Login Page</a></li>
 		-->

resources/views/components/usermenu.blade.php

@@ -7,10 +7,10 @@
 	<ul class="dropdown-menu dropdown-user">
 		<li><a href="#"><i class="fa fa-user fa-fw"></i> Profilo utente</a></li>
 		<li><a href="#"><i class="fa fa-gear fa-fw"></i> Impostazioni</a></li>
-	@role('admin')
+	@can('amministrazione')
         <li class="divider"></li>
         <li><a href="/admin/users/new"><i class="fa fa-gear fa-fw"></i> Gestisci Utenti</a></li>
-	@endrole
+	@endcan
 		<li class="divider"></li>
 		<li><a href="https://github.com/fbarachino/bubofamily/issues/new/choose" target="new"><i class="fa fa-bug fa-fw"></i> Segnala un bug</a></li>
 		<li class="divider"></li>

resources/views/users/assignrole.blade.php

@@ -0,0 +1,38 @@
+@extends('admin')
+@section('content')
+<div class="row">
+	<div class="col-lg-12">
+		<h1 class="page-header">Assegnazione permessi</h1>
+	</div>
+</div>
+<div class="container">
+    <div class="row">
+         <div class="col-lg-12">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    Nuova assegnazione permessi
+                </div>
+                <div class="panel-body">
+                    <!-- Form -->
+                    <form action="" method="POST">
+                        <select name="user" class="form-control">
+                            @foreach($users as $user)
+                            <option value="{{$user->id}}"> {{$user->name}}</option>
+                            @endforeach
+                        </select>
+                        <select name="role" class="form-control">
+                        @foreach($roles as $role)
+                                <option value="{{$role->name}}">{{$role->name}}</td>
+                        @endforeach
+                        </select>
+                        
+                        @csrf
+                        <input type="Submit" name="submit" value="associa">
+                    </form>
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

routes/admin.php

@@ -131,6 +131,8 @@ Route::group(['middleware'=>['permission:amministrazione']], function(){
 //});
     Route::get('users/givepermission',[Utenti::class,'givePermissionToUser']);
     Route::post('users/givepermission',[Utenti::class,'assignPermission']);
+    Route::get('users/giverole',[Utenti::class,'giveRoleToUser']);
+    Route::post('users/giverole',[Utenti::class,'assignRole']);
 });
 // PROGETTI
 Route::group(['middleware'=>['permission:progetti']], function(){

routes/web.php

@@ -24,5 +24,5 @@ Route::get('/', function () {
 Auth::routes(['register' => false]); // Production only
 //   Auth::routes();    //development mode
 Route::get('/calendar', [TagController::class,'calendartest'])->name('calendar');
-Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
+// Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
 Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');