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

dev/core#149 - Fatal Error on customvalue get api #12225

Merged
merged 2 commits into from
Jun 1, 2018
Merged

dev/core#149 - Fatal Error on customvalue get api #12225

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc3c9f5
dev/core#149 - Fatal Error on customvalue get api
May 29, 2018
0ec36ef
additional unit test fixes
Jun 1, 2018
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
31 changes: 18 additions & 13 deletions api/v3/CustomValue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,22 +145,27 @@ function civicrm_api3_custom_value_get($params) {
unset($params['entity_id'], $params['entity_table']);
foreach ($params as $id => $param) {
if ($param && substr($id, 0, 6) == 'return') {
$id = substr($id, 7);
list($c, $i) = CRM_Utils_System::explode('_', $id, 2);
if ($c == 'custom' && is_numeric($i)) {
$names['custom_' . $i] = 'custom_' . $i;
$id = $i;
$returnVal = $param;
if (!empty(substr($id, 7))) {
$returnVal = substr($id, 7);
}
else {
// Lookup names if ID was not supplied
list($group, $field) = CRM_Utils_System::explode(':', $id, 2);
$id = CRM_Core_BAO_CustomField::getCustomFieldID($field, $group);
if (!$id) {
continue;
foreach ((array) $returnVal as $value) {
list($c, $i) = CRM_Utils_System::explode('_', $value, 2);
if ($c == 'custom' && is_numeric($i)) {
$names['custom_' . $i] = 'custom_' . $i;
$fldId = $i;
}
else {
// Lookup names if ID was not supplied
list($group, $field) = CRM_Utils_System::explode(':', $value, 2);
$fldId = CRM_Core_BAO_CustomField::getCustomFieldID($field, $group);
if (!$fldId) {
continue;
}
$names['custom_' . $fldId] = 'custom_' . $i;
}
$names['custom_' . $id] = 'custom_' . $i;
$getParams['custom_' . $fldId] = 1;
}
$getParams['custom_' . $id] = 1;
}
}

Expand Down
24 changes: 24 additions & 0 deletions tests/phpunit/api/v3/CustomValueTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,30 @@ public function _testCustomValue($customField, $sqlOps, $type) {
$params = array('entity_id' => $contactId, 'custom_' . $customId => $selectedValue);
$this->callAPISuccess('CustomValue', 'create', $params);

//Test for different return value syntax.
$returnValues = [
['return' => "custom_{$customId}"],
['return' => ["custom_{$customId}"]],
["return.custom_{$customId}" => 1],
Copy link
Member

@colemanw colemanw May 31, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please also add 2 more scenarios to this test?

  1. Multiple fields to return (array format)
  2. Multiple fields to return ('return.custom_x' => 1 format)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated unit test to cover above scenarios as well 👍

];
foreach ($returnValues as $val) {
$params = array_merge($val, [
'sequential' => 1,
'entity_id' => $contactId,
]);
$customValue = $this->callAPISuccess('CustomValue', 'get', $params);
if (is_array($selectedValue)) {
$expected = array_values($selectedValue);
$this->checkArrayEquals($expected, $customValue['values'][0]['latest']);
}
elseif ($type == 'date') {
$this->assertEquals($selectedValue, date('Ymd', strtotime(str_replace('.', '/', $customValue['values'][0]['latest']))));
}
else {
$this->assertEquals($selectedValue, $customValue['values'][0]['latest']);
}
}

foreach ($sqlOps as $op) {
$qillOp = CRM_Utils_Array::value($op, CRM_Core_SelectValues::getSearchBuilderOperators(), $op);
switch ($op) {
Expand Down