From 9517ff43d5229788fa08f35e088ee73e3e98acb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Fri, 22 Jan 2016 17:51:34 +0100 Subject: [PATCH] FEATURE: tweak form for creating new user Added Foundation classes etc. --- app/Http/Controllers/Admin/UserManagement.php | 2 +- app/Http/Requests/CreateNewUserRequest.php | 11 ---- app/Http/Requests/Request.php | 11 +++- resources/lang/en/admin/userManagement.php | 1 + .../views/admin/userManagement/new.blade.php | 66 +++++++++++-------- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/UserManagement.php index c6af35e6..685801ba 100644 --- a/app/Http/Controllers/Admin/UserManagement.php +++ b/app/Http/Controllers/Admin/UserManagement.php @@ -66,6 +66,6 @@ class UserManagement extends Controller // refresh page with information about successfull registration return redirect() ->route('users.new') - ->with('message', trans('admin/userManagement.registrationSuccessfull')); + ->with('success', trans('admin/userManagement.registrationSuccessfull')); } } diff --git a/app/Http/Requests/CreateNewUserRequest.php b/app/Http/Requests/CreateNewUserRequest.php index f2693b29..6595025c 100644 --- a/app/Http/Requests/CreateNewUserRequest.php +++ b/app/Http/Requests/CreateNewUserRequest.php @@ -7,17 +7,6 @@ use App\Models\User; class CreateNewUserRequest extends Request { - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() - { - - return \Auth::check() && \Auth::$user->role == User::ROLE_ADMIN; - } - /** * Get the validation rules that apply to the request. * diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index 76b2ffd4..c2166b8c 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -6,5 +6,14 @@ use Illuminate\Foundation\Http\FormRequest; abstract class Request extends FormRequest { - // + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + + return true; + } } diff --git a/resources/lang/en/admin/userManagement.php b/resources/lang/en/admin/userManagement.php index 2e187734..84b460e5 100644 --- a/resources/lang/en/admin/userManagement.php +++ b/resources/lang/en/admin/userManagement.php @@ -1,6 +1,7 @@ 'Add new user', 'name' => 'Full name', 'email' => 'Email', 'password' => 'Password', diff --git a/resources/views/admin/userManagement/new.blade.php b/resources/views/admin/userManagement/new.blade.php index 4af2884a..18eae7f9 100644 --- a/resources/views/admin/userManagement/new.blade.php +++ b/resources/views/admin/userManagement/new.blade.php @@ -1,6 +1,21 @@ @extends('admin.layout') +@section('pageName', @trans('admin/userManagement.addNewUser')) + @section('content') + + @if (session('success')) +
+ {{ session('success') }} +
+ @endif + + @if (session('error')) +
+ {{ session('error') }} +
+ @endif +
{!! csrf_field() !!} @@ -15,9 +30,9 @@ @if (isset($errors) && $errors->has('email')) - - {{ $errors->first('email') }} - +
+ {{ $errors->first('email') }} +
@endif @@ -27,35 +42,32 @@ @if (isset($errors) && $errors->has('password')) - - {{ $errors->first('password') }} - +
+ {{ $errors->first('password') }} +
@endif -
- @lang('admin/userManagement.roles') - - @foreach($roles as $role => $translation) - - @endforeach - - - @if (isset($errors) && $errors->has('role')) - - {{ $errors->first('role') }} - - @endif -
+ + + @if (isset($errors) && $errors->has('role')) +
+ {{ $errors->first('role') }} +
+ @endif + +
- - - @stop \ No newline at end of file