DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
14245 commits 96 branches 267 tags 295 MiB
Commit graph

3662 commits

Author SHA1 Message Date
Scarzy 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
Scarzy 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
Scarzy bb0a614c39 Update some comments 2024-05-29 22:01:48 +01:00
Scarzy f11ea79406 Add some sanity checks that the asset actually exists 2024-05-29 22:01:48 +01:00
Scarzy e817b20840 Fix some responses to be more appropriate 
Error/success was mixed up
 2024-05-29 22:01:48 +01:00
Scarzy 516f766a44 Remove some debug code 2024-05-29 22:01:48 +01:00
Scarzy f5791c79a5 Change the returns to be API appropriate 2024-05-29 22:01:48 +01:00
Scarzy 194853d860 Remove a redundant line 2024-05-29 22:01:48 +01:00
Scarzy 92670d5711 Add the ability to list files for an asset 2024-05-29 22:01:48 +01:00
Scarzy 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
Marcus Moore b52380f376
Migrate to new namespace 2024-05-29 12:07:48 -07:00
snipe 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
snipe df1cef59d5 Fixes path for redirect response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 18:01:40 +01:00
snipe 92ba889cae Updated/removed facades 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:53:51 +01:00
snipe f17162c2e2 Use artisan facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:40:05 +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
bryanlopezinc 5d01a06245 Reduce IDE errors in App\Http\Controllers\SettingsController 2024-05-29 08:07:49 +01:00
Marcus Moore 4c78da3bbf
Re-add json encoding of permissions 2024-05-28 13:03:09 -07:00
snipe 1c1729854e Use statics for location, supplier, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:02:22 +01:00
snipe 14c78d9065 Use static for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:02:09 +01:00
snipe b1cb9259da Re-use total to avoid duplicate count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:01:47 +01:00
snipe 03b5c2e246 Fixed bad translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:21:28 +01:00
Brady Wetherington 8df9007a8e Merge branch 'snipeit_v7_laravel10' into develop 2024-05-27 18:08:27 +01:00
snipe 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
snipe 8b3ff5a82d Handle potentially deleted admin users in license export 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-23 08:39:15 +01: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
Marcus Moore f16c79bb9a
Improve event assertions 2024-05-22 15:38:23 -07:00
Marcus Moore c7fa2c04ad
Add scenario 2024-05-22 13:33:12 -07:00
Marcus Moore 8ca882d1c8
Complete a scenario 2024-05-22 13:23:49 -07:00
Brady Wetherington 4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
snipe 4bb7c1701f Fiddled with storage facade a little more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:44:49 +01:00
snipe 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
snipe 37d7e89e93 Fixed error message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:29:43 +01:00
snipe 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
snipe bb96a190fd Moved validator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 12:34:48 +01:00
Godfrey M f2693ee957 conditionally fixed redirect select option 2024-05-21 14:08:35 -07:00
snipe 34f1ea1c0e Re-order gating and refactor group syncing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-21 10:00:49 +01:00
Godfrey M a53f89cd2c remove license checkout changes p2 2024-05-20 10:26:45 -07:00
Godfrey M 280c03dcad remove license checkout changes 2024-05-20 10:25:59 -07:00
Godfrey M e70fb42f87 remove license redirects 2024-05-20 10:22:01 -07:00
Brady Wetherington f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe 771c85e347 Translated account save message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:31 +01:00
snipe ca1555d962 Fixed #14664 - allow additional urls in env for CSP 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 22:19:18 +01:00
snipe 54b24434e1 Set file name variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 19:56:58 +01:00
snipe 81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form 2024-05-16 16:13:21 +01:00
snipe 6b3346d90c Only attempt to decrypt if there is a value 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:28:25 +01:00
snipe 312ce51de6 Removed more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:25:57 +01:00
snipe 09914f508f Removed more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:16:52 +01:00
snipe 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
Godfrey M fb9a5f928f removed license changes 2024-05-15 16:39:26 -07:00
snipe 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
snipe c137fafa97 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 18:10:43 +01:00
snipe cb22a3d556 Updated comments again :-/ 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 17:52:50 +01:00
snipe c7accb4599 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 17:38:42 +01:00
snipe c1d5b8713b Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 8310b91e00 Use UploadFileRequest for audit files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe e5653eaa93 Save new data 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe 3c4098038d Fail early if no tag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe eb09a99eb0
Merge pull request #14707 from spencerrlongg/bug/sc-24912 
Bulk Edit Tests and Tweaks
 2024-05-15 11:22:31 +01:00
Godfrey M dc418a7033 need to make variables names uniform 2024-05-14 14:09:54 -07:00
Godfrey M 15cc4345ab adds dynamic redirects to Assets 2024-05-14 13:25:52 -07:00
Godfrey Martinez 5272824d85
Merge branch 'develop' into asset-location-update-bug 2024-05-13 10:47:25 -07:00
snipe 9bce0f2ff7 Format fix 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-13 18:19:14 +01:00
Jeremy Price 2adc4ffa96 Fix memory-hog query in AssetCountForSidebar middleware 
https://github.com/snipe/snipe-it/pull/14702/files introduced a bug
where instead of doing a quick `select count(*)` of assets, it did a `select *` of
assets, moving the count from the database to the PHP process.

