Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup custom field handling in ufGroup BAO #16984

Merged
merged 1 commit into from
Apr 6, 2020
Merged

Cleanup custom field handling in ufGroup BAO #16984

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 22 additions & 45 deletions CRM/Core/BAO/UFGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2337,8 +2337,8 @@ public static function setProfileDefaults(
elseif ($name == 'world_region') {
$defaults[$fldName] = $details['worldregion_id'];
}
elseif ($customFieldId = CRM_Core_BAO_CustomField::getKeyID($name)) {
$defaults[$fldName] = self::reformatProfileDefaults($field, $details[$name]);
elseif (CRM_Core_BAO_CustomField::getKeyID($name)) {
$defaults[$fldName] = self::formatCustomValue($field, $details[$name]);
}
else {
$defaults[$fldName] = $details[$name];
Expand Down Expand Up @@ -2417,19 +2417,13 @@ public static function setProfileDefaults(
$defaults[$fldName] = $value[$fieldName];
}
}
elseif (substr($fieldName, 0, 14) === 'address_custom' &&
CRM_Utils_Array::value(substr($fieldName, 8), $value)
) {
$defaults[$fldName] = self::reformatProfileDefaults($field, $value[substr($fieldName, 8)]);
elseif (strpos($fieldName, 'address_custom') === 0 && !empty($value[substr($fieldName, 8)])) {
$defaults[$fldName] = self::formatCustomValue($field, $value[substr($fieldName, 8)]);
}
}
}
else {
if (substr($fieldName, 0, 14) === 'address_custom' &&
CRM_Utils_Array::value(substr($fieldName, 8), $value)
) {
$defaults[$fldName] = self::reformatProfileDefaults($field, $value[substr($fieldName, 8)]);
}
elseif (strpos($fieldName, 'address_custom') === 0 && !empty($value[substr($fieldName, 8)])) {
$defaults[$fldName] = self::formatCustomValue($field, $value[substr($fieldName, 8)]);
}
}
}
Expand Down Expand Up @@ -3590,48 +3584,31 @@ public static function getFrontEndTitle(int $profileID) {
}

/**
* This function is used to format the profile default values.
* Format custom field value for use in prepopulating a quickform profile field.
*
* @param array $field
* Associated array of profile fields to render.
* Field metadata.
* @param string $value
* Value to render
* Raw value
*
* @return $defaults
* @return mixed
* String or array, depending on the html type
*/
public static function reformatProfileDefaults($field, $value) {
$defaults = [];

switch ($field['html_type']) {
case 'Multi-Select State/Province':
case 'Multi-Select Country':
case 'Multi-Select':
$v = explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($value));
foreach ($v as $item) {
if ($item) {
$defaults[$item] = $item;
}
}
break;
private static function formatCustomValue($field, $value) {
if (CRM_Core_BAO_CustomField::isSerialized($field)) {
$value = CRM_Utils_Array::explodePadded($value);

case 'CheckBox':
$v = explode(CRM_Core_DAO::VALUE_SEPARATOR, $value);
foreach ($v as $item) {
if ($item) {
$defaults[$item] = 1;
// seems like we need this for QF style checkboxes in profile where its multiindexed
// CRM-2969
$defaults["[{$item}]"] = 1;
}
if ($field['html_type'] === 'CheckBox') {
$checkboxes = [];
foreach (array_filter($value) as $item) {
$checkboxes[$item] = 1;
// CRM-2969 seems like we need this for QF style checkboxes in profile where its multiindexed
$checkboxes["[{$item}]"] = 1;
}
break;

default:
$defaults = $value;
break;
return $checkboxes;
}
}
return $defaults;
return $value;
}

}