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] 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 54efba8a08..abc1f65a5a 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 729a112c7d..b1c1dab873 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>