From 65dae836c6579ca8f7ce845645803dcf7c80a1e6 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 12 Dec 2023 00:35:08 +0000 Subject: [PATCH 1/3] Set default sorting on backups to latest first Signed-off-by: snipe --- resources/views/settings/backups.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php index 67c1976541..2a939156a3 100644 --- a/resources/views/settings/backups.blade.php +++ b/resources/views/settings/backups.blade.php @@ -40,7 +40,8 @@ data-id-table="system-backups" data-search="true" data-side-pagination="client" - data-sort-order="asc" + data-sort-order="desc" + data-sort-name="modified_display" id="system-backups" class="table table-striped snipe-table"> From 41f1c5c1e363dcf178430efe23e194f61e44e64f Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 12 Dec 2023 00:58:20 +0000 Subject: [PATCH 2/3] Smaller icon size for activity reports, other action icons Signed-off-by: snipe --- public/css/build/app.css | 2 +- public/css/build/overrides.css | 2 +- public/css/dist/all.css | 4 ++-- public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index b82e27befc..ad6e6539cf 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -732,7 +732,7 @@ img.navbar-brand-img, border-style: solid; } .icon-med { - font-size: 20px; + font-size: 14px; color: #889195; } #login-logo { diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 4020194f84..acd302b951 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -365,7 +365,7 @@ img.navbar-brand-img, border-style: solid; } .icon-med { - font-size: 20px; + font-size: 14px; color: #889195; } #login-logo { diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 0786a8b30d..26ef76e41f 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -23513,7 +23513,7 @@ img.navbar-brand-img, border-style: solid; } .icon-med { - font-size: 20px; + font-size: 14px; color: #889195; } #login-logo { @@ -24751,7 +24751,7 @@ img.navbar-brand-img, border-style: solid; } .icon-med { - font-size: 20px; + font-size: 14px; color: #889195; } #login-logo { diff --git a/public/mix-manifest.json b/public/mix-manifest.json index fba4c274e9..5504c39397 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=41293fc7aa00ece89fd524e1e0e31a68", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=1681749b20329c40a052156ea4cb42fe", - "/css/build/app.css": "/css/build/app.css?id=cc0fd2d77504fdd7f03e91e2369d02a9", + "/css/build/overrides.css": "/css/build/overrides.css?id=8453824ff928a55d685947c84e6b3079", + "/css/build/app.css": "/css/build/app.css?id=ddf74e5777fbad72decf760fe8e57570", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=e6e53eef152bba01a4c666a4d8b01117", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=391b67f142742a6b11a92b042c6d475c", + "/css/dist/all.css": "/css/dist/all.css?id=5fa237d9baa78a00f78c75819cd794e6", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=a656b2d865fe379d8851757e8e4001ef", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index af922fc080..128817a119 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -399,7 +399,7 @@ img.navbar-brand-img, .navbar-brand>img { } .icon-med { - font-size: 20px; + font-size: 14px; color: #889195; } From 631dd58de15652e76b9ea2ddfc600d19332e7b42 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 12 Dec 2023 04:23:04 +0000 Subject: [PATCH 3/3] Added model name and number to quickscan Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 14 +++++++++++--- .../views/hardware/quickscan-checkin.blade.php | 16 +++++++++++----- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 24152670ee..79e55befb9 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -885,13 +885,17 @@ class AssetsController extends Controller public function checkin(Request $request, $asset_id) { $this->authorize('checkin', Asset::class); - $asset = Asset::findOrFail($asset_id); + $asset = Asset::with('model')->findOrFail($asset_id); $this->authorize('checkin', $asset); $target = $asset->assignedTo; if (is_null($target)) { - return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.already_checked_in'))); + return response()->json(Helper::formatStandardApiResponse('error', [ + 'asset_tag'=> e($asset->asset_tag), + 'model' => e($asset->model->name), + 'model_number' => e($asset->model->model_number) + ], trans('admin/hardware/message.checkin.already_checked_in'))); } $asset->expected_checkin = null; @@ -925,7 +929,11 @@ class AssetsController extends Controller if ($asset->save()) { event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at, $originalValues)); - return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success'))); + return response()->json(Helper::formatStandardApiResponse('success', [ + 'asset_tag'=> e($asset->asset_tag), + 'model' => e($asset->model->name), + 'model_number' => e($asset->model->model_number) + ], trans('admin/hardware/message.checkin.success'))); } return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error'))); diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php index 677e0c0f15..5ab273bffd 100644 --- a/resources/views/hardware/quickscan-checkin.blade.php +++ b/resources/views/hardware/quickscan-checkin.blade.php @@ -81,6 +81,8 @@ {{ trans('general.asset_tag') }} + {{ trans('general.asset_model') }} + {{ trans('general.model_no') }} {{ trans('general.quickscan_checkin_status') }} @@ -126,7 +128,7 @@ data : formData, success : function (data) { if (data.status == 'success') { - $('#checkedin tbody').prepend("" + data.payload.asset + "" + data.messages + ""); + $('#checkedin tbody').prepend("" + data.payload.asset_tag + "" + data.payload.model + "" + data.payload.model_number + "" + data.messages + ""); incrementOnSuccess(); } else { handlecheckinFail(data); @@ -146,17 +148,21 @@ }); function handlecheckinFail (data) { - if (data.payload.asset) { - var asset = data.payload.asset; + if (data.payload.asset_tag) { + var asset_tag = data.payload.asset_tag; + var model = data.payload.model; + var model_number = data.payload.model_number; } else { - var asset = ''; + var asset_tag = ''; + var model = ''; + var model_number = ''; } if (data.messages) { var messages = data.messages; } else { var messages = ''; } - $('#checkedin tbody').prepend("" + asset + "" + messages + ""); + $('#checkedin tbody').prepend("" + asset_tag + "" + model + "" + model_number + "" + messages + ""); } function incrementOnSuccess() {