This caused OOM issues in memory-constrained environments with lots of
assets, and also presented a speed issue even when memory limited were
increased.

Additionally, given this populates the sidebar, this was likely an issue
on every page load that included the sidebar.

The fix is simply removing the `all()->`, ending up with Asset::count(),
which yields the desired `select count(*)` DB query.
 2024-05-10 12:54:40 -07:00
snipe 46779ca865
Merge pull request #14697 from snipe/bug/sc-25502/disable_delete_if_not_deletable_user 
Fixed UI where delete button was not disabled even if the user couldn't be deleted
 2024-05-08 12:06:33 +01:00
Tobias Regnery b2a5d86e30 Fixes #14701 - wrong total asset count 
The total asset count in the sidenav shows the ready to deploy count instead of the total count.
Fix this by adjusting the query to all assets. Also respect the setting for archived assets.
Add a default value for total assets, since we are now using the settings-variable, which is not available during the setup process.

While at it, move the block for total assets before the ready to deploy assets to match the ordering of the sidenav.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2024-05-08 09:34:35 +02:00
spencerrlongg ad2ba252ee two new test 2024-05-07 15:11:33 -05:00
spencerrlongg 17ef20ea92 alright, in a working place 2024-05-07 14:08:47 -05:00
snipe 8c327e6523 Handle user not found properly 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 19:16:56 +01:00
snipe 97bc4a092f Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:40:48 +01:00
snipe d942b8f1fb Fixed alias names 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:40:35 +01:00
snipe 49dc9767b6 Added debugging :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 15:54:43 +01:00
snipe 482965197d Added users, locations to presenter, transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:07:41 +01:00
snipe 410b547f3c Added users and locatipon count to API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:07:28 +01:00
snipe 4f12c86e74 Fixes #14692 - set default variables for sidebar totals 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 08:34:22 +01:00
Brady Wetherington 5b02a43957 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-06 18:44:03 +01:00
Godfrey M c94a7613ca dropdown redirect options, helper function and session variable added 2024-05-02 12:16:20 -07:00
snipe 4850227c04
Merge pull request #14655 from snipe/feature/sc-25381/simpler_overdue_endpoints 
Refactored due/overdue for audit, added due/overdue for checkin API endpoint and GUI
 2024-05-02 13:11:51 +01:00
snipe 4224bc0c43 Removed extra settings param 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:36:57 +01:00
spencerrlongg e177993bcc notes and some playing around, push for eod 2024-05-01 16:57:11 -05:00
spencerrlongg 25480293dc change keys to values, add test 2024-04-30 18:03:26 -05:00
snipe 19cff25300
Merge pull request #14651 from marcusmoore/bug/sc-25402 
Fixed `purchase_cost` not being allowed to be a string when creating asset via api
 2024-04-27 03:39:10 +01:00
snipe 103809b65f Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:01:43 +01:00
snipe 860764a436 Use totals for sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:12:21 +01:00
snipe 3f04afee5c Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:26 +01:00
snipe 2117f61e8c More view sharing for sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:15 +01:00
snipe 6dc9ccffcd Refactor api for handling audit/expected checkins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:56:57 +01:00
snipe bf058bd5c6 Use updated scopes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:56 +01:00
snipe dfaf01e8aa Updated asset counters 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:47 +01:00
Marcus Moore 2a71877bec
Add additional condition 2024-04-25 17:04:07 -07:00
Marcus Moore 30bd920497
Add conditional 2024-04-25 16:24:12 -07:00
Marcus Moore 1d5b48b88d
Add comment and improve method 2024-04-25 16:22:15 -07:00
Marcus Moore 3a2eeaea7a
WIP: Future-proof rules being converted to array syntax 2024-04-24 17:40:40 -07:00
Marcus Moore 12418ae91b
WIP: allow EU style purchase cost via api 2024-04-24 17:18:29 -07:00
Brady Wetherington 3f5c5cbe82 Merge branch 'develop' into snipeit_v7_laravel10 2024-04-24 16:24:43 +01:00
snipe 2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button 
Added a License Export function and button
 2024-04-24 04:42:56 +01:00
akemidx ac4aa97103 develop reheading 2024-04-23 17:05:50 -04:00
akemidx 0bc93c6a1e space 2024-04-23 15:31:37 -04:00
snipe 685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels 
Removed encrypted fields from label options
 2024-04-23 13:31:38 +01:00
snipe bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields 
Re-enabled updating encrypted custom fields via API [sc-41465]
 2024-04-23 10:20:55 +01:00
