From ced920505a7c2a5b459d768fc2bf8f8f89a54794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Fri, 22 Sep 2017 21:32:47 +0200
Subject: [PATCH] FIX #2556: fix user edit

---
 .../views/admin/userManagement/edit.blade.php  | 10 +++++++---
 .../admin/userManagement/editForm.blade.php    | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/resources/views/admin/userManagement/edit.blade.php b/resources/views/admin/userManagement/edit.blade.php
index a1240547..b0b6ae3d 100644
--- a/resources/views/admin/userManagement/edit.blade.php
+++ b/resources/views/admin/userManagement/edit.blade.php
@@ -2,13 +2,17 @@
 
 @section('pageHeading', @trans('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email]))
 @section('headerButtons')
-    <a href="{{route('users.overview')}}" class="btn btn-secondary btn-sm rounded" title="@lang('admin/userManagement.overview')">
+    <a href="{{route('users.overview')}}" class="btn btn-secondary btn-sm rounded"
+       title="@lang('admin/userManagement.overview')">
         <i class="fa fa-list"></i>
     </a>
 @endsection
 
 @section('content')
-    <div class="row">
-        @include('admin.userManagement.editForm')
+    <div class="card items">
+        <div class="card-block">
+            @include('admin.userManagement.editForm')
+        </div>
     </div>
+
 @stop
\ No newline at end of file
diff --git a/resources/views/admin/userManagement/editForm.blade.php b/resources/views/admin/userManagement/editForm.blade.php
index 054d0c3a..a290864c 100644
--- a/resources/views/admin/userManagement/editForm.blade.php
+++ b/resources/views/admin/userManagement/editForm.blade.php
@@ -1,6 +1,8 @@
 <form method="POST" action="{{route('users.editPost', ['id' => $user->id])}}">
     {!! csrf_field() !!}
 
+    <input type="hidden" name="id" value="{{$user->id}}">
+
     <div class="row">
         <div class="col-lg-6">
             <label class="label-control">
@@ -10,6 +12,7 @@
             <input type="text" class="form-control" placeholder="@lang('admin/userManagement.name')"
                    value="{{$user->name}}"
                    name="name">
+            @include('admin.snippets.hasError', ['field' => 'name'])
         </div>
         <div class="col-lg-6">
             <label class="label-control">
@@ -17,6 +20,7 @@
             </label>
             <input type="text" class="form-control" name="email" value="{{$user->email}}"
                    placeholder="somebody@example.com">
+            @include('admin.snippets.hasError', ['field' => 'email'])
         </div>
     </div>
 
@@ -28,35 +32,37 @@
            placeholder="@lang('admin/userManagement.password')"
            name="password"
            value="">
+    @include('admin.snippets.hasError', ['field' => 'password'])
 
     <div class="row">
         @can('change-role', $user)
-
             <div class="col-lg-6">
-
-                <label class="label-control">
+                <label class="label-control" for="role">
                     @lang('admin/userManagement.roles')
                 </label>
 
-                <select class="form-control" name="role">
+                <select class="form-control" name="role" id="role">
                     @foreach($roles as $role => $translation)
                         <option value="{{$role}}" @if($role == $user->role) selected @endif>{{$translation}}</option>
                     @endforeach
                 </select>
+
+                @include('admin.snippets.hasError', ['field' => 'role'])
             </div>
         @endcan
 
         @can('change-status', $user)
             <div class="col-lg-6">
-                <label class="label-control">
+                <label class="label-control" for="status">
                     @lang('admin/userManagement.status')
                 </label>
-                <select class="form-control" name="status">
+                <select class="form-control" id="status" name="status">
                     @foreach($states as $status => $translation)
                         <option value="{{$status}}"
                                 @if($status == $user->status) selected @endif>{{$translation}}</option>
                     @endforeach
                 </select>
+                @include('admin.snippets.hasError', ['field' => 'status'])
             </div>
         @endcan
     </div>