DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
17210 commits 59 branches 275 tags 321 MiB
Commit graph

388 commits

Author SHA1 Message Date
Spencer Long d6f0b580b6
Merge branch 'develop' into refactor/asset-action 2025-03-04 17:04:04 -06:00
snipe 0cd0abe8bb Fixed #16282 - adds accessories tab to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 14:20:21 +00:00
snipe d3210c6d40 Return flat JSON instead of transformed data 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-13 14:16:32 +00:00
Spencer Long ba31a33290
Merge branch 'develop' into refactor/asset-action 2025-01-23 12:58:01 -06:00
snipe ac96b8d4ae Added assignedAccessories method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 183a4d49d8 Refactor of #15235 - added accessory checkout to locations, assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:49 +00:00
spencerrlongg 38d8d3076d Refactor asset handling and streamline code 
This refactoring introduces helper methods for handling image uploads, custom fields, and checkouts, improving code organization and readability. Unnecessary imports, comments, and unused variables were removed for cleaner code. Error handling was also improved with additional exception reporting in the asset update flow.
 2024-12-04 21:43:47 -06:00
spencerrlongg 5e475c3558 Remove unused imports from AssetsController files. 
Simplify the code by cleaning up unused import statements in both `AssetsController.php` and `Api/AssetsController.php`. This reduces potential confusion and helps maintain cleaner code for future development and maintenance.
 2024-12-03 14:41:30 -06:00
spencerrlongg bdf1033277 Merge remote-tracking branch 'upstream/develop' into refactor/asset-action 
# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	resources/lang/en-US/admin/hardware/message.php
 2024-12-03 14:31:50 -06:00
spencerrlongg 0a1aba5406 a little work for conflicts 2024-11-29 14:32:19 -06:00
snipe 2cb1b6d462 Use transformer on API update 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-27 13:51:53 +00:00
spencerrlongg ac1d09add0 Fix authorization check in AssetsController 
Removed incorrect and commented-out authorization check in the destroy method. Ensured proper authorization by explicitly authorizing the asset instance before attempting deletion.
 2024-11-26 14:49:50 -06:00
spencerrlongg 705a852d45 Refactor error handling and remove redundant code 
Refactored error handling by replacing `\Exception` with `Exception` for consistency. Removed redundant comments and unused code to improve readability and maintainability of the `StoreAssetAction` class.
 2024-11-25 20:09:30 -06:00
NebelKreis d5c141dc59 Fix: Removed setting validation as it is not strictly necessary 2024-11-20 11:55:48 +01:00
spencerrlongg 3cf583ab03 Add CustomFieldPermissionException handling 2024-11-19 17:45:35 -06:00
spencerrlongg 9f815996c7 tests 'n stuff 2024-11-19 14:45:54 -06:00
spencerrlongg 3e97f0274c rm extra code 2024-11-19 10:04:10 -06:00
spencerrlongg 6c1239eee5 cleaned - more work needs to happen 2024-11-19 10:02:04 -06:00
NebelKreis 66d6b01307 Feature: Added translations for label generation API endpoint 2024-11-19 14:16:06 +01:00
NebelKreis 889aff43c2 Feature: Added API endpoint for generating asset labels 2024-11-19 14:13:05 +01:00
spencerrlongg dd8fb6ef4a fixed some things, made bulk progress, tests pass 2024-11-19 00:13:28 -06:00
spencerrlongg c91dfaf9df gui seemingly working, other good progress - api next 2024-11-14 16:54:23 -06:00
spencerrlongg b00f8b5c40 a couple more tests passing 2024-10-30 19:37:51 -05:00
spencerrlongg c0ea1fbe78 delete done 2024-10-30 15:19:34 -05:00
spencerrlongg 698434dcf8 no more base action, scaffolded update and delete 2024-10-30 13:48:14 -05:00
spencerrlongg 34886ee69a almost wrapped up StoreAssetAction.php 2024-10-29 19:04:57 -05:00
spencerrlongg eaa10249c2 alright, this mostly works. 2024-10-29 16:16:01 -05: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
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
Brady Wetherington 350b627ce1 Fix numeric sort 'ambiguous order clause' error 2024-10-03 14:23:40 +01: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 0ce5832b6c Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 17:29:40 +01:00
snipe 5fb43dd159 Handle audit *and* audits for urls 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 16:55:56 +01:00
snipe de57d71bf1 Fixed #15548 - unify audit due/overdue APIs 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-24 16:30:24 +01:00
snipe b21c303e56 Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by 2024-09-20 13:43:50 +01:00
snipe a77a7065d7 Added order by admin to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:34:10 +01:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
snipe 7c85ad54eb Sort by numeric columns for numeric custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 19:44:03 +01:00
snipe 56e31d2303 Fixed #15366 - use permission for encrypted custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-22 14:58:09 +01:00
snipe 01c69c8f8f Allow optional status label on quickscan checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-15 10:08:48 +01:00
spencerrlongg 1139ed676a $id to $asset->id (thanks tests) 2024-07-23 13:03:25 -05:00
Spencer Long 64be353156
Merge branch 'develop' into bug/sc-24884 2024-07-23 12:55:19 -05:00
snipe 1d65781d8d More type-hinting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 07:07:20 +01:00
snipe e98284fff5 Modernized helpers and use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:48:35 +01:00
spencerrlongg 6f29c0a7cf Merge branch 'refs/heads/develop' into bug/sc-24884 
# Conflicts:
#	routes/api.php
 2024-07-02 15:48:39 -05:00
snipe 92ba889cae Updated/removed facades 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:53:51 +01:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
Spencer Long cdb1140f10
Merge branch 'develop' into bug/sc-24884 2024-05-23 13:53:00 -05:00
Marcus Moore 8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-05-22 16:09:27 -07:00
Marcus Moore 6d104251b3
Remove todo 2024-05-22 15:40:54 -07:00