$cacheKey .= $inline ? '_1_' : '_0_';
$cacheKey .= $onlyParent ? '_1_' : '_0_';
$cacheKey .= $onlySubType ? '_1_' : '_0_';
- $cacheKey .= $checkPermission ? '_1_' : '_0_';
+ $cacheKey .= $checkPermission ? '_1_' . CRM_Core_Session::getLoggedInContactID() . '_' : '_0_0_';
$cacheKey .= '_' . CRM_Core_Config::domainID() . '_';
$cgTable = CRM_Core_DAO_CustomGroup::getTableName();
$fields = Civi::Cache('fields')->get("custom importableFields $cacheKey");
if ($fields === NULL) {
- $cfTable = self::getTableName();
$extends = '';
if (is_array($customDataType)) {
// Temporary hack - in 5.27 a new field is added to civicrm_custom_field. There is a high
// risk this function is called before the upgrade page can be reached and if
// so it will potentially result in fatal error.
- $serializeField = CRM_Core_BAO_Domain::isDBVersionAtLeast('5.27.alpha1') ? "$cfTable.serialize," : '';
+ $serializeField = CRM_Core_BAO_Domain::isDBVersionAtLeast('5.27.alpha1') ? "custom_field.serialize," : '';
- $query = "SELECT $cfTable.id, $cfTable.label,
+ $query = "SELECT custom_field.id, custom_field.label,
$cgTable.title,
- $cfTable.data_type,
- $cfTable.html_type,
- $cfTable.default_value,
- $cfTable.options_per_line, $cfTable.text_length,
- $cfTable.custom_group_id,
- $cfTable.is_required,
- $cfTable.column_name,
- $cgTable.extends, $cfTable.is_search_range,
+ custom_field.data_type,
+ custom_field.html_type,
+ custom_field.default_value,
+ custom_field.options_per_line, custom_field.text_length,
+ custom_field.custom_group_id,
+ custom_field.is_required,
+ custom_field.column_name,
+ $cgTable.extends, custom_field.is_search_range,
$cgTable.extends_entity_column_value,
$cgTable.extends_entity_column_id,
- $cfTable.is_view,
- $cfTable.option_group_id,
- $cfTable.date_format,
- $cfTable.time_format,
+ custom_field.is_view,
+ custom_field.option_group_id,
+ custom_field.date_format,
+ custom_field.time_format,
$cgTable.is_multiple,
$serializeField
$cgTable.table_name,
og.name as option_group_name
- FROM $cfTable
+ FROM civicrm_custom_field custom_field
INNER JOIN $cgTable
- ON $cfTable.custom_group_id = $cgTable.id
+ ON custom_field.custom_group_id = $cgTable.id
LEFT JOIN civicrm_option_group og
- ON $cfTable.option_group_id = og.id
+ ON custom_field.option_group_id = og.id
WHERE ( 1 ) ";
if (!$showAll) {
- $query .= " AND $cfTable.is_active = 1 AND $cgTable.is_active = 1 ";
+ $query .= " AND custom_field.is_active = 1 AND $cgTable.is_active = 1 ";
}
if ($inline) {
$query .= " $extends AND $permissionClause
ORDER BY $cgTable.weight, $cgTable.title,
- $cfTable.weight, $cfTable.label";
+ custom_field.weight, custom_field.label";
$dao = CRM_Core_DAO::executeQuery($query);
$element = NULL;
$customFieldAttributes = [];
+ if (!isset($label)) {
+ $label = $field->label;
+ }
+
+ // DAO stores attributes as a string, but it's hard to manipulate and
+ // CRM_Core_Form::add() wants them as an array.
+ $fieldAttributes = self::attributesFromString($field->attributes);
+
// Custom field HTML should indicate group+field name
$groupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $field->custom_group_id);
- $dataCrmCustomVal = $groupName . ':' . $field->name;
- $dataCrmCustomAttr = 'data-crm-custom="' . $dataCrmCustomVal . '"';
- $field->attributes .= $dataCrmCustomAttr;
+ $fieldAttributes['data-crm-custom'] = $groupName . ':' . $field->name;
// Fixed for Issue CRM-2183
if ($widget == 'TextArea' && $search) {
$widget = 'Text';
}
- $placeholder = $search ? ts('- any -') : ($useRequired ? ts('- select -') : ts('- none -'));
+ $placeholder = $search ? ts('- any %1 -', [1 => $label]) : ts('- select %1 -', [1 => $label]);
- $isSelect = (in_array($widget, [
+ if (in_array($widget, [
'Select',
'CheckBox',
'Radio',
- ]));
-
- if ($isSelect) {
+ ])) {
$options = $field->getOptions($search ? 'search' : 'create');
// Consolidate widget types to simplify the below switch statement
- if ($search || (strpos($widget, 'Select') !== FALSE)) {
+ if ($search) {
$widget = 'Select';
}
- $customFieldAttributes['data-crm-custom'] = $dataCrmCustomVal;
- $selectAttributes = ['class' => 'crm-select2'];
-
// Search field is always multi-select
if ($search || (self::isSerialized($field) && $widget === 'Select')) {
- $selectAttributes['class'] .= ' huge';
- $selectAttributes['multiple'] = 'multiple';
- $selectAttributes['placeholder'] = $placeholder;
+ $fieldAttributes['class'] = ltrim(($fieldAttributes['class'] ?? '') . ' huge');
+ $fieldAttributes['multiple'] = 'multiple';
+ $fieldAttributes['placeholder'] = $placeholder;
}
// Add data for popup link. Normally this is handled by CRM_Core_Form->addSelect
$canEditOptions = CRM_Core_Permission::check('administer CiviCRM');
- if ($field->option_group_id && !$search && $isSelect && $canEditOptions) {
+ if ($field->option_group_id && !$search && $canEditOptions) {
$customFieldAttributes += [
'data-api-entity' => $field->getEntity(),
'data-api-field' => 'custom_' . $field->id,
'data-option-edit-path' => 'civicrm/admin/options/' . CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup', $field->option_group_id),
];
- $selectAttributes += $customFieldAttributes;
+ $fieldAttributes = array_merge($fieldAttributes, $customFieldAttributes);
}
}
$rangeDataTypes = ['Int', 'Float', 'Money'];
- if (!isset($label)) {
- $label = $field->label;
- }
-
// at some point in time we might want to split the below into small functions
switch ($widget) {
case 'Text':
case 'Link':
if ($field->is_search_range && $search && in_array($field->data_type, $rangeDataTypes)) {
- $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $field->attributes);
- $qf->add('text', $elementName . '_to', ts('To'), $field->attributes);
+ $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $fieldAttributes);
+ $qf->add('text', $elementName . '_to', ts('To'), $fieldAttributes);
}
else {
if ($field->text_length) {
- $field->attributes .= ' maxlength=' . $field->text_length;
+ $fieldAttributes['maxlength'] = $field->text_length;
if ($field->text_length < 20) {
- $field->attributes .= ' size=' . $field->text_length;
+ $fieldAttributes['size'] = $field->text_length;
}
}
$element = $qf->add('text', $elementName, $label,
- $field->attributes,
+ $fieldAttributes,
$useRequired && !$search
);
}
break;
case 'TextArea':
- $attributes = $dataCrmCustomAttr;
- if ($field->note_rows) {
- $attributes .= 'rows=' . $field->note_rows;
- }
- else {
- $attributes .= 'rows=4';
- }
- if ($field->note_columns) {
- $attributes .= ' cols=' . $field->note_columns;
- }
- else {
- $attributes .= ' cols=60';
- }
+ $fieldAttributes['rows'] = $field->note_rows ?? 4;
+ $fieldAttributes['cols'] = $field->note_columns ?? 60;
+
if ($field->text_length) {
- $attributes .= ' maxlength=' . $field->text_length;
+ $fieldAttributes['maxlength'] = $field->text_length;
}
$element = $qf->add('textarea',
$elementName,
$label,
- $attributes,
+ $fieldAttributes,
$useRequired && !$search
);
break;
case 'Select Date':
- $attr = ['data-crm-custom' => $dataCrmCustomVal];
//CRM-18379: Fix for date range of 'Select Date' custom field when include in profile.
$minYear = isset($field->start_date_years) ? (date('Y') - $field->start_date_years) : NULL;
$maxYear = isset($field->end_date_years) ? (date('Y') + $field->end_date_years) : NULL;
'time' => $field->time_format ? $field->time_format * 12 : FALSE,
];
if ($field->is_search_range && $search) {
- $qf->add('datepicker', $elementName . '_from', $label, $attr + array('placeholder' => ts('From')), FALSE, $params);
- $qf->add('datepicker', $elementName . '_to', NULL, $attr + array('placeholder' => ts('To')), FALSE, $params);
+ $qf->add('datepicker', $elementName . '_from', $label, $fieldAttributes + array('placeholder' => ts('From')), FALSE, $params);
+ $qf->add('datepicker', $elementName . '_to', NULL, $fieldAttributes + array('placeholder' => ts('To')), FALSE, $params);
}
else {
- $element = $qf->add('datepicker', $elementName, $label, $attr, $useRequired && !$search, $params);
+ $element = $qf->add('datepicker', $elementName, $label, $fieldAttributes, $useRequired && !$search, $params);
}
break;
case 'Radio':
if ($field->is_search_range && $search && in_array($field->data_type, $rangeDataTypes)) {
- $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $field->attributes);
- $qf->add('text', $elementName . '_to', ts('To'), $field->attributes);
+ $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $fieldAttributes);
+ $qf->add('text', $elementName . '_to', ts('To'), $fieldAttributes);
}
else {
- parse_str($field->attributes, $radioAttributes);
- $radioAttributes = array_merge($radioAttributes, $customFieldAttributes);
+ $fieldAttributes = array_merge($fieldAttributes, $customFieldAttributes);
if ($search || empty($useRequired)) {
- $radioAttributes['allowClear'] = TRUE;
+ $fieldAttributes['allowClear'] = TRUE;
}
- $qf->addRadio($elementName, $label, $options, $radioAttributes, NULL, $useRequired);
+ $qf->addRadio($elementName, $label, $options, $fieldAttributes, NULL, $useRequired);
}
break;
// For all select elements
case 'Select':
+ $fieldAttributes['class'] = ltrim(($fieldAttributes['class'] ?? '') . ' crm-select2');
if ($field->is_search_range && $search && in_array($field->data_type, $rangeDataTypes)) {
- $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $field->attributes);
- $qf->add('text', $elementName . '_to', ts('To'), $field->attributes);
+ $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $fieldAttributes);
+ $qf->add('text', $elementName . '_to', ts('To'), $fieldAttributes);
}
else {
- if (empty($selectAttributes['multiple'])) {
+ if (empty($fieldAttributes['multiple'])) {
$options = ['' => $placeholder] + $options;
}
- $element = $qf->add('select', $elementName, $label, $options, $useRequired && !$search, $selectAttributes);
+ $element = $qf->add('select', $elementName, $label, $options, $useRequired && !$search, $fieldAttributes);
// Add and/or option for fields that store multiple values
if ($search && self::isSerialized($field)) {
case 'CheckBox':
$check = [];
foreach ($options as $v => $l) {
+ // TODO: I'm not sure if this is supposed to exclude whatever might be
+ // in $field->attributes (available in array format as
+ // $fieldAttributes). Leaving as-is for now.
$check[] = &$qf->addElement('advcheckbox', $v, NULL, $l, $customFieldAttributes);
}
strtolower($field->html_type),
$elementName,
$label,
- $field->attributes,
+ $fieldAttributes,
$useRequired && !$search
);
$qf->addUploadElement($elementName);
break;
case 'RichTextEditor':
- $attributes = [
- 'rows' => $field->note_rows,
- 'cols' => $field->note_columns,
- 'data-crm-custom' => $dataCrmCustomVal,
- ];
+ $fieldAttributes['rows'] = $field->note_rows;
+ $fieldAttributes['cols'] = $field->note_columns;
if ($field->text_length) {
- $attributes['maxlength'] = $field->text_length;
+ $fieldAttributes['maxlength'] = $field->text_length;
}
- $element = $qf->add('wysiwyg', $elementName, $label, $attributes, $useRequired && !$search);
+ $element = $qf->add('wysiwyg', $elementName, $label, $fieldAttributes, $useRequired && !$search);
break;
case 'Autocomplete-Select':
static $customUrls = [];
- // Fixme: why is this a string in the first place??
- $attributes = [];
- if ($field->attributes) {
- foreach (explode(' ', $field->attributes) as $at) {
- if (strpos($at, '=')) {
- list($k, $v) = explode('=', $at);
- $attributes[$k] = trim($v, ' "');
- }
- }
- }
if ($field->data_type == 'ContactReference') {
// break if contact does not have permission to access ContactReference
if (!CRM_Core_Permission::check('access contact reference fields')) {
break;
}
- $attributes['class'] = (isset($attributes['class']) ? $attributes['class'] . ' ' : '') . 'crm-form-contact-reference huge';
- $attributes['data-api-entity'] = 'Contact';
- $element = $qf->add('text', $elementName, $label, $attributes, $useRequired && !$search);
+ $fieldAttributes['class'] = ltrim(($fieldAttributes['class'] ?? '') . ' crm-form-contact-reference huge');
+ $fieldAttributes['data-api-entity'] = 'Contact';
+ $element = $qf->add('text', $elementName, $label, $fieldAttributes, $useRequired && !$search);
$urlParams = "context=customfield&id={$field->id}";
$idOfelement = $elementName;
}
else {
// FIXME: This won't work with customFieldOptions hook
- $attributes += [
+ $fieldAttributes += [
'entity' => 'OptionValue',
'placeholder' => $placeholder,
'multiple' => $search ? TRUE : !empty($field->serialize),
'params' => ['option_group_id' => $field->option_group_id, 'is_active' => 1],
],
];
- $element = $qf->addEntityRef($elementName, $label, $attributes, $useRequired && !$search);
+ $element = $qf->addEntityRef($elementName, $label, $fieldAttributes, $useRequired && !$search);
}
$qf->assign('customUrls', $customUrls);
return $element;
}
+ /**
+ * Take a string of HTML element attributes and turn it into an associative
+ * array.
+ *
+ * @param string $attrString
+ * The attributes as a string, e.g. `rows=3 cols=40`.
+ *
+ * @return array
+ * The attributes as an array, e.g. `['rows' => 3, 'cols' => 40]`.
+ */
+ public static function attributesFromString($attrString) {
+ $attributes = [];
+ foreach (explode(' ', $attrString) as $at) {
+ if (strpos($at, '=')) {
+ list($k, $v) = explode('=', $at);
+ $attributes[$k] = trim($v, ' "');
+ }
+ }
+ return $attributes;
+ }
+
/**
* Delete the Custom Field.
*
*/
public static function defaultCustomTableSchema($params) {
// add the id and extends_id
+ $collation = CRM_Core_BAO_SchemaHandler::getInUseCollation();
+ $characterSet = 'utf8';
+ if (stripos($collation, 'utf8mb4') !== FALSE) {
+ $characterSet = 'utf8mb4';
+ }
$table = [
'name' => $params['name'],
'is_multiple' => $params['is_multiple'],
- 'attributes' => "ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci",
+ 'attributes' => "ENGINE=InnoDB DEFAULT CHARACTER SET {$characterSet} COLLATE {$collation}",
'fields' => [
[
'name' => 'id',
projects / civicrm-core.git / blobdiff