From 22385a8e3590e6c9772fad57865e6422f5d7dcef Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 30 Jan 2024 10:47:18 -0800 Subject: [PATCH 1/6] fix for general webhook not notifiying anymore --- app/Listeners/CheckoutableListener.php | 2 +- app/Notifications/CheckinAccessoryNotification.php | 2 +- app/Notifications/CheckinAssetNotification.php | 2 +- app/Notifications/CheckinLicenseSeatNotification.php | 2 +- app/Notifications/CheckoutAccessoryNotification.php | 2 +- app/Notifications/CheckoutAssetNotification.php | 2 +- app/Notifications/CheckoutConsumableNotification.php | 2 +- app/Notifications/CheckoutLicenseSeatNotification.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php index 162b07d276..3f3e23f1c7 100644 --- a/app/Listeners/CheckoutableListener.php +++ b/app/Listeners/CheckoutableListener.php @@ -60,7 +60,7 @@ class CheckoutableListener if ($this->shouldSendWebhookNotification()) { //slack doesn't include the url in its messaging format so this is needed to hit the endpoint - if(Setting::getSettings()->webhook_selected =='slack') { + if(Setting::getSettings()->webhook_selected !='microsoft') { Notification::route('slack', Setting::getSettings()->webhook_endpoint) ->notify($this->getCheckoutNotification($event)); diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php index f376c26a84..cf9d30539e 100644 --- a/app/Notifications/CheckinAccessoryNotification.php +++ b/app/Notifications/CheckinAccessoryNotification.php @@ -44,7 +44,7 @@ class CheckinAccessoryNotification extends Notification $notifyBy[] = MicrosoftTeamsChannel::class; } - if (Setting::getSettings()->webhook_selected == 'slack') { + if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) { $notifyBy[] = 'slack'; } diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php index 8e9467c54f..8ee0f93c62 100644 --- a/app/Notifications/CheckinAssetNotification.php +++ b/app/Notifications/CheckinAssetNotification.php @@ -51,7 +51,7 @@ class CheckinAssetNotification extends Notification $notifyBy[] = MicrosoftTeamsChannel::class; } - if (Setting::getSettings()->webhook_selected == 'slack') { + if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) { \Log::debug('use webhook'); $notifyBy[] = 'slack'; } diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php index 2222f937f3..a97c17aca2 100644 --- a/app/Notifications/CheckinLicenseSeatNotification.php +++ b/app/Notifications/CheckinLicenseSeatNotification.php @@ -48,7 +48,7 @@ class CheckinLicenseSeatNotification extends Notification $notifyBy[] = MicrosoftTeamsChannel::class; } - if (Setting::getSettings()->webhook_selected == 'slack') { + if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) { $notifyBy[] = 'slack'; } diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php index 62fce8e176..4efc922a07 100644 --- a/app/Notifications/CheckoutAccessoryNotification.php +++ b/app/Notifications/CheckoutAccessoryNotification.php @@ -43,7 +43,7 @@ class CheckoutAccessoryNotification extends Notification $notifyBy[] = MicrosoftTeamsChannel::class; } - if (Setting::getSettings()->webhook_selected == 'slack') { + if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) { $notifyBy[] = 'slack'; } diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php index 7350a7736b..36697c21d9 100644 --- a/app/Notifications/CheckoutAssetNotification.php +++ b/app/Notifications/CheckoutAssetNotification.php @@ -60,7 +60,7 @@ class CheckoutAssetNotification extends Notification } $notifyBy = []; - if ((Setting::getSettings()) && (Setting::getSettings()->webhook_selected == 'slack')) { + if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) { \Log::debug('use webhook'); $notifyBy[] = 'slack'; } diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php index 228c4c2e95..392928af28 100644 --- a/app/Notifications/CheckoutConsumableNotification.php +++ b/app/Notifications/CheckoutConsumableNotification.php @@ -50,7 +50,7 @@ class CheckoutConsumableNotification extends Notification $notifyBy[] = MicrosoftTeamsChannel::class; } - if (Setting::getSettings()->webhook_selected == 'slack') { + if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) { $notifyBy[] = 'slack'; } diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php index d5c9871f3b..c763599393 100644 --- a/app/Notifications/CheckoutLicenseSeatNotification.php +++ b/app/Notifications/CheckoutLicenseSeatNotification.php @@ -51,7 +51,7 @@ class CheckoutLicenseSeatNotification extends Notification $notifyBy[] = MicrosoftTeamsChannel::class; } - if (Setting::getSettings()->webhook_selected == 'slack') { + if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) { $notifyBy[] = 'slack'; } From ca59bc3c9ced6e0640f0e73fe5cd27a50d6ee823 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 6 Feb 2024 12:46:17 -0800 Subject: [PATCH 2/6] removes if statement that prevents select2-ifying inputs --- resources/assets/js/snipeit.js | 6 ++---- resources/views/users/confirm-bulk-delete.blade.php | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js index a834e22ba0..c824816583 100755 --- a/resources/assets/js/snipeit.js +++ b/resources/assets/js/snipeit.js @@ -191,9 +191,7 @@ $(document).ready(function () { * Select2 */ - var iOS = /iPhone|iPad|iPod/.test(navigator.userAgent) && !window.MSStream; - if(!iOS) - { + // Vue collision: Avoid overriding a vue select2 instance // by checking to see if the item has already been select2'd. $('select.select2:not(".select2-hidden-accessible")').each(function (i,obj) { @@ -201,7 +199,7 @@ $(document).ready(function () { $(obj).select2(); } }); - } + // $('.datepicker').datepicker(); // var datepicker = $.fn.datepicker.noConflict(); // return $.fn.datepicker to previously assigned value diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php index bd6103ea9a..cb80393e13 100644 --- a/resources/views/users/confirm-bulk-delete.blade.php +++ b/resources/views/users/confirm-bulk-delete.blade.php @@ -132,7 +132,6 @@ $(":submit").attr("disabled", "disabled"); //The line below needs to be here because in mobile view the status_id select2 forgets its select2 so this makes it function properly. - $("[name='status_id']").select2(); $("[name='status_id']").on('select2:select', function (e) { if (e.params.data.id != "") { console.log(e.params.data.id); From cfe2277a6492f412d5a722da57e07dc000562661 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 6 Feb 2024 13:05:04 -0800 Subject: [PATCH 3/6] forgot to remove comment line --- public/js/build/app.js | Bin 1403039 -> 1403004 bytes public/js/dist/all.js | Bin 3197624 -> 3197589 bytes public/mix-manifest.json | 4 ++-- .../views/users/confirm-bulk-delete.blade.php | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/js/build/app.js b/public/js/build/app.js index 2332ec657feeb50779ff03f248d9ad33b05bb43b..95d298bd0587d935d0721979cff752bf2ddfda57 100644 GIT binary patch delta 134 zcmbP#G4#)c&<%NklN$qVCm#s3W8|6?6v|Z1H90y+hP{?cL7`UDda`A(#^iND_nLcy z+k1lGjBM>tIF*6Xe05K~NvjH(X5OV-AClGT1F*gwN05LBR b^8qnG5DNgYAP@@yu`m#eY|ji96&3{m79cZ- diff --git a/public/js/dist/all.js b/public/js/dist/all.js index 80168a1a645220ccc2162c425df7269c03ab4f1b..db19337bef87e7b91a589996fd62edb06230f0e9 100644 GIT binary patch delta 221 zcmW;ANe;na0LAgttmb+63`NlzN>~cFZ~;z%Hg6w=5biyZPOpokL6wzyj6-4b)tvBW}> z&5|va?USsyQ?>nSs~d;SZnHj4G=1jwGykm5UJqLYB-8kb>D74(s!)|`R40WR)T9=v Y)TRz~Nh6(l)TaRr$)M58d5*u?KS>B%00000 delta 220 zcmW;BNe;na0EXe1sj1Zb7k^DP4+oIAfrZ#OfTU-z5&4pyK>iarLEErq;}j0y6uwwI zi#PA}`U*Yhj1a)%zRM)hZCSy7}VcUIIZTHK|2yl4Mbby40gS X4alY;jc800n$nEsw76e_rBVI?u4hw< diff --git a/public/mix-manifest.json b/public/mix-manifest.json index f84c4b826d..c4884fe4c2 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,5 @@ { - "/js/build/app.js": "/js/build/app.js?id=41293fc7aa00ece89fd524e1e0e31a68", + "/js/build/app.js": "/js/build/app.js?id=5fc236a8a8e31c794f02425419889d4a", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", "/css/build/overrides.css": "/css/build/overrides.css?id=9a69d65b9f2b35e6d17c6a72e76424d5", "/css/build/app.css": "/css/build/app.css?id=5a516232bc9f1488514577cf3c8108eb", @@ -32,7 +32,7 @@ "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=afa255bf30b2a7c11a97e3165128d183", "/js/build/vendor.js": "/js/build/vendor.js?id=a2b971da417306a63385c8098acfe4af", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=29340c70d13855fa0165cd4d799c6f5b", - "/js/dist/all.js": "/js/dist/all.js?id=7588c5db6df57ae2c6bb6d7ac2ac5b55", + "/js/dist/all.js": "/js/dist/all.js?id=f2cfedbb15a56ef1d0cd57e2bca8a037", "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=7f9a130eda6916eaa32a0a57e81918f3", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=d419cb63a12dc175d71645c876bfc2ab", diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php index cb80393e13..210f1420a8 100644 --- a/resources/views/users/confirm-bulk-delete.blade.php +++ b/resources/views/users/confirm-bulk-delete.blade.php @@ -131,7 +131,6 @@ $(":submit").attr("disabled", "disabled"); - //The line below needs to be here because in mobile view the status_id select2 forgets its select2 so this makes it function properly. $("[name='status_id']").on('select2:select', function (e) { if (e.params.data.id != "") { console.log(e.params.data.id); From b73e8642d39faa4be1044e406945987497db9d77 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 6 Feb 2024 13:06:21 -0800 Subject: [PATCH 4/6] removed unnecessary changes --- public/js/build/app.js | Bin 1403004 -> 1403039 bytes public/js/dist/all.js | Bin 3197589 -> 3197624 bytes public/mix-manifest.json | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/build/app.js b/public/js/build/app.js index 95d298bd0587d935d0721979cff752bf2ddfda57..2332ec657feeb50779ff03f248d9ad33b05bb43b 100644 GIT binary patch delta 156 zcmex!A$0!5&<%Nk!dzSm3YlpN8j6|z!I}!yK%TGjBM>tIF*6Xe05K~NvjH(X5OV-AClGT1F*gwN05LBR b^8qnG5DNgYAP@@yu`m#eY|ji96&3{m79cZ- delta 134 zcmbP#G4#)c&<%NklN$qVCm#s3W8|6?6v|Z1H90y+hP{?cL7`UDda`A(#^iND_nLcy z+k1liarLEErq;}j0y6uwwI zi#PA}`U*Yhj1a)%zRM)hZCSy7}VcUIIZTHK|2yl4Mbby40gS X4alY;jc800n$nEsw76e_rBVI?u4hw< delta 221 zcmW;ANe;na0LAgttmb+63`NlzN>~cFZ~;z%Hg6w=5biyZPOpokL6wzyj6-4b)tvBW}> z&5|va?USsyQ?>nSs~d;SZnHj4G=1jwGykm5UJqLYB-8kb>D74(s!)|`R40WR)T9=v Y)TRz~Nh6(l)TaRr$)M58d5*u?KS>B%00000 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index c4884fe4c2..f84c4b826d 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,5 @@ { - "/js/build/app.js": "/js/build/app.js?id=5fc236a8a8e31c794f02425419889d4a", + "/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=9a69d65b9f2b35e6d17c6a72e76424d5", "/css/build/app.css": "/css/build/app.css?id=5a516232bc9f1488514577cf3c8108eb", @@ -32,7 +32,7 @@ "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=afa255bf30b2a7c11a97e3165128d183", "/js/build/vendor.js": "/js/build/vendor.js?id=a2b971da417306a63385c8098acfe4af", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=29340c70d13855fa0165cd4d799c6f5b", - "/js/dist/all.js": "/js/dist/all.js?id=f2cfedbb15a56ef1d0cd57e2bca8a037", + "/js/dist/all.js": "/js/dist/all.js?id=7588c5db6df57ae2c6bb6d7ac2ac5b55", "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=7f9a130eda6916eaa32a0a57e81918f3", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=d419cb63a12dc175d71645c876bfc2ab", From c4eaae923a723515a42db2105d4b932ca7a9fc7a Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 8 Feb 2024 15:02:47 -0800 Subject: [PATCH 5/6] removed vue comments since they do not apply anymore --- resources/assets/js/snipeit.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js index c824816583..f5d986deff 100755 --- a/resources/assets/js/snipeit.js +++ b/resources/assets/js/snipeit.js @@ -191,9 +191,6 @@ $(document).ready(function () { * Select2 */ - - // Vue collision: Avoid overriding a vue select2 instance - // by checking to see if the item has already been select2'd. $('select.select2:not(".select2-hidden-accessible")').each(function (i,obj) { { $(obj).select2(); From f4fc8453755b05027e86541372d2b3b70b2e63b8 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 8 Feb 2024 23:06:47 +0000 Subject: [PATCH 6/6] Updated dev assets Signed-off-by: snipe --- public/js/build/app.js | Bin 1403039 -> 1402803 bytes public/js/dist/all.js | Bin 3197624 -> 3197388 bytes public/mix-manifest.json | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/build/app.js b/public/js/build/app.js index 2332ec657feeb50779ff03f248d9ad33b05bb43b..67fab4f67b46e793fc15e0942d054c1f2d6218af 100644 GIT binary patch delta 125 zcmbP#F?93!&<)CglbM2onX0)aM+eEU*K#Q+)M{E!whY#oye{Zob8m2aZ!jYeGXXI( z5VHU=D-g2*F*^`*05K;Ja{)0o5c2>rFA(zqF+UIs0I?tt3jwh(5Q}W@4Hgv=1psKH BEm;5n delta 353 zcmXxey-EW?6a`>38a2kB7}HtYAjG8Eg_Md#9ze}*h@~*ux$X{bW?*-+F{oHr_yAj2 zx{n}O*a|*?Slak39)%R&3>VIvJFlO^=da<*zIUIAgw)x9j>%R1$Y{P*eIaoe={lBE z+twmep|B=#CMhSqkhSelt3}PJ($Y+wlfl3yEXGHb3X!^`b`yOay1_)`x^zBa3QQcU zR2h9pz04>{CgUVgQeEhf1Z9Y%9CKj1q;zV94tV~2G@~Hm;7TEB4PyMa#74L*k0}x< zi5UCkj7H3Q-g6)wG~`WhSf>BKigtb5knjaB#}ZI87Rmihdc@>qGXBr<0dSzXdh(t zzm~RLu61K)Zp_twqUp1LKk|?I%)VP9Al;0wn4aCIpfXjcN;OicP7P{Oi`vwoE@`Aw RkNPyAAsIBX-RJnD`~Y>FRwn=e delta 410 zcmXxe%SyvQ6b4|bwragqYrUoFsh3{7B;vB_q7NVziY|p|GB$(h3?$Q(qM(Zdu0u~jSC+^d;p)qqtL}S!-0SPGoLSm*!$}s_J}bY!BHH;I3{o$CvXyzIEB+VgR?k? zDV)azOyeSEa0!=j1y^ycXPkB)Lgs_GsKFUnqUtKi??sh4bSTF%H4k)AvQRXbR=(K^ zxL;{-sY{U0L#{2PquSnkUI5fVhETj`~V)M-zZ$!BvZctvpWzLdh~zLM0qf zA@_aZh-=vZ1|dZP?r~cmgOGt{(&oeG^$yrBw{Ha{wW1jRTcTaMG;e~-0$?8PcREn# zTn>8*j!6wsxocb|;QuqxbJxg5A3yO_