From 01e3296ff379dd9984faad638eecb2dd1e27a0e6 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 26 May 2021 15:58:24 -0700 Subject: [PATCH 01/17] Updated hash Signed-off-by: snipe --- config/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/version.php b/config/version.php index 65141829e4..59a80b78eb 100644 --- a/config/version.php +++ b/config/version.php @@ -6,5 +6,5 @@ return array ( 'prerelease_version' => '', 'hash_version' => 'g9eea46ade', 'full_hash' => 'v5.1.5-44-g9eea46ade', - 'branch' => 'develop', + 'branch' => 'master', ); \ No newline at end of file From bb227cafb2a6303d729e4709080c243d8809f0a5 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 8 Jun 2021 13:16:13 -0500 Subject: [PATCH 02/17] Added event to trigger the notification. --- app/Http/Controllers/Api/AssetsController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 8ac4307a55..20f8db1f23 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -1,6 +1,7 @@ save()) { $asset->logCheckin($target, e($request->input('note'))); + event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'))); + return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success'))); } From 4f6b1bb12da59d0b53a24fd11e451e50ddd9a03f Mon Sep 17 00:00:00 2001 From: Travis Miller Date: Wed, 9 Jun 2021 11:52:04 -0500 Subject: [PATCH 03/17] =?UTF-8?q?Fixed=20#9680:=20Use=20Eloquent=E2=80=99s?= =?UTF-8?q?=20`withCount`=20method=20to=20count=20Statuslabel=20assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/StatuslabelsController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index 567159c58f..0e5b6cb536 100644 --- a/app/Http/Controllers/Api/StatuslabelsController.php +++ b/app/Http/Controllers/Api/StatuslabelsController.php @@ -167,10 +167,7 @@ class StatuslabelsController extends Controller { $this->authorize('view', Statuslabel::class); - $statuslabels = Statuslabel::with('assets') - ->groupBy('id') - ->withCount('assets as assets_count') - ->get(); + $statuslabels = Statuslabel::withCount('assets')->get(); $labels=[]; $points=[]; From 72f27ccc5bb2ec7c13f3d1cfd22ca296224745c0 Mon Sep 17 00:00:00 2001 From: Joly0 Date: Fri, 11 Jun 2021 11:05:39 +0200 Subject: [PATCH 04/17] Update print.blade.php --- resources/views/users/print.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 5608c3bd13..91b96df108 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -87,7 +87,7 @@ {{ $asset->last_checkout }} @if ($asset->assetlog->first()) - +
@endif @@ -106,7 +106,7 @@ {{ $asset->serial }} {{ $asset->last_checkout }} - +
@php $assignedCounter++ From 8f4b88a877511b01e5e342fcdbd643fc6db2ce6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCnch?= Date: Sat, 12 Jun 2021 20:21:43 +0200 Subject: [PATCH 05/17] Fixes #9705 Prevent syntax error in startup.sh If SESSION_DRIVER is not defined it leads to a syntax error. --- docker/startup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/startup.sh b/docker/startup.sh index 726aafd16b..a9b8cb5fa0 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -54,7 +54,7 @@ then cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/ fi -if [ $SESSION_DRIVER = "database" ] +if [ "$SESSION_DRIVER" = "database" ] then cp -ax /var/www/html/vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub /var/www/html/database/migrations/2021_05_06_0000_create_sessions_table.php fi From 9a429952ff1a1aa48cae935f67012b8d7e201fa2 Mon Sep 17 00:00:00 2001 From: Joly0 Date: Tue, 15 Jun 2021 08:52:01 +0200 Subject: [PATCH 06/17] update print.blade.php --- resources/views/users/print.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 91b96df108..ae6c2406cc 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -87,7 +87,7 @@ {{ $asset->last_checkout }} @if ($asset->assetlog->first()) -
+ @endif @@ -106,7 +106,7 @@ {{ $asset->serial }} {{ $asset->last_checkout }} -
+ @php $assignedCounter++ From ae2c77f97f66cedcbc0837f07c1a8abd66555de8 Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Thu, 17 Jun 2021 00:36:04 +0300 Subject: [PATCH 07/17] Allow to bulk update min_amt --- app/Models/Accessory.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index fbd611939d..f05f9461ee 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -91,6 +91,7 @@ class Accessory extends SnipeModel 'supplier_id', 'image', 'qty', + 'min_amt', 'requestable' ]; From 154adeb9b2cef2611a75e777a6f4fdbca6d92b12 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 23 Jun 2021 14:06:36 -0700 Subject: [PATCH 08/17] corrected a link color in the dark mode yellow skin --- resources/assets/less/skins/skin-yellow-dark.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index c123340b96..356a84c27d 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -143,7 +143,7 @@ a { } a:link { - color: var(--link); + color: var(--header); } a:visited { From ac52ea3463ab9127002a491fa57b12c2b2353d31 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Jun 2021 14:27:15 -0700 Subject: [PATCH 09/17] Porting PR #9720 to develop Signed-off-by: snipe --- resources/views/partials/forms/edit/company-select.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/forms/edit/company-select.blade.php b/resources/views/partials/forms/edit/company-select.blade.php index 74adc86cbe..1be0c9fca2 100644 --- a/resources/views/partials/forms/edit/company-select.blade.php +++ b/resources/views/partials/forms/edit/company-select.blade.php @@ -4,7 +4,7 @@
{{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
- @if ($company_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
@@ -153,7 +153,7 @@ @endforeach
-
+