From 28a4293a0b16acde2b7ab5639e5c666f223ca830 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Nov 2017 11:19:34 -0700
Subject: [PATCH] =?UTF-8?q?Fixed=20#4370=20-=20user=E2=80=99s=20listing=20?=
 =?UTF-8?q?flashing=20then=20no=20results?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php  |  2 +-
 .../views/partials/bootstrap-table.blade.php  | 25 ++++++++-----------
 resources/views/users/index.blade.php         |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 50d72d13e..d0478a159 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -85,7 +85,7 @@ class UsersController extends Controller
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $offset = request('offset', 0);
-        $limit = request('limit', 50);
+        $limit = request('limit',  20);
 
         switch ($request->input('sort')) {
             case 'manager':
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 748a2e2a6..2c2da6cef 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -32,7 +32,7 @@
 
 
 
-$('.snipe-table').bootstrapTable('destroy').bootstrapTable({
+        $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
         classes: 'table table-responsive table-no-bordered',
         undefinedText: '',
         iconsPrefix: 'fa',
@@ -46,30 +46,27 @@ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
         sidePagination: '{{ (isset($clientSearch)) ? 'client' : 'server' }}',
         sortable: true,
 
-
        @if (!isset($simple_view))
 
         showRefresh: true,
         pagination: true,
-        pageSize: {{ $snipeSettings->per_page }},
-
+        pageSize: 20,
         cookie: true,
         cookieExpire: '2y',
         showExport: true,
-
-    stickyHeader: true,
-    stickyHeaderOffsetY: stickyHeaderOffsetY + 'px',
+        stickyHeader: true,
+        stickyHeaderOffsetY: stickyHeaderOffsetY + 'px',
 
 
         @if (isset($showFooter))
-            showFooter: true,
+        showFooter: true,
         @endif
         showColumns: true,
         trimOnSearch: false,
 
-            @if (isset($multiSort))
-            showMultiSort: true,
-            @endif
+        @if (isset($multiSort))
+        showMultiSort: true,
+        @endif
 
             @if (isset($exportFile))
             exportDataType: 'all',
@@ -97,7 +94,7 @@ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
         @endif
 
         @if (isset($columns))
-            columns: {!! $columns !!},
+         columns: {!! $columns !!},
         @endif
 
         mobileResponsive: true,
@@ -109,7 +106,7 @@ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
         formatLoadingMessage: function () {
             return '<h4><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>';
         },
-        pageList: ['30','50','100','150','200','500'],
+        pageList: ['20', '30','50','100','150','200'],
         icons: {
             advancedSearchIcon: 'fa fa-search-plus',
             paginationSwitchDown: 'fa-caret-square-o-down',
@@ -121,7 +118,7 @@ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
             minus: 'fa fa-minus',
             @endif
             refresh: 'fa-refresh'
-        },
+        }
 
     });
     }
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 4403984e5..1fcd3a10b 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -67,7 +67,7 @@
               array('deleted'=> (Input::get('status')=='deleted') ? 'true' : 'false','company_id'=>e(Input::get('company_id')))) }}"
               data-cookie="true"
               data-click-to-select="true"
-              data-cookie-id-table="userlTableDisplay-{{ config('version.hash_version') }}">
+              data-cookie-id-table="userTableDisplay-{{ config('version.hash_version') }}">
 
              </table>