lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
16546 commits 1 branch 0 tags 220 MiB
Commit graph

16546 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M
c39df34bdf forgot to add accessory mail to project 2024-10-16 15:29:50 -07:00
Godfrey M
dcdf600b78 adds Checkin and Checkout mailables and listner logic 2024-10-16 15:27:34 -07:00
Brady Wetherington
3cf746d7df Rework the bulk checkout to not change how all checkouts work 2024-10-16 23:13:32 +01:00
Brady Wetherington
6b7af802af Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar 2024-10-16 22:02:45 +01:00
Godfrey M
9710436d54 adds Mailables for asset checkin and out 2024-10-16 13:12:07 -07:00
Godfrey M
16cffe9a9d simplified checkout webhook call 2024-10-16 12:53:35 -07:00
Godfrey M
9e1b86f586 sends checkout notification via webhook 2024-10-16 12:51:19 -07:00
Godfrey M
3ab2521cb0 email comes through, no picture and html markup appear though. 2024-10-16 12:21:33 -07:00
Marcus Moore
604a964462
Improve scenario descriptions 2024-10-16 11:52:24 -07:00
Marcus Moore
2f72c66614
Add additional case 2024-10-16 11:30:06 -07:00
Tobias Regnery
fdcc17ca2c Fix user creation with FullMultipleCompanySupport enabled over API 
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.

Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
 2024-10-16 11:47:18 +02:00
Marcus Moore
cba1a56040
Improve readability? 2024-10-15 17:38:11 -07:00
Marcus Moore
d9afde4610
Write failing test 2024-10-15 17:00:22 -07:00
Godfrey M
9f06a0e441 handle some edge cases, null values clean up variable names 2024-10-15 14:01:28 -07:00
Marcus Moore
42095c0167
Add reference link 2024-10-15 13:02:22 -07:00
Godfrey M
f8476f7133 finished the construct and mail call in the listner 2024-10-15 12:49:52 -07:00
Marcus Moore
5306e1cd15
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/supplier-select.blade.php
#	resources/views/reports/custom.blade.php
 2024-10-15 12:32:01 -07:00
Godfrey M
b29d032bf0 adds checkoutAssetMail class, and content method 2024-10-15 11:28:27 -07:00
snipe
688260c8bb Merge remote-tracking branch 'origin/develop' 2024-10-15 18:31:16 +01:00
snipe
2500375400
Merge pull request #15672 from uberbrady/ldap_location_fixes 
Clean up how we use the '$location' in LDAP sync command
 2024-10-15 17:34:35 +01:00
Brady Wetherington
e4e1d0d50a Clean up how we use the '$location' in LDAP sync command 2024-10-15 17:26:31 +01:00
snipe
b38c2d4660 Merge remote-tracking branch 'origin/develop' 2024-10-15 16:43:23 +01:00
snipe
16c8264e76
Merge pull request #15671 from snipe/bug/sc-27147 
Bug/sc 27147
 2024-10-15 16:42:34 +01:00
snipe
0ae9ce0aa9 Cannot sort by updated at on Users [sc-27147] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 16:41:45 +01:00
snipe
50b8f180b3 More logical grouping in allow_columns 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 16:41:39 +01:00
snipe
b256bea000 Merge remote-tracking branch 'origin/develop' 2024-10-15 13:10:55 +01:00
snipe
914a647204
Merge pull request #15669 from snipe/remlove_ou_requirenedess 
Fixed #15663 - remove requiredness for OU
 2024-10-15 12:47:15 +01:00
snipe
e9225ff3ea Switch to regular HTML for input form field 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 12:43:10 +01:00
snipe
d0d4159088 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 12:42:09 +01:00
snipe
69b6080bd8
Merge pull request #15666 from snipe/updated_readme_llm 
Added LLM note
 2024-10-15 10:31:29 +01:00
snipe
b997d728fb Added LLM note 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-15 10:30:34 +01:00
snipe
ddead359d0
Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2 
Refactor asset creation with API
 2024-10-14 14:29:34 +01:00
Tobias Regnery
f3c4e55667 Refactor asset creation with API 
Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport.
But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation()
The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend.
Fix this by removing the check and the now redundant call to getIdForCurrentUser().
Wrong values will get caught by the model-level validation rules.
 2024-10-14 15:14:41 +02:00
snipe
0a1716382e Merge remote-tracking branch 'origin/develop' 2024-10-11 16:07:01 +01:00
snipe
0d35335da7 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-11 16:06:17 +01:00
snipe
6554d0c787 Merge remote-tracking branch 'origin/develop' 2024-10-11 14:24:11 +01:00
snipe
feaa714304 Nicer disabled button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-11 14:23:57 +01:00
snipe
e1a70023b1
Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs 
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
 2024-10-11 11:45:48 +01:00
snipe
41ffd55430 Merge remote-tracking branch 'origin/develop' 2024-10-11 11:30:09 +01:00
snipe
de62359c67
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories 
Added tests for accessory api controller
 2024-10-11 11:29:34 +01:00
snipe
1338eaa4fa Merge remote-tracking branch 'origin/develop' 2024-10-11 11:28:06 +01:00
snipe
12bda8fc7b
Merge pull request #15653 from snipe/15651_admin_user_on_maintenances 
Fixed #15651 - admin user now displaying on maintenances page
 2024-10-11 11:27:18 +01:00
Tobias Regnery
fb4fe30049 Fix asset creation with API and FullMultipleCompanySupport 
It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled.
This bug goes back to 75ac7f80b9 which is part of version 6.3.0.
Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().
 2024-10-11 12:19:20 +02:00
snipe
b054017c9f Fixed #15651 - admin user now displaying on maintenances page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-11 11:16:24 +01:00
bryanlopezinc
524a442724 Improved import performance 2024-10-10 23:32:07 +01:00
snipe
b296afe050 Merge remote-tracking branch 'origin/develop' 2024-10-10 12:32:19 +01:00
snipe
8aa298f6b0
Merge pull request #15644 from snipe/form_requests_for_settings 
Form requests for settings
 2024-10-10 12:30:53 +01:00
snipe
1f34657734 Fixed test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-10 12:30:35 +01:00
snipe
0856ee648e
Merge pull request #15648 from snipe/update_packages 
Updated livewire to 3.5.2
 2024-10-10 12:23:14 +01:00
snipe
1dafc970df Updated livewire to 3.5.2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-10 12:19:57 +01:00