From 32fc052c3b844c7faadc59d67ba95ad75ddb58b2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 6 Nov 2017 12:01:54 -0800
Subject: [PATCH 1/2] Fixed  #4391 - companies now listing correct assets

---
 resources/views/companies/view.blade.php | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php
index 0c14b3f174..259817e1fb 100644
--- a/resources/views/companies/view.blade.php
+++ b/resources/views/companies/view.blade.php
@@ -67,23 +67,13 @@
                                 <thead>
                                 <tr>
                                     <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                                    <th data-sortable="true" data-formatter="locationsLinkFormatter" data-field="name" data-searchable="true">{{ trans('admin/locations/table.name') }}</th>
-                                    <th data-sortable="true" data-field="parent">{{ trans('admin/locations/table.parent') }}</th>
-                                    <th data-searchable="false" data-sortable="false" data-field="assets_default">{{ trans('admin/locations/table.assets_rtd') }}</th>
-                                    <th data-searchable="false" data-sortable="false" data-field="assets_checkedout">{{ trans('admin/locations/table.assets_checkedout') }}</th>
-                                    <th data-searchable="true" data-sortable="true" data-field="currency">{{ App\Models\Setting::first()->default_currency }}</th>
-                                    <th data-searchable="true" data-sortable="true" data-field="address">{{ trans('admin/locations/table.address') }}</th>
-                                    <th data-searchable="true" data-sortable="true" data-field="city">{{ trans('admin/locations/table.city') }}
-                                    </th>
-                                    <th data-searchable="true" data-sortable="true" data-field="state">
-                                        {{ trans('admin/locations/table.state') }}
-                                    </th>
-                                    <th data-searchable="true" data-sortable="true" data-field="zip">
-                                        {{ trans('admin/locations/table.zip') }}
-                                    </th>
-                                    <th data-searchable="true" data-sortable="true" data-field="country">
-                                        {{ trans('admin/locations/table.country') }}</th>
-                                    <th data-switchable="false" data-formatter="locationsActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
+                                    <th data-sortable="true" data-formatter="hardwareLinkFormatter" data-field="name" data-searchable="true">{{ trans('admin/hardware/form.name') }}</th>
+                                    <th data-sortable="true" data-field="image" data-visible="true" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
+                                    <th data-searchable="false" data-formatter="modelsLinkObjFormatter" data-sortable="false" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
+                                    <th data-searchable="false" data-sortable="false" data-field="asset_tag">{{ trans('admin/hardware/form.tag') }}</th>
+                                    <th data-searchable="false" data-sortable="false" data-field="serial">{{ trans('admin/hardware/form.serial') }}</th>
+                                    <th data-searchable="false" data-sortable="false" data-formatter="hardwareInOutFormatter" data-field="checkincheckout">Checkin/Checkout</th>
+                                    <th data-searchable="false" data-sortable="false" data-field="actions" data-formatter="hardwareActionsFormatter">{{ trans('general.action') }}</th>
                                 </tr>
                                 </thead>
                             </table>

From 8e17714c122fcbba48aa43201ec1a1040cdd7427 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 6 Nov 2017 12:19:22 -0800
Subject: [PATCH 2/2] Fixed #4384 - bulk checkout of assets

---
 resources/views/hardware/bulk-checkout.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index 51996d3851..3e0e0341a9 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -28,7 +28,7 @@
           {{ csrf_field() }}
 
           <!-- User -->
-          @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_user'])
+          @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_to'])
 
               <!-- Checkout/Checkin Date -->
               <div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">