From 57e52f0ba417bdf6bb9ddd3ce6f9fa26743cdb84 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 25 Feb 2021 13:35:05 -0800
Subject: [PATCH 1/2] Fixed extraneous closing </i>

---
 resources/views/models/index.blade.php | 30 +++++++-------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php
index ff9e5b372..729a112c7 100755
--- a/resources/views/models/index.blade.php
+++ b/resources/views/models/index.blade.php
@@ -15,7 +15,7 @@
 {{-- Page title --}}
 @section('header_right')
   @can('create', \App\Models\AssetModel::class)
-    <a href="{{ route('models.create') }}" class="btn btn-primary pull-right"></i> {{ trans('general.create') }}</a>
+    <a href="{{ route('models.create') }}" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
   @endcan
 
   @if (Request::get('status')=='deleted')
@@ -46,7 +46,7 @@
             @if (Request::get('status')!='deleted')
               <div id="toolbar">
                 <label for="bulk_actions" class="sr-only">Bulk Actions</label>
-                <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 300px;">
+                <select id="bulk_actions" name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 300px;">
                   <option value="edit">Bulk Edit</option>
                   <option value="delete">Bulk Delete</option>
                 </select>
@@ -55,16 +55,19 @@
             @endif
               <div class="table-responsive">
               <table
+                  data-side-pagination="server"
+                  data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
                   data-cookie-id-table="modelsTable"
                   data-pagination="true"
                   data-id-table="modelsTable"
                   data-search="true"
-                  data-side-pagination="server"
+
                   data-show-columns="true"
                   data-toolbar="#toolbar"
                   data-show-export="true"
                   data-show-refresh="true"
                   data-sort-order="asc"
+                  data-page-size='30'
                   id="modelsTable"
                   data-url="{{ route('api.models.index', ['status'=> e(Request::get('status'))]) }}"
                   class="table table-striped snipe-table"
@@ -72,29 +75,12 @@
                 "fileName": "export-asset-models-{{ date('Y-m-d') }}",
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                 }'>
-
-          <thead>
-            <tr>
-              <th data-checkbox="true" data-field="checkbox"></th>
-              <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-              <th data-sortable="true" data-field="name" data-formatter="modelsLinkFormatter">{{ trans('general.name') }}</th>
-              <th data-sortable="true" data-field="image" data-formatter="imageFormatter" data-visible="false">{{ trans('admin/hardware/table.image') }}</th>
-              <th data-sortable="true" data-field="manufacturer" data-formatter="manufacturersLinkObjFormatter">{{ trans('general.manufacturer') }}</th>
-              <th data-sortable="true" data-field="model_number">{{ trans('admin/models/table.modelnumber') }}</th>
-              <th data-sortable="true" data-field="assets_count">{{ trans('admin/models/table.numassets') }}</th>
-              <th data-sortable="false" data-field="depreciation" data-formatter="depreciationsLinkObjFormatter">{{ trans('general.depreciation') }}</th>
-              <th data-sortable="true" data-field="category" data-formatter="categoriesLinkObjFormatter">{{ trans('general.category') }}</th>
-              <th data-sortable="true" data-field="eol">{{ trans('general.eol') }}</th>
-              <th data-sortable="false" data-field="fieldset" data-formatter="fieldsetsLinkObjFormatter">{{ trans('admin/models/general.fieldset') }}</th>
-              <th data-sortable="true" data-field="notes">{{ trans('general.notes') }}</th>
-              <th data-switchable="false" data-formatter="modelsActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
-            </tr>
-          </thead>
         </table>
-              {{ Form::close() }}
+
           </div>
         </div>
         </div>
+        {{ Form::close() }}
       </div><!-- /.box-body -->
     </div><!-- /.box -->
   </div>

From f37d5d3d0378b70873a98645d76a1d3dba6102fe Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 25 Feb 2021 16:43:38 -0800
Subject: [PATCH 2/2] Fixed #9085 - asset models not showing proper pagination

Huge thanks to @inietov for catching this one
---
 .../Controllers/Api/AssetModelsController.php |  3 +-
 resources/views/models/index.blade.php        | 43 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index 54efba8a0..abc1f65a5 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -96,8 +96,9 @@ class AssetModelsController extends Controller
                 break;
         }
 
+        $total = $assetmodels->count();
         $assetmodels = $assetmodels->skip($offset)->take($limit)->get();
-        return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $assetmodels->count());
+        return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total);
     }
 
 
diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php
index 729a112c7..b1c1dab87 100755
--- a/resources/views/models/index.blade.php
+++ b/resources/views/models/index.blade.php
@@ -54,28 +54,27 @@
               </div>
             @endif
               <div class="table-responsive">
-              <table
-                  data-side-pagination="server"
-                  data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
-                  data-cookie-id-table="modelsTable"
-                  data-pagination="true"
-                  data-id-table="modelsTable"
-                  data-search="true"
-
-                  data-show-columns="true"
-                  data-toolbar="#toolbar"
-                  data-show-export="true"
-                  data-show-refresh="true"
-                  data-sort-order="asc"
-                  data-page-size='30'
-                  id="modelsTable"
-                  data-url="{{ route('api.models.index', ['status'=> e(Request::get('status'))]) }}"
-                  class="table table-striped snipe-table"
-                  data-export-options='{
-                "fileName": "export-asset-models-{{ date('Y-m-d') }}",
-                "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                }'>
-        </table>
+                <table
+                        data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
+                        data-cookie-id-table="asssetModelsTable"
+                        data-pagination="true"
+                        data-id-table="asssetModelsTable"
+                        data-search="true"
+                        data-show-footer="true"
+                        data-side-pagination="server"
+                        data-show-columns="true"
+                        data-toolbar="#toolbar"
+                        data-show-export="true"
+                        data-show-refresh="true"
+                        data-sort-order="asc"
+                        id="asssetModelsTable"
+                        class="table table-striped snipe-table"
+                        data-url="{{ route('api.models.index') }}"
+                        data-export-options='{
+              "fileName": "export-models-{{ date('Y-m-d') }}",
+              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+              }'>
+              </table>
 
           </div>
         </div>