diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php index bd5eb6e286..881bc5da51 100644 --- a/app/Http/Controllers/Api/ReportsController.php +++ b/app/Http/Controllers/Api/ReportsController.php @@ -46,7 +46,7 @@ class ReportsController extends Controller ]; $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; - $order = $request->input('order') === 'asc' ? 'desc' : 'asc'; + $order = ($request->input('order') == 'asc') ? 'asc' : 'desc'; $offset = request('offset', 0); $limit = request('limit', 50); $total = $actionlogs->count(); diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 9a1ff51b19..8ac5943c16 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -167,7 +167,6 @@ class="table table-striped snipe-table" name="activityReport" id="table" - data-sort-order="desc" data-height="400" data-show-export="false" data-url="{{ route('api.activity.index', ['limit' => 25]) }}"> diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 412cd6c521..e54c45974c 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -79,6 +79,8 @@ class="table table-striped snipe-table" id="table" data-advanced-search="true" + data-sort-order="name" + data-sort-order="asc" data-show-export="true" data-cookie="true" data-id-table="advancedTable" diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php index 4fba5715de..8d4679ff58 100644 --- a/resources/views/reports/activity.blade.php +++ b/resources/views/reports/activity.blade.php @@ -19,6 +19,7 @@ data-toolbar="#toolbar" class="table table-striped snipe-table" id="table" + data-sort-order="desc" data-url="{{ route('api.activity.index') }}" data-cookie="true" data-cookie-id-table="activityReportTable"> diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 1fcd3a10b2..288a61b8ff 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -61,6 +61,8 @@ name="users" data-toolbar="#toolbar" data-toggle="table" + data-sort-order="name" + data-sort-order="asc" class="table table-striped snipe-table" id="table" data-url="{{ route('api.users.index',