Commit graph

2829 commits

Author SHA1 Message Date
spencerrlongg
d9c61fdb02 validation msg 2024-02-14 11:52:25 -06:00
snipe
8a4c90ade8 Check that the asset is not deleted
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 10:14:25 +00:00
snipe
35a70988cb Added sorting by status label
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:58:39 +00:00
snipe
e5ee9760c0 I don’t think we use these anyore because of the modifiers on date
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:47:33 +00:00
snipe
7868a8c174 Added serial for API controller
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:47:13 +00:00
spencerrlongg
25241542d2 progress, going to sleep 2024-02-14 02:12:31 -06:00
akemidx
c5e8d1c276 custom report tinker 2024-02-13 17:09:51 -05:00
akemidx
4093327b7f adding in Last Checkin Date to Hardware view and index 2024-02-13 16:52:12 -05:00
akemidx
4a57cfaf3e commenting out the nulling of last checkout date on checkin page and API 2024-02-13 16:21:18 -05:00
snipe
a76a69d085 Fixed incorrect string for location not existing
Signed-off-by: snipe <snipe@snipe.net>
2024-02-13 20:23:32 +00:00
spencerrlongg
d55358652b cleanup for pr 2024-02-13 13:45:56 -06:00
snipe
111daffc17
Merge pull request #14188 from spencerrlongg/bug/14146
Fixes Default Location Being Set During Asset Creation and Checkout
2024-02-10 11:47:46 +00:00
snipe
3868e711f4 Return null if asset was hard-deleted/purged
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 21:08:07 +00:00
snipe
479abd5231 Do not try to return a serial if the item doesn’t exist
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 20:53:33 +00:00
snipe
55b3050ca8 Re-applied previous withTrashed PR
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 20:37:18 +00:00
snipe
84f8eee869
Revert "Fixed barcodes crashing if asset was deleted" 2024-02-09 20:35:45 +00:00
snipe
fa47707974 Use withTrashed() to get the barcode on deleted assets
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 20:26:49 +00:00
Brady Wetherington
9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00
spencerrlongg
bcfa913450 condition makes this work, needs more testing 2024-02-07 20:03:37 -06:00
spencerrlongg
43d8474caa a note to remember this tomorrow 2024-02-06 17:45:46 -06:00
snipe
bf674a0f4d Removed backticks
Signed-off-by: snipe <snipe@snipe.net>
2024-02-06 15:58:36 +00:00
snipe
b170755c3d Switch to bulk updating to handle audit interval updates
Signed-off-by: snipe <snipe@snipe.net>
2024-02-06 15:52:46 +00:00
snipe
a43183ff96 Increased chunk
Signed-off-by: snipe <snipe@snipe.net>
2024-02-06 09:09:27 +00:00
snipe
b49935701b Chunk data to reduce memory on large datasets when updating next_audit_date
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 20:48:24 +00:00
snipe
7b4020c5e9 Updated string paths for URL
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 19:09:16 +00:00
snipe
32c360f032 Re-added UI for load_remote
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 18:23:52 +00:00
snipe
1a480435de
Merge pull request #14190 from marcusmoore/bug/sc-24685
Fixed consumable checkout via API not sending notification
2024-02-05 17:16:57 +00:00
snipe
5882d71f9b Fix company asset counts for dashboard widget
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 15:55:53 +00:00
Ivan Nieto Vivanco
5e4a3379a9 Adds Components and Licenses logs to Assets history view 2024-02-01 01:35:25 -06:00
Ivan Nieto Vivanco
51ae485f20 When asset is checked-in the assigned licenses also are taken from the user 2024-01-30 19:44:38 -06:00
Marcus Moore
2e0e39ccc8
Ensure notification is sent when consumable is checked out via api 2024-01-30 13:19:20 -08:00
Marcus Moore
13c37e708f
Implement tests around consumable checkout 2024-01-30 12:43:20 -08:00
spencerrlongg
d0a82adc3f changed condition 2024-01-29 20:44:26 -06:00
Marcus Moore
42ec2548c9
Fire event when accessory checked out via API
Brings behavior in line with GUI controller
2024-01-29 17:03:19 -08:00
Marcus Moore
7d45cfff2c
Ensure accessory available when checking out via api 2024-01-29 16:49:09 -08:00
Brady Wetherington
8a2f3405d5 Merge branch 'develop' into snipeit_v7_laravel10
A lot of changes here, but hopefully this works?
2024-01-29 22:12:58 +00:00
spencerrlongg
4cb804cf03 get rid of e() on store and update 2024-01-26 11:56:02 -06:00
spencerrlongg
2b0dd8851c probably needs more testing... but should work 2024-01-26 11:47:09 -06:00
snipe
85a158eaef
Merge pull request #14170 from uberbrady/saml_nonce_storage
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute [FD-37019]
2024-01-25 20:14:40 +00:00
Brady Wetherington
81b8243e1d Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute 2024-01-25 19:53:24 +00:00
Marcus Moore
f5dafc477a
Avoid unnecessary model hydration on asset model show page 2024-01-24 16:14:51 -08:00
snipe
105d4899f5 Removed debug line
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 20:33:13 +00:00
snipe
ba680126bc Properly sort the results based on non-asset fields
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 19:09:06 +00:00
snipe
661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations
Adds translations for Label example
2024-01-24 13:36:40 +00:00
Marcus Moore
8aa5cf530b
Improve radio button values in custom report form 2024-01-16 12:33:16 -08:00
Godfrey M
74dc17b4b9 adds translations for Label example 2024-01-16 10:47:45 -08:00
Brady Wetherington
4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
Brady Wetherington
f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
snipe
f8a21bdb2d Moved limit and offset to after additional qualifiers
Signed-off-by: snipe <snipe@snipe.net>
2024-01-05 11:59:31 +00:00
Marcus Moore
742e183b02
Add guard against adding null values to query
Since $request->filled(null) returns true
2024-01-04 14:04:00 -08:00