From fbe093705d383e22223c06b17710c142496c463e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 19 Dec 2017 13:42:34 -0800 Subject: [PATCH 1/3] Fixed #4640 - add username to user detail --- resources/views/users/view.blade.php | 29 ++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 88c3003210..797660393b 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -136,20 +136,12 @@ {{ trans('admin/users/table.name') }} {{ $user->present()->fullName() }} + + {{ trans('admin/users/table.username') }} + {{ $user->username }} + - @if ($user->last_login) - - {{ trans('general.last_login') }} - {{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }} - - @endif - @if (!is_null($user->department)) - - {{ trans('general.department') }} - {{ $user->department->name }} - - @endif @if ($user->jobtitle) @@ -197,6 +189,19 @@ @endif + @if ($user->last_login) + + {{ trans('general.last_login') }} + {{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }} + + @endif + + @if (!is_null($user->department)) + + {{ trans('general.department') }} + {{ $user->department->name }} + + @endif @if ($user->created_at) {{ trans('general.created_at') }} From b716db225ff5aaa6157fd4c8de9cc1526817cc72 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 19 Dec 2017 20:30:46 -0800 Subject: [PATCH 2/3] =?UTF-8?q?Added=20=E2=80=9Cnew=E2=80=9D=20buttons=20f?= =?UTF-8?q?or=20manufacturer=20and=20category=20in=20asset=20model=20creat?= =?UTF-8?q?ion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/ModalController.php | 9 +++++ resources/views/modals/category.blade.php | 39 +++++++++++++++++++ resources/views/modals/manufacturer.blade.php | 25 ++++++++++++ .../forms/edit/category-select.blade.php | 7 ++++ .../forms/edit/manufacturer-select.blade.php | 10 ++++- routes/web.php | 2 + 6 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 resources/views/modals/category.blade.php create mode 100644 resources/views/modals/manufacturer.blade.php diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php index 7ae8c61427..c5446aaef3 100644 --- a/app/Http/Controllers/ModalController.php +++ b/app/Http/Controllers/ModalController.php @@ -29,4 +29,13 @@ class ModalController extends Controller function user() { return view('modals.user'); } + + function category() { + return view('modals.category'); + } + + function manufacturer() { + return view('modals.manufacturer'); + } + } diff --git a/resources/views/modals/category.blade.php b/resources/views/modals/category.blade.php new file mode 100644 index 0000000000..1ded211bbf --- /dev/null +++ b/resources/views/modals/category.blade.php @@ -0,0 +1,39 @@ +
+
+
+ +

{{ trans('admin/categories/general.create') }}

+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+ + +
+
+ + +
+
+
diff --git a/resources/views/modals/manufacturer.blade.php b/resources/views/modals/manufacturer.blade.php new file mode 100644 index 0000000000..5f7bd11382 --- /dev/null +++ b/resources/views/modals/manufacturer.blade.php @@ -0,0 +1,25 @@ +
+
+
+ +

{{ trans('admin/manufacturers/table.create') }}

+
+
+ +
+
+
+ +
+
+ +
+
+ + +
+
+
diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php index c7885dc5f0..95db54821a 100644 --- a/resources/views/partials/forms/edit/category-select.blade.php +++ b/resources/views/partials/forms/edit/category-select.blade.php @@ -15,6 +15,13 @@ +
+ @can('create', \App\Models\Category::class) + @if ((!isset($hide_new)) || ($hide_new!='true')) + New + @endif + @endcan +
{!! $errors->first($fieldname, '
:message
') !!} diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php index 7740a5a1fc..d3d9249ce5 100644 --- a/resources/views/partials/forms/edit/manufacturer-select.blade.php +++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php @@ -4,7 +4,7 @@ {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
- @if ($manufacturer_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
+
+ @can('create', \App\Models\Manufacturer::class) + @if ((!isset($hide_new)) || ($hide_new!='true')) + New + @endif + @endcan +
+ {!! $errors->first($fieldname, '
:message
') !!} diff --git a/routes/web.php b/routes/web.php index bff52081a9..74cc045626 100644 --- a/routes/web.php +++ b/routes/web.php @@ -82,6 +82,8 @@ Route::group(['middleware' => 'auth'], function () { Route::group(['middleware' => 'auth','prefix' => 'modals'], function () { Route::get('location',['as' => 'modal.location','uses' => 'ModalController@location']); + Route::get('category',['as' => 'modal.category','uses' => 'ModalController@category']); + Route::get('manufacturer',['as' => 'modal.manufacturer','uses' => 'ModalController@manufacturer']); Route::get('model',['as' => 'modal.model','uses' => 'ModalController@model']); Route::get('statuslabel',['as' => 'modal.statuslabel','uses' => 'ModalController@statuslabel']); Route::get('supplier',['as' => 'modal.supplier','uses' => 'ModalController@supplier']); From 37d4cf3afb49a633f75d835021c74697f6371d0a Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 19 Dec 2017 20:48:26 -0800 Subject: [PATCH 3/3] Fixed #4647 - requestable model button not clickable --- .../account/requestable-assets.blade.php | 22 ++++++++++--------- .../views/emails/asset-requested.blade.php | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php index 9d6917787b..3a7c77b7b5 100644 --- a/resources/views/account/requestable-assets.blade.php +++ b/resources/views/account/requestable-assets.blade.php @@ -143,19 +143,17 @@ {{ trans('general.image') }} {{ trans('admin/hardware/table.asset_model') }} {{ trans('admin/accessories/general.remaining') }} - {{ trans('general.quantity') }} - {{ trans('table.actions') }} + + {{ trans('table.actions') }} @foreach($models as $requestableModel) -
- {{ csrf_field() }} + + @if ($requestableModel->image) @@ -167,16 +165,20 @@ {{$requestableModel->name}} {{$requestableModel->assets->where('requestable', '1')->count()}} - + + + {{ csrf_field() }} + @if ($requestableModel->isRequestedBy(Auth::user())) - {{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}} + {{ Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}} @else - {{Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}} + {{ Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}} @endif + - + @endforeach diff --git a/resources/views/emails/asset-requested.blade.php b/resources/views/emails/asset-requested.blade.php index c5ece1311e..e8a2a253d9 100644 --- a/resources/views/emails/asset-requested.blade.php +++ b/resources/views/emails/asset-requested.blade.php @@ -6,9 +6,9 @@

{{ trans('mail.user') }} {{ $requested_by }}
{{ trans('mail.item') }} {{ $item_name }} ({{ $item_type }})
- {{ trans('mail.requested') }} {{ $requested_date }} + {{ trans('general.requested') }} {{ $requested_date }} @if ($item_quantity > 1) -{{ trans('mail.quantity') }} {{ $item_quantity}} +
{{ trans('general.qty') }} {{ $item_quantity}} @endif @if ($snipeSettings->show_url_in_emails=='1')