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

3536 commits

Author SHA1 Message Date
snipe
c49abb6aea Refactor the UserFilesController show method for simpler inlining 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:08:38 +01:00
snipe
ccd2019448 Removed unusded use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:08:04 +01:00
akemidx
5cb940c2ee Merge branch 'refs/heads/upstream/dev' into feature/sc-26415 2024-10-16 18:32:36 -04:00
spencerrlongg
b1d62cc478 initial untested 2024-10-16 17:23:22 -05: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
3ab2521cb0 email comes through, no picture and html markup appear though. 2024-10-16 12:21:33 -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
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
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
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
de62359c67
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories 
Added tests for accessory api controller
 2024-10-11 11:29:34 +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
8aa298f6b0
Merge pull request #15644 from snipe/form_requests_for_settings 
Form requests for settings
 2024-10-10 12:30:53 +01:00
snipe
94a074a193
Merge pull request #15601 from snipe/check_db_on_healthcheck 
Fixed #15439 - check database on healthcheck
 2024-10-10 01:11:10 +01:00
snipe
3886da8941 Remove form request from get LDAP method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:49 +01:00
snipe
ded79469c1 Remove unused controller method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 20:33:29 +01:00
snipe
aa55fa6ff4 Switch to form requests for settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 18:16:34 +01:00
snipe
7461c3e0ca Change controller to assume a collection. (This is dumb, but whatever) 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 16:19:27 +01:00
Brady Wetherington
350b627ce1 Fix numeric sort 'ambiguous order clause' error 2024-10-03 14:23:40 +01:00
akemidx
e00a1aec02 note box is now missing when unchecking setting 2024-10-02 18:52:33 -04:00
akemidx
06e3bb7fd1 requested changes 2024-10-02 18:37:11 -04:00
akemidx
17706f150e requested changes 2024-10-02 18:15:53 -04:00
akemidx
6fef127cd1 missing closing ) 2024-10-02 18:15:53 -04:00
akemidx
f45b836010 backend form validation. +cleanup 2024-10-02 18:15:53 -04:00
akemidx
700647c53f setting created 2024-10-02 18:15:52 -04:00
snipe
b34a7c8aad Removed die() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:48:35 +01:00
snipe
f92bf5dc20 Updated language for failure 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:39:27 +01:00
snipe
4d9e85026a Fixed #15439 - check database on healthcheck 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 15:36:01 +01:00
spencerrlongg
8232618a9f change the other one too 2024-10-01 14:26:32 -05:00
spencerrlongg
9a651b567d change error to warning 2024-10-01 14:24:03 -05:00
spencerrlongg
1139acd9f3 catch errors around request notifications 2024-10-01 13:36:47 -05:00
snipe
27ba641aa5 Added checkin on delete to API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 14:30:34 +01:00
snipe
5823197e6f Added checkin action on delete for checked out assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-01 14:29:02 +01:00
spencerrlongg
4f9f035c69 added a way to manipulate validator attribute names 2024-09-30 20:09:00 -05:00
Marcus Moore
fdfea390fb
Merge branch 'develop' into testing/fmcs-accessories 2024-09-30 12:59:27 -07:00
Marcus Moore
2004e58b53
Merge branch 'develop' into updated_ad_hoc_notes 2024-09-26 12:29:28 -07:00
Marcus Moore
eb2d7b1f4f
Move comment location 2024-09-26 12:14:00 -07:00
Marcus Moore
47763d1e1a
Add tests for adding notes to assets 2024-09-26 12:13:36 -07:00
Godfrey M
44447b85c9 Merge branch 'develop' into barcode_settings_hide 2024-09-26 11:27:05 -07:00
Godfrey M
3f74ff25d2 fixed error message 2024-09-25 16:19:09 -07:00
akemidx
b813dcd9d0 requested changes from github 2024-09-25 18:54:30 -04:00
spencerrlongg
b69596a261 rm dump 2024-09-25 16:21:33 -05:00
spencerrlongg
d02b9933e5 rm comment 2024-09-25 15:38:40 -05:00
snipe
3f0245f88f Make controller gate match dropdown gate 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 20:33:00 +01:00
snipe
f6d7ea19e4 Set view as base permission, drill down for more intrusive actions 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-25 19:44:39 +01:00
snipe
9b03f46490
Merge pull request #15534 from marcusmoore/bulk-print-users 
Added the ability to bulk print users
 2024-09-25 19:32:01 +01:00
spencerrlongg
f3ad89931f hm ok this kind of works 2024-09-25 13:00:35 -05:00
spencerrlongg
21906d8c27 world set up and idea in place 2024-09-25 12:47:56 -05:00