f48c5ee252
Fix an error message
2024-05-29 22:32:45 +01:00
98a94dec29
Change some errors to be 404
...
The asset or file was not found, so 500 wasn't the best choice of error
code
2024-05-29 22:17:36 +01:00
45329912e6
Give a better response to listing no files on an asset
...
HTTP500 was never a good choice. Now it sends back an empty array
2024-05-29 22:01:49 +01:00
bb0a614c39
Update some comments
2024-05-29 22:01:48 +01:00
f11ea79406
Add some sanity checks that the asset actually exists
2024-05-29 22:01:48 +01:00
e817b20840
Fix some responses to be more appropriate
...
Error/success was mixed up
2024-05-29 22:01:48 +01:00
516f766a44
Remove some debug code
2024-05-29 22:01:48 +01:00
f5791c79a5
Change the returns to be API appropriate
2024-05-29 22:01:48 +01:00
194853d860
Remove a redundant line
2024-05-29 22:01:48 +01:00
92670d5711
Add the ability to list files for an asset
2024-05-29 22:01:48 +01:00
8a2ea971e1
Add an API assets files controller
...
Based heavily on the Assets assets files controller.
Added errors related to to the files management.
Added the API endpoints for file upload and show, but only upload is
currently tested/works.
2024-05-29 22:01:48 +01:00
12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout
...
Bulk Consumable Checkout
2024-05-29 19:42:25 +01:00
df1cef59d5
Fixes path for redirect response
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 18:01:40 +01:00
92ba889cae
Updated/removed facades
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:53:51 +01:00
f17162c2e2
Use artisan facade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:40:05 +01:00
fb233c0aa4
Cleaned up facade names and references
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:38:15 +01:00
5d01a06245
Reduce IDE errors in App\Http\Controllers\SettingsController
2024-05-29 08:07:49 +01:00
4c78da3bbf
Re-add json encoding of permissions
2024-05-28 13:03:09 -07:00
b1cb9259da
Re-use total to avoid duplicate count
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 18:01:47 +01:00
03b5c2e246
Fixed bad translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 15:21:28 +01:00
8df9007a8e
Merge branch 'snipeit_v7_laravel10' into develop
2024-05-27 18:08:27 +01:00
485caf1d92
Merge pull request #14755 from marcusmoore/chore/sc-25103/add-tests-around-asset-checkout
...
Added tests around asset checkout
2024-05-25 11:33:33 +01:00
8b3ff5a82d
Handle potentially deleted admin users in license export
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-23 08:39:15 +01:00
8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
2024-05-22 16:09:27 -07:00
6d104251b3
Remove todo
2024-05-22 15:40:54 -07:00
f16c79bb9a
Improve event assertions
2024-05-22 15:38:23 -07:00
c7fa2c04ad
Add scenario
2024-05-22 13:33:12 -07:00
8ca882d1c8
Complete a scenario
2024-05-22 13:23:49 -07:00
4adbd7af4c
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-22 21:02:11 +01:00
4bb7c1701f
Fiddled with storage facade a little more
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:44:49 +01:00
5fd0f56258
Use proper storage facade for checking if the file exists
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:38:49 +01:00
37d7e89e93
Fixed error message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:29:43 +01:00
3ab197075a
Nicer handling of erroring when filename+log do not match
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:20:03 +01:00
bb96a190fd
Moved validator
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 12:34:48 +01:00
f2693ee957
conditionally fixed redirect select option
2024-05-21 14:08:35 -07:00
34f1ea1c0e
Re-order gating and refactor group syncing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-21 10:00:49 +01:00
a53f89cd2c
remove license checkout changes p2
2024-05-20 10:26:45 -07:00
280c03dcad
remove license checkout changes
2024-05-20 10:25:59 -07:00
e70fb42f87
remove license redirects
2024-05-20 10:22:01 -07:00
f633dbba64
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-20 12:55:29 +01:00
771c85e347
Translated account save message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-20 11:19:31 +01:00
54b24434e1
Set file name variable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 19:56:58 +01:00
81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form
2024-05-16 16:13:21 +01:00
09914f508f
Removed more debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 15:16:52 +01:00
de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance
...
Adds a note text area to asset acceptances/declines
2024-05-16 15:06:05 +01:00
fb9a5f928f
removed license changes
2024-05-15 16:39:26 -07:00
55281313d8
Merge pull request #14474 from Godmartinz/asset-location-update-bug
...
Fixed user assets not updating when a user changes location
2024-05-15 19:20:14 +01:00
c137fafa97
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 18:10:43 +01:00
cb22a3d556
Updated comments again :-/
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 17:52:50 +01:00
c7accb4599
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 17:38:42 +01:00