Commit graph

325 commits

Author SHA1 Message Date
Brady Wetherington d2b7828569 This is a squashed branch of all of the various commits that make up the new HasCustomFields trait.
This should allow us to add custom fields to just about anything we want to within Snipe-IT.

Below are the commits that have been squashed together:

Initial decoupling of custom field behavior from Assets for re-use

Add new DB columns to Custom Fields and fieldsets for 'type'

WIP: trying to figure out UI for custom fields for things other than Assets, find problematic places

Real progress towards getting to where this stuff might actually work...

Fix the table-name determining code for Custom Fields

Getting it closer to where Assets at least work

Rename the trait to it's new, even better name

Solid progress on the new Trait!

WIP: HasCustomFields, still working some stuff out

Got some basics working; creating custom fields and stuff

HasCustomFields now validates and saves

Starting to yank the other boilerplate code as things start to work (!)

Got the start of defaultValuesForCustomField() working

More progress (squash me!)

Add migrations for default_values_for_custom_fields table

WIP: more towards hasCustomFields trait

Progress cleaning up the PR, fixing FIXME's

New, passing HasCustomFieldsTrait test!

Fix date formatter helper for custom fields

Fixed more FIXME's
2024-06-06 13:35:38 +01: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
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
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 3c4098038d Fail early if no tag
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 16:33:47 +01:00
snipe 4224bc0c43 Removed extra settings param
Signed-off-by: snipe <snipe@snipe.net>
2024-05-02 12:36:57 +01:00
snipe 103809b65f Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 21:01:43 +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
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +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
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
snipe 86677b5f13 Make last_checkin sortable
Signed-off-by: snipe <snipe@snipe.net>
2024-03-27 20:37:25 +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
spencerrlongg 7e4a0eedf0 rm dumb note 2024-03-25 10:46:26 -05:00
snipe 828b84084d Added validation for last_audit_date and next_audit_date
Signed-off-by: snipe <snipe@snipe.net>
2024-03-21 18:29:38 +00:00
snipe cce8cb4f5e Move requestable scope below sorting, etc
Signed-off-by: snipe <snipe@snipe.net>
2024-03-14 13:24:22 +00:00
spencerrlongg ad0f873ece rm validation stuff 2024-03-05 11:58:00 -06:00
snipe 7c3d8b896b Updated asset transformers/presenters to display requestable status
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 14:59:55 +00:00
snipe a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808
Added tests around asset check in and added missing actions to the api controller action
2024-02-28 13:34:12 +00:00
snipe a52181c995
Merge pull request #14283 from akemidx/bug/sc-24788
FIXED: Checked in Assets Did Not Show in Custom Report when Selecting a Valid Checked Out Date
2024-02-28 11:47:46 +00:00
Marcus Moore 5084e5d3ef
Improve variable type 2024-02-27 12:23:26 -08:00
Marcus Moore a5516e3511
Improve trait name 2024-02-27 12:06:29 -08:00
Marcus Moore 0e460baf82
Improve readability 2024-02-27 12:03:36 -08:00
Marcus Moore 4caadcfa19
Clear pending checkout acceptances when checking in asset via api 2024-02-22 13:33:16 -08:00
Marcus Moore dba837b1d2
Move location migration logic to trait 2024-02-22 13:21:52 -08:00
Marcus Moore 714fc63050
Have legacy locations updated upon api asset checkin 2024-02-22 13:14:30 -08:00
Marcus Moore 2df026bcb5
Allow updating asset default location when checking in asset via api 2024-02-22 12:40:14 -08:00
spencerrlongg 14358651e4 pushing to test other branches 2024-02-22 13:28:23 -06:00
spencerrlongg 20dbacd22f store good, update needs work 2024-02-21 21:33:34 -06:00
Marcus Moore aa2632fe46
Merge branch 'develop' into chore/sc-24808 2024-02-21 12:33:06 -08:00
spencerrlongg 26728a85ad this seems to work for patches 2024-02-20 13:18:40 -06:00
spencerrlongg c6d85a1b0b allows arrays on checkbox values 2024-02-20 12:23:24 -06:00
spencerrlongg 115e0fc119 implode submitted arrays to save 2024-02-14 13:15:23 -06:00
Marcus Moore d7aed2edc9
Remove unneeded code 2024-02-14 11:10:45 -08:00
Marcus Moore 7bfd02054b
Remove duplicate authorization check 2024-02-14 10:48:41 -08:00
akemidx 4a57cfaf3e commenting out the nulling of last checkout date on checkin page and API 2024-02-13 16:21:18 -05: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 742e183b02
Add guard against adding null values to query
Since $request->filled(null) returns true
2024-01-04 14:04:00 -08:00
Spencer Long 8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe f9139e0f10 Changed to use instanceof
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 13:25:32 +00:00