Brady Wetherington
bf6c48d695
Clean up the fieldset experience for custom fields for users
2023-09-21 14:56:29 +01:00
Brady Wetherington
8428b2a04a
Merge branch 'has_custom_fields_trait_rebase' into custom_fields_on_user
2023-09-18 13:45:35 +01:00
Brady Wetherington
a3a786f2af
Merge branch 'develop' into has_custom_fields_trait_rebase
2023-09-14 20:27:06 +01:00
Ivan Nieto Vivanco
9cbd2d032c
Add a boolean variable and condition to handle the call to checkedOutToUser() method
2023-09-11 17:40:59 -06:00
Godfrey Martinez
a26b96185b
Merge branch 'develop' into asset-model-notifs
2023-09-11 09:37:22 -07:00
Godfrey M
0eb50ceb3d
removes commented code
2023-09-11 09:36:38 -07:00
snipe
06836663c8
Merge pull request #13575 from marcusmoore/fixes/improve-api-messaging
...
Added validation around department_id in API patch request
2023-09-07 21:36:20 +01:00
Marcus Moore
4caa501996
Relax property type check
2023-09-07 13:28:32 -07:00
snipe
02c187b0a0
Merge pull request #13566 from snipe/features/13562_add_inline_file_link
...
Fixed #13562 - Added inline file link
2023-09-07 20:50:13 +01:00
snipe
7f892bf5ef
Merge pull request #13574 from inietov/fixes/unaccepted_assets_report_incorrect
...
Fixed Unaccepted Assets report has incorrect people [freshdesk-37808]
2023-09-07 20:49:40 +01:00
Ivan Nieto Vivanco
abd2ed3b81
Filter unaccepted assets that are not assigned to users
2023-09-07 13:39:16 -06:00
Marcus Moore
899c2eb19b
Implement test case
2023-09-07 12:34:50 -07:00
snipe
894c34ff4f
Update to only use relative paths
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-07 20:22:14 +01:00
Ivan Nieto Vivanco
1509c512a5
Add guard clauses around some License and LicenseSeat models functions
2023-09-06 11:54:11 -06:00
johnson-yi
5897f4d6d9
Add rtd_location_id to tracked changes on checkin actionlog
2023-09-06 00:36:48 +00:00
Brady Wetherington
0086adab86
Refactor out common code for 'custom fields view' partial
2023-09-05 20:45:43 +01:00
snipe
a67888f3d3
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag
...
Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541 )
2023-09-05 20:26:21 +01:00
Ivan Nieto Vivanco
91b1cc7121
Move the early return to the controller instead of the Label model
2023-09-05 13:23:51 -06:00
Brady Wetherington
0f91e898fd
Remove some code duplication
2023-09-05 19:18:04 +01:00
snipe
d6dd332b09
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog
...
Added/Fixed: track changes on asset checkin/out
2023-09-05 19:08:49 +01:00
snipe
f53db8ba75
Fixed #13562 - allow inline view for uploaded files
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 18:28:01 +01:00
snipe
e486fe2794
Removed soft-delete query
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 16:10:20 +01:00
snipe
f85df6bb8c
Use same method of accessing companies as others
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 16:02:28 +01:00
Brady Wetherington
636da2ab5e
Wiring up custom fields for users - still some big UI challenges tho
2023-09-05 16:01:53 +01:00
snipe
2acf2b880e
Account for hard-deleted models, suppliers
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 15:58:21 +01:00
snipe
b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost
...
Added users total cost of assets to user profile
2023-09-05 13:52:34 +01:00
snipe
a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report
...
Added last check in column and filter to custom asset report
2023-09-05 13:22:15 +01:00
Johnson Yi
09f7b3debe
Track changes on asset checkin/out
2023-09-01 13:12:07 +10:00
Brady Wetherington
4f182c0a50
Got a chunk of Custom Fields for Users worked out, still needs cleanup
2023-08-31 19:34:25 +01:00
snipe
f08cef8664
Merge pull request #13556 from snipe/feature/sc-23684
...
Added model name and number to dynamic url
2023-08-31 18:23:33 +01:00
snipe
e192cbbbe1
Merge pull request #13550 from marcusmoore/remove-dusk
...
Removed Dusk
2023-08-31 18:06:04 +01:00
snipe
83b178f5b2
Added model name and number to dynamic url
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-31 18:03:32 +01:00
snipe
c51574099f
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_changes
...
Added eager loading for `changedinfo` and removed encrypted values from Asset history
2023-08-31 13:04:39 +01:00
Marcus Moore
5828d29952
Remove Dusk
2023-08-30 16:43:18 -07:00
snipe
663faffcc1
Un-cast byod, validate as boolean
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-30 19:13:55 +01:00
Brady Wetherington
a384d0173a
Merge branch 'snipeit_v7_laravel10' into has_custom_fields_trait_rebase
2023-08-30 18:33:17 +01:00
Ivan Nieto Vivanco
085a993340
Early return if no asset is found
2023-08-30 11:05:58 -06:00
snipe
2a93c38830
Don’t cast as boolean, validate as boolean
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-30 16:40:28 +01:00
snipe
b109ee281a
Merge pull request #13544 from marcusmoore/bug/sc-23675
...
Fixed user search not adhering to company scoping
2023-08-30 08:54:41 +01:00
Marcus Moore
806ab2cb9d
Ensure users are scoped by company in index method
2023-08-29 16:17:29 -07:00
Godfrey Martinez
d86c63cf23
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable
2023-08-28 19:38:16 -07:00
Godfrey M
74f45a4473
reworks company queries for asset history
2023-08-28 19:35:46 -07:00
Ivan Nieto Vivanco
4e4ba38038
Pass the model_id variable in the controller and get it only if we are cloning the asset model
2023-08-28 16:23:26 -06:00
Godfrey Martinez
92e88a0ae2
Merge branch 'develop' into ignore_encrypt_and_other_changes
2023-08-28 10:14:41 -07:00
Brady Wetherington
427f8b1522
Merge branch 'develop' into snipeit_v7_laravel10
...
Upgraded composer due to lockfile conflicts
2023-08-28 16:04:21 +01:00
Brady Wetherington
8902145288
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
2023-08-28 13:07:33 +01:00
Godfrey M
e56628499c
fixed lost changes
2023-08-24 11:45:23 -07:00
Godfrey M
2b7a899ef8
removed unnecessary code
2023-08-24 11:43:44 -07:00
Godfrey M
18cb514a53
revert unwanted changes
2023-08-24 10:40:44 -07:00
Godfrey M
a3b6e0fbe6
adds some spacing
2023-08-24 10:36:09 -07:00