Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

skolehjem/app/Http/Controllers/UserController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\User;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Spatie\Permission\Models\Role;
 
@@ -151,19 +152,36 @@ class UserController extends Controller
 //        else if(Auth::user()->hasPermissionTo("user.edit")) {
             $user = User::find($id);
 
+            if ($request->roles != null) {
                 /** @var User $user */
                 $user->update($data);
-
-            if ($request->roles != null) {
                 $user->roles()->detach();
                 $user->forgetCachedPermissions();
 
                 foreach ($request->roles as $role){
                     $user->assignRole($role);
                 }
+
+                //$user->save();
+            } else {
+                if ($request->input('password') != null) {
+                    if ($request->input('password') != $request->input('confirmpassword')) {
+                        return Response::detect("users.editpass");
+                    } elseif (!Hash::check($request->input('oldpassword'), $user->password)) {
+                        return Response::detect("users.editpass");
+                    } else {
+                        /** @var User $user */
+                        $user->update($data);
+                        Auth::logout();
+
+                        return redirect()->route("users.login");
+                    }
+                } else {
+                    $user->update($data);
+                }
+
             }
 
-            $user->save();
 //        }
 
         $users = User::query()->paginate(20);

skolehjem/database/seeds/UserSeeder.php

@@ -22,10 +22,10 @@ class UserSeeder extends Seeder
     
 
 
-        if(User::where("name_first", "admin"))
+        /*if(User::where("name_first", "admin"))
         {
             return;
-        }
+        }*/
 
 
         Log::debug("OPRET");

skolehjem/resources/views/app/layout/base.blade.php

@@ -33,7 +33,7 @@
         Reservationer
     </a>
 {{--  MÅ IKKE SLETTES!!!!  --}}
-{{--    <a href="#">--}}
+{{--    <a href="#  ">--}}
 {{--        <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">--}}
 {{--        Galleri--}}
 {{--    </a>--}}