DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed #4370 - user’s listing flashing then no results

Browse source
This commit is contained in:
snipe 2017-11-02 11:19:34 -07:00
parent f095f1807c
commit 28a4293a0b
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/UsersController.php
View file

@ -85,7 +85,7 @@ class UsersController extends Controller
$order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$offset = request('offset', 0); $offset = request('offset', 0);
$limit = request('limit', 50); $limit = request('limit', 20);
switch ($request->input('sort')) { switch ($request->input('sort')) {
case 'manager': case 'manager':

25
resources/views/partials/bootstrap-table.blade.php
View file

@ -32,7 +32,7 @@
$('.snipe-table').bootstrapTable('destroy').bootstrapTable({ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
classes: 'table table-responsive table-no-bordered', classes: 'table table-responsive table-no-bordered',
undefinedText: '', undefinedText: '',
iconsPrefix: 'fa', iconsPrefix: 'fa',
@ -46,30 +46,27 @@ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
sidePagination: '{{ (isset($clientSearch)) ? 'client' : 'server' }}', sidePagination: '{{ (isset($clientSearch)) ? 'client' : 'server' }}',
sortable: true, sortable: true,
@if (!isset($simple_view)) @if (!isset($simple_view))
showRefresh: true, showRefresh: true,
pagination: true, pagination: true,
pageSize: {{ $snipeSettings->per_page }}, pageSize: 20,
cookie: true, cookie: true,
cookieExpire: '2y', cookieExpire: '2y',
showExport: true, showExport: true,
stickyHeader: true,
stickyHeader: true, stickyHeaderOffsetY: stickyHeaderOffsetY + 'px',
stickyHeaderOffsetY: stickyHeaderOffsetY + 'px',
@if (isset($showFooter)) @if (isset($showFooter))
showFooter: true, showFooter: true,
@endif @endif
showColumns: true, showColumns: true,
trimOnSearch: false, trimOnSearch: false,
@if (isset($multiSort)) @if (isset($multiSort))
showMultiSort: true, showMultiSort: true,
@endif @endif
@if (isset($exportFile)) @if (isset($exportFile))
exportDataType: 'all', exportDataType: 'all',
@ -97,7 +94,7 @@ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
@endif @endif
@if (isset($columns)) @if (isset($columns))
columns: {!! $columns !!}, columns: {!! $columns !!},
@endif @endif
mobileResponsive: true, mobileResponsive: true,
@ -109,7 +106,7 @@ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
formatLoadingMessage: function () { formatLoadingMessage: function () {
return '<h4><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>'; 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: { icons: {
advancedSearchIcon: 'fa fa-search-plus', advancedSearchIcon: 'fa fa-search-plus',
paginationSwitchDown: 'fa-caret-square-o-down', paginationSwitchDown: 'fa-caret-square-o-down',
@ -121,7 +118,7 @@ $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
minus: 'fa fa-minus', minus: 'fa fa-minus',
@endif @endif
refresh: 'fa-refresh' refresh: 'fa-refresh'
}, }
}); });
} }

2
resources/views/users/index.blade.php
View file

@ -67,7 +67,7 @@
array('deleted'=> (Input::get('status')=='deleted') ? 'true' : 'false','company_id'=>e(Input::get('company_id')))) }}" array('deleted'=> (Input::get('status')=='deleted') ? 'true' : 'false','company_id'=>e(Input::get('company_id')))) }}"
data-cookie="true" data-cookie="true"
data-click-to-select="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> </table>