diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 37dc05cacd..d0478a1599 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -53,7 +53,7 @@ class UsersController extends Controller 'users.activated', 'users.avatar', - ])->with('manager', 'groups', 'location', 'company', 'department','throttle','assets','licenses','accessories','consumables') + ])->with('manager', 'groups', 'userloc', 'company', 'department','assets','licenses','accessories','consumables') ->withCount('assets','licenses','accessories','consumables'); $users = Company::scopeCompanyables($users); @@ -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/app/Http/Middleware/ContentSecurityPolicyHeader.php b/app/Http/Middleware/ContentSecurityPolicyHeader.php index 05eb73ed9d..89aab41eec 100644 --- a/app/Http/Middleware/ContentSecurityPolicyHeader.php +++ b/app/Http/Middleware/ContentSecurityPolicyHeader.php @@ -21,7 +21,7 @@ class ContentSecurityPolicyHeader $policy[] = "default-src 'self'"; $policy[] = "style-src 'self' 'unsafe-inline' oss.maxcdn.com"; - $policy[] = "script-src 'self' 'unsafe-inline' oss.mafxcdn.com cdnjs.cloudflare.com 'nonce-".csrf_token()."'"; + $policy[] = "script-src 'self' 'unsafe-inline' oss.mafxcdn.com cdnjs.cloudflare.com'"; $policy[] = "connect-src 'self'"; $policy[] = "object-src 'none'"; $policy[] = "font-src 'self' data:"; diff --git a/config/version.php b/config/version.php index 1b6b667cdc..bae4cf7b2a 100644 --- a/config/version.php +++ b/config/version.php @@ -1,7 +1,7 @@ 'v4.1.0', - 'build_version' => '37', - 'hash_version' => 'g48207fc', - 'full_hash' => 'v4.1.0-37-g48207fc', + 'app_version' => 'v4.1.1', + 'build_version' => '46', + 'hash_version' => 'g28a4293', + 'full_hash' => 'v4.1.1-46-g28a4293', ); diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index d65b56439e..8b9ce3ae02 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -183,7 +183,7 @@ @can('admin')
  • - @lang('general.create') + {{ trans('general.create') }} @@ -294,16 +299,19 @@
  • - @lang('general.viewassets') + + {{ trans('general.viewassets') }}
  • - @lang('general.editprofile') + + {{ trans('general.editprofile') }}
  • - @lang('general.changepassword') + + {{ trans('general.changepassword') }}
    • @@ -320,7 +328,7 @@
  • - @lang('general.logout') + {{ trans('general.logout') }}
    • @@ -366,7 +374,9 @@ @@ -418,7 +465,7 @@ - @lang('general.licenses') + {{ trans('general.licenses') }} @endcan @@ -426,7 +473,7 @@ - @lang('general.accessories') + {{ trans('general.accessories') }} @endcan @@ -434,7 +481,7 @@ - @lang('general.consumables') + {{ trans('general.consumables') }} @endcan @@ -442,7 +489,7 @@ - @lang('general.components') + {{ trans('general.components') }} @endcan @@ -450,7 +497,7 @@ - @lang('general.people') + {{ trans('general.people') }} @endcan @@ -458,7 +505,7 @@ - @lang('general.import') + {{ trans('general.import') }} @endcan @@ -467,7 +514,7 @@
  • - @lang('general.settings') + {{ trans('general.settings') }} @@ -489,36 +536,68 @@ @endcan @can('view', \App\Models\AssetModel::class) -
  • @lang('general.asset_models')
    • +
  • + + {{ trans('general.asset_models') }} + +
    • @endcan @can('view', \App\Models\Category::class) -
  • @lang('general.categories')
    • +
  • + + {{ trans('general.categories') }} + +
    • @endcan @can('view', \App\Models\Manufacturer::class) -
  • @lang('general.manufacturers')
    • +
  • + + {{ trans('general.manufacturers') }} + +
    • @endcan @can('view', \App\Models\Supplier::class) -
  • @lang('general.suppliers')
    • +
  • + + {{ trans('general.suppliers') }} + +
    • @endcan @can('view', \App\Models\Department::class) -
  • @lang('general.departments')
    • +
  • + + {{ trans('general.departments') }} + +
    • @endcan @can('view', \App\Models\Location::class) -
  • @lang('general.locations')
    • +
  • + + {{ trans('general.locations') }} + +
    • @endcan @can('view', \App\Models\Company::class) -
  • @lang('general.companies')
    • +
  • + + {{ trans('general.companies') }} + +
    • @endcan @can('view', \App\Models\Depreciation::class) -
  • @lang('general.depreciation')
    • +
  • + + {{ trans('general.depreciation') }} + +
    • @endcan @@ -530,22 +609,50 @@
  • - @lang('general.reports') + {{ trans('general.reports') }}
    • @endcan diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 748a2e2a64..2c2da6cefc 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 '

    Loading... please wait....

    '; }, - 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 4403984e59..1fcd3a10b2 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') }}">