Godfrey M 96b3af7cbc fixed view from sending all custom fields 2024-04-22 18:27:34 -07:00
Godfrey M 5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
akemidx 0d049a0be7 conflict resolution 2024-04-22 20:09:40 -04:00
akemidx 01c24ab4cd translating text 2024-04-22 19:16:14 -04:00
Godfrey M 14ddf36d46 removed two duplicate translations 2024-04-22 10:43:11 -07:00
Godfrey M 25f1167c9d adds company scoping to license export 2024-04-22 10:38:55 -07:00
snipe 2aa3ce15bd Removed escaping on notes for file uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 14:55:02 +01:00
snipe 8dd71f99cc Added ico, image/x-icon,image/vnd.microsoft.icon to favicon validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 13:54:19 +01:00
akemidx e8d9701a26 array key existing 2024-04-17 19:16:25 -04:00
snipe 4450351b75 Only sync groups if API user is superadmin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 11:06:50 +01:00
snipe 9bb15aaf1b Added individual gates to keep response consistent with other company-ed things 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:57:49 +01:00
snipe 65dd729e19 Additional gates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:57:20 +01:00
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
snipe 710370ac24 Added scoping for destroy 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:58:25 +01:00
snipe ed0a441e4d Refactor destroy method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:52:03 +01:00
snipe 460693c153 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:13 +01:00
snipe f54a94bd4c Refactorered methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:00 +01:00
Marcus Moore 5567a1e9ac
Formatting 2024-04-10 17:37:11 -07:00
Marcus Moore f28a82de71
Implement some tests, scaffold others 2024-04-10 17:27:07 -07:00
Marcus Moore 7c2fae7b9d
Scaffold api test cases 2024-04-10 17:08:45 -07:00
Marcus Moore 4434de6241
Add test case 2024-04-10 15:47:26 -07:00
Godfrey M a2bca0e358 fixed comments 2024-04-10 15:05:21 -07:00
Marcus Moore 6d572424ac
Add validation around dates 2024-04-10 14:02:25 -07:00
Marcus Moore 7dbf8a8a8e
Add tests for asset and location check out 2024-04-10 13:28:52 -07:00
Godfrey M 0849262243 fixed notes 2024-04-10 12:19:34 -07:00
Godfrey M 17095feb33 fix typo 2024-04-10 12:15:48 -07:00
Godfrey M f42ae46338 exports all licenses 2024-04-10 12:14:44 -07:00
Godfrey M e2679852ce added export button, half the logic for export method 2024-04-10 11:31:30 -07:00
Marcus Moore deaba46e1c
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-04-10 11:01:35 -07:00
snipe adacdc038d Apply company scoping for users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-10 12:34:32 +01:00
snipe e11287ec25 Redirect on checkin if the asset is already checked in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 15:00:55 +01:00
snipe a72d4e5dc1 Fixed ambiguous id clause in custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 14:23:58 +01:00
Godfrey M 08f9aae8ae adds note to log listener and checkout accept notif 2024-04-03 11:59:47 -07:00
Godfrey M ce1d677cdc adds note to acceptance 2024-04-03 11:36:03 -07:00
Godfrey M bb2c73348d only grabs custom Fields that are not encrpyted 2024-04-03 11:03:58 -07:00
Godfrey M 4327653d70 remove db cleaner for encrypted selections 2024-04-03 10:57:41 -07:00
Brady Wetherington 65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10 
Hopefully, last merge?
 2024-04-02 20:34:04 +01:00
snipe f42e5d5292 Reverting the store/update asset API responses for now 
This currently breaks the Jamf integration - need a better longer term plan.

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 21:58:49 +00:00
akemidx 721902c2d4 committed for later 2024-03-28 16:44:44 -04:00
snipe 1f2d30ebf4 Check that the array key exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 12:25:29 +00:00
akemidx e6b366020a lots of attempts and syntax, but no go 2024-03-27 19:05:59 -04:00
snipe 86677b5f13 Make last_checkin sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:25 +00:00
Robert Spadaro ccd00caa70 Wrap where logic in additional where statement to protect appended params 2024-03-27 15:36:00 -04:00
snipe 545a185614
Merge pull request #14262 from akemidx/bug/sc-24812 
Last Checkin Date added to Hardware View and Index
 2024-03-27 19:02:25 +00:00
snipe 8bc9688d71 Added ability to filter on category ID and model ID from user’s asset API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 16:04:00 +00:00
Godfrey M aa8af2220c trying to remove an encrypted field but not all fields 2024-03-26 16:10:08 -07:00
snipe ae403da8c1
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation 
Added validation around `pwd_secure_complexity`
 2024-03-26 20:05:04 +00:00
snipe 850f85ff59
Merge pull request #14369 from spencerrlongg/bug/sc-24343 
Add new validator for custom field checkboxes and fix asset model default updates
 2024-03-26 19:22:29 +00:00
snipe 3ced85080a Fixed #14495 - Allow user_id to be passed to limit to only specific admins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 14:45:20 +00:00