From bb227cafb2a6303d729e4709080c243d8809f0a5 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 8 Jun 2021 13:16:13 -0500 Subject: [PATCH 1/7] 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 8ac4307a5..20f8db1f2 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 2/7] =?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 567159c58..0e5b6cb53 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 3/7] 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 5608c3bd1..91b96df10 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 4/7] 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 726aafd16..a9b8cb5fa 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 5/7] 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 91b96df10..ae6c2406c 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 c684e5f481c26d4b16c3d7f60022847f844f5c0f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Jun 2021 14:31:16 -0700 Subject: [PATCH 6/7] Add @PetriAsi as a contributor --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 2a23ac1a7..8f916490d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -2360,6 +2360,15 @@ "contributions": [ "code" ] + }, + { + "login": "PetriAsi", + "name": "Petri Asikainen", + "avatar_url": "https://avatars.githubusercontent.com/u/8735148?v=4", + "profile": "https://github.com/PetriAsi", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index 9ba081f37..4691f05f8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) -[![All Contributors](https://img.shields.io/badge/all_contributors-259-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-260-orange.svg?style=flat-square)](#contributors) ## Snipe-IT - Open Source Asset Management System @@ -126,6 +126,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
Mark Stenglein](https://markstenglein.com)
[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [
ajsy](https://github.com/ajsy)
[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [
Jan Kiesewetter](https://github.com/t3easy)
[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [
Tetrachloromethane250](https://github.com/Tetrachloromethane250)
[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [
Lars Kajes](https://www.kajes.se/)
[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [
Joly0](https://github.com/Joly0)
[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [
theburger](https://github.com/limeless)
[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") | | [
David Valin Alonso](https://github.com/deivishome)
[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [
andreaci](https://github.com/andreaci)
[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [
Jelle Sebreghts](http://www.jellesebreghts.be)
[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [
Michael Pietsch](https://github.com/Skywalker-11)
| [
Masudul Haque Shihab](https://github.com/sh1hab)
[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [
Supapong Areeprasertkul](http://www.freedomdive.com/)
[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [
Peter Sarossy](https://github.com/psarossy)
[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") | | [
Renee Margaret McConahy](https://github.com/nepella)
[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [
JohnnyPicnic](https://github.com/JohnnyPicnic)
[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [
markbrule](https://github.com/markbrule)
[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [
Mike Campbell](https://github.com/mikecmpbll)
[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [
tbrconnect](https://github.com/tbrconnect)
[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [
kcoyo](https://github.com/kcoyo)
[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [
Travis Miller](https://travismiller.com/)
[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") | +| [
Petri Asikainen](https://github.com/PetriAsi)
[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! From 7b4cc5044b3fa36b60cd75f5818abe24e90e791f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Jun 2021 14:31:48 -0700 Subject: [PATCH 7/7] Add @derdeagle as a contributor --- .all-contributorsrc | 9 +++++++++ README.md | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8f916490d..255c9bb3c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -2369,6 +2369,15 @@ "contributions": [ "code" ] + }, + { + "login": "derdeagle", + "name": "derdeagle", + "avatar_url": "https://avatars.githubusercontent.com/u/11424540?v=4", + "profile": "https://github.com/derdeagle", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index 4691f05f8..d83479d57 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) -[![All Contributors](https://img.shields.io/badge/all_contributors-260-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-261-orange.svg?style=flat-square)](#contributors) ## Snipe-IT - Open Source Asset Management System @@ -126,7 +126,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
Mark Stenglein](https://markstenglein.com)
[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [
ajsy](https://github.com/ajsy)
[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [
Jan Kiesewetter](https://github.com/t3easy)
[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [
Tetrachloromethane250](https://github.com/Tetrachloromethane250)
[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [
Lars Kajes](https://www.kajes.se/)
[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [
Joly0](https://github.com/Joly0)
[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [
theburger](https://github.com/limeless)
[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") | | [
David Valin Alonso](https://github.com/deivishome)
[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [
andreaci](https://github.com/andreaci)
[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [
Jelle Sebreghts](http://www.jellesebreghts.be)
[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [
Michael Pietsch](https://github.com/Skywalker-11)
| [
Masudul Haque Shihab](https://github.com/sh1hab)
[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [
Supapong Areeprasertkul](http://www.freedomdive.com/)
[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [
Peter Sarossy](https://github.com/psarossy)
[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") | | [
Renee Margaret McConahy](https://github.com/nepella)
[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [
JohnnyPicnic](https://github.com/JohnnyPicnic)
[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [
markbrule](https://github.com/markbrule)
[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [
Mike Campbell](https://github.com/mikecmpbll)
[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [
tbrconnect](https://github.com/tbrconnect)
[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [
kcoyo](https://github.com/kcoyo)
[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [
Travis Miller](https://travismiller.com/)
[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") | -| [
Petri Asikainen](https://github.com/PetriAsi)
[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | +| [
Petri Asikainen](https://github.com/PetriAsi)
[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [
derdeagle](https://github.com/derdeagle)
[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!