From a1a11d788f4f4e2898e50a3e069fec9e60390956 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 10 May 2023 11:06:05 -0700 Subject: [PATCH 1/5] Disable browser tests in ChipperCI --- .chipperci.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.chipperci.yml b/.chipperci.yml index fa3b3fd920..663a06350a 100644 --- a/.chipperci.yml +++ b/.chipperci.yml @@ -41,19 +41,18 @@ pipeline: cmd: | # php artisan test --testsuite Feature - - name: Browser Tests - cmd: | - cp -v .env.dusk.example .env.dusk.ci - sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci - sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci - #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci - sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci - sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci - sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci - sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci - - php -S [::0]:8000 -t public 2>server.log & - sleep 2 - php artisan dusk:chrome-driver $CHROME_DRIVER - php artisan dusk --env=ci - +# - name: Browser Tests +# cmd: | +# cp -v .env.dusk.example .env.dusk.ci +# sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci +# sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci +# #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci +# sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci +# sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci +# sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci +# sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci +# +# php -S [::0]:8000 -t public 2>server.log & +# sleep 2 +# php artisan dusk:chrome-driver $CHROME_DRIVER +# php artisan dusk --env=ci From 763176c86bb0cd429c7997257361275a819b77da Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 10 May 2023 14:52:08 -0700 Subject: [PATCH 2/5] standardizes the importer colors no matter the theme --- resources/assets/less/skins/skin-red-dark.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index 8d75bbc792..3fded5f067 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -385,6 +385,10 @@ input[type=text], input[type=search] { .box-header.with-border { border-bottom: #000; } +#upload-table tbody > tr.warning > td,#upload-table h3,#upload-table p{ + background-color:#fcf8e3; + color:#000; +} a { color: var(--link); From 46d6783fc5d4216147f0210c1fa36b9de7a9ac8e Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 15 May 2023 09:01:30 -0700 Subject: [PATCH 3/5] adds translation to checkout notification --- app/Notifications/CheckoutAssetNotification.php | 2 +- resources/lang/en/mail.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php index 303fc08f18..6119c5824b 100644 --- a/app/Notifications/CheckoutAssetNotification.php +++ b/app/Notifications/CheckoutAssetNotification.php @@ -107,7 +107,7 @@ class CheckoutAssetNotification extends Notification } return (new SlackMessage) - ->content(':arrow_up: :computer: Asset Checked Out') + ->content(':arrow_up: :computer: '.trans('mail.Asset_Checkout_Notification')) ->from($botname) ->attachment(function ($attachment) use ($item, $note, $admin, $fields) { $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl()) diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index 6bf36b4ebf..7dd8d6181c 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -75,6 +75,7 @@ return [ 'your_credentials' => 'Your Snipe-IT credentials', 'Accessory_Checkin_Notification' => 'Accessory checked in', 'Asset_Checkin_Notification' => 'Asset checked in', + 'Asset_Checkout_Notification' => 'Asset checked out', 'License_Checkin_Notification' => 'License checked in', 'Expected_Checkin_Report' => 'Expected asset checkin report', 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', From 8e3cbdad9041345114ee4fdd5976b5cb73998c06 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 15 May 2023 11:52:57 -0700 Subject: [PATCH 4/5] removes assigned_to if archived --- app/Http/Controllers/Assets/AssetsController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 2a93845507..76c12d3cf9 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -12,6 +12,7 @@ use App\Models\CheckoutRequest; use App\Models\Company; use App\Models\Location; use App\Models\Setting; +use App\Models\Statuslabel; use App\Models\User; use Auth; use Carbon\Carbon; @@ -324,6 +325,12 @@ class AssetsController extends Controller $asset->rtd_location_id = $request->input('rtd_location_id', null); $asset->byod = $request->input('byod', 0); + $status = Statuslabel::find($asset->status_id); + + if($status->archived){ + $asset->assigned_to = null; + } + if ($asset->assigned_to == '') { $asset->location_id = $request->input('rtd_location_id', null); } From c4876865cff1afc46a6ebe97e3cc3d7f9c67b380 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 16 May 2023 17:36:58 -0700 Subject: [PATCH 5/5] Updated dev assets Signed-off-by: snipe --- public/css/dist/skins/skin-red-dark.css | 6 ++++++ public/css/dist/skins/skin-red-dark.min.css | 6 ++++++ public/mix-manifest.json | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css index 5ae17e15da..17d495cbbb 100644 --- a/public/css/dist/skins/skin-red-dark.css +++ b/public/css/dist/skins/skin-red-dark.css @@ -472,6 +472,12 @@ input[type=search] { .box-header.with-border { border-bottom: #000; } +#upload-table tbody > tr.warning > td, +#upload-table h3, +#upload-table p { + background-color: #fcf8e3; + color: #000; +} a { color: var(--link); } diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index 5ae17e15da..17d495cbbb 100644 --- a/public/css/dist/skins/skin-red-dark.min.css +++ b/public/css/dist/skins/skin-red-dark.min.css @@ -472,6 +472,12 @@ input[type=search] { .box-header.with-border { border-bottom: #000; } +#upload-table tbody > tr.warning > td, +#upload-table h3, +#upload-table p { + background-color: #fcf8e3; + color: #000; +} a { color: var(--link); } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 931a6156e1..61e404923a 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -11,7 +11,7 @@ "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=7d92dea45d94be7e1d4e427c728d335d", "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=6fe68325d5356197672c27bc77cedcb4", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=d6086232485d2b9661b7f83ed482355e", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=8ca888bbc050d9680cbb65021382acba", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bdfc704731682c67645a2248b0b8d2d7", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d", @@ -42,7 +42,7 @@ "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=7c4badf178b44a4489dac90c0f772908", "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=d6086232485d2b9661b7f83ed482355e", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=8ca888bbc050d9680cbb65021382acba", "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=6fe68325d5356197672c27bc77cedcb4", "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=7d92dea45d94be7e1d4e427c728d335d", "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",