diff --git a/app/config/version.php b/app/config/version.php index e23e59a8a6..c8edee81a8 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-359', - 'hash_version' => 'v2.0-359-g712e415', + 'app_version' => 'v2.0-365', + 'hash_version' => 'v2.0-365-gd0eed67', ); \ No newline at end of file diff --git a/app/views/backend/locations/view.blade.php b/app/views/backend/locations/view.blade.php index aae2abea34..be0569f437 100644 --- a/app/views/backend/locations/view.blade.php +++ b/app/views/backend/locations/view.blade.php @@ -44,7 +44,7 @@ data-cookie-id-table="location_usersDetailTable"> - @lang('general.user') + @lang('general.user') @@ -64,7 +64,10 @@ data-cookie-id-table="location_assetsDetailTable"> - @lang('general.name') + @lang('general.name') + @lang('admin/hardware/form.model') + @lang('admin/hardware/form.tag') + @lang('admin/hardware/form.serial') @@ -87,7 +90,7 @@ undefinedText: '', iconsPrefix: 'fa', showRefresh: true, - search: true, + search: false, pageSize: {{{ Setting::getSettings()->per_page }}}, pagination: true, sidePagination: 'server', @@ -119,7 +122,7 @@ undefinedText: '', iconsPrefix: 'fa', showRefresh: true, - search: true, + search: false, pageSize: {{{ Setting::getSettings()->per_page }}}, pagination: true, sidePagination: 'server',