636da2ab5e
Wiring up custom fields for users - still some big UI challenges tho
2023-09-05 16:01:53 +01:00
4f182c0a50
Got a chunk of Custom Fields for Users worked out, still needs cleanup
2023-08-31 19:34:25 +01:00
a384d0173a
Merge branch 'snipeit_v7_laravel10' into has_custom_fields_trait_rebase
2023-08-30 18:33:17 +01:00
427f8b1522
Merge branch 'develop' into snipeit_v7_laravel10
...
Upgraded composer due to lockfile conflicts
2023-08-28 16:04:21 +01:00
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
e32c07be02
Clear commented log statements
2023-08-24 08:15:40 -07:00
5a0b0522b0
Explicitly declare $clean_meta variable
2023-08-24 08:15:07 -07:00
bee680683d
Add withTrashed to asset model query
2023-08-22 17:05:06 -07:00
79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error
...
Fixed Asset acceptance error when user company and asset company don't match
2023-08-22 15:49:56 +01:00
a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order
...
Fixed #13495 added setting for name order
2023-08-22 12:50:58 +01:00
aafb7668f5
Merge pull request #13453 from inietov/fixes/accessories_declined_issue
...
Fixed #13317 Accessories declined by user remain assigned
2023-08-22 12:42:55 +01:00
fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields
...
Bulk Editing Custom Fields
2023-08-22 12:40:18 +01:00
303b45c9e9
Merge pull request #13485 from Godmartinz/history_info_clean_up
...
Added better handling of information of asset history
2023-08-22 12:25:17 +01:00
b54aaefefb
adds some spacing
2023-08-21 13:43:06 -07:00
5076b45a0d
adds id to history info
2023-08-21 13:40:39 -07:00
f3460b5a4f
Switch to getFullNameAttribute() in user transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:10:48 +01:00
474c03e3fc
Added name order to settings save controller method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:10:03 +01:00
ffc7c4e99a
use number format to constrain large number displays
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 22:18:09 +01:00
1e82c2bfad
Changed example asset name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 22:17:54 +01:00
da2f22d504
Fixed #13487 - include supplier url in listing
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 15:31:15 +01:00
a62876d4bc
Adds readable asset history in the action log transformer
2023-08-17 16:14:01 -07:00
34f2221b02
Merge pull request #13471 from inietov/fixes/components_search
...
Fixed #13409 Search in component detail view not working
2023-08-16 21:59:40 +01:00
852e9ff311
Accessory checkin via API reported wrong target user
2023-08-16 13:03:37 +01:00
92df32dfaa
Move a couple assignation of variables inside an else to only execute once
2023-08-15 21:10:48 -06:00
993918f47c
Add query to search into the per-component view
2023-08-15 15:31:36 -06:00
8b52bad16f
Merge branch 'develop' into snipeit_v7_laravel10
2023-08-15 21:25:16 +01:00
01ab360ef3
Fixed accessory clone typo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:39:09 +01:00
64342838fd
Return the user to the labels page on save
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 18:48:12 +01:00
e41368daac
Merge pull request #12050 from cram42/develop
...
New Label Engine
2023-08-15 17:58:57 +01:00
c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies
...
Add email to companies
2023-08-15 13:26:20 +01:00
12e9d2adeb
Fixed #13450 - remove escaping on saveing new custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-14 22:21:41 +01:00
8da2a8a79c
Allows to save signature for declined items
2023-08-14 14:58:10 -06:00
8988a5dfc3
Update CompaniesTransformer.php
2023-08-13 17:20:15 +02:00
ed5b4ca0a2
Update CompaniesController.php
2023-08-13 17:18:25 +02:00
07bafa9508
Update CompaniesController.php
2023-08-13 17:15:20 +02:00
df8f6a8d2b
Correctly call the route for accessory index
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-11 09:40:49 +01:00
e0b464dcec
Merge branch 'develop' into feature/custom-report-scoping
2023-08-09 13:03:05 -07:00
a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465
...
Added messaging to category edit page to improve clarity around when users will be emailed
2023-08-09 10:36:19 +01:00
c32f099053
Remove unneeded call to Company::scopeCompanyables
2023-08-08 17:22:15 -07:00
6afbf1b152
Re-add the option for asset_eol_date as an import field
2023-08-08 17:45:33 +01:00
ae9cf1e5b6
Formatting
2023-08-02 18:24:32 -07:00
053d3fc9ed
Prevent asset to be checked out if full company support is enabled and companies not match
2023-08-02 19:23:28 -06:00
9ca163e8cf
Stop asset acceptances from shown to user if full company support is enabled and companies not match
2023-08-02 19:22:35 -06:00
3fd0853fd0
Ensure eula field enabled when not using default eula
2023-08-02 18:02:56 -07:00
896f038054
Set send email back to original value when eulas cleared
2023-08-02 17:03:56 -07:00
48979ce177
Disable send email when it should not be modified
2023-08-02 16:52:56 -07:00
e12935f7fa
Disable eula textarea when using global eula
2023-08-02 16:18:57 -07:00
6400034435
Improve variable name
2023-08-02 16:06:59 -07:00
269414e4f2
Automatically check the send email to user checkbox in certain conditions
2023-08-02 16:04:01 -07:00
dee6ebf8e0
Scaffold component test
2023-08-02 12:58:07 -07:00
Brady Wetherington