Skip to content
Snippets Groups Projects
Commit 352cf0db authored by jaapjansma's avatar jaapjansma
Browse files

Improvement of the layout of the relationship output handler.

parent 3879a792
No related branches found
No related tags found
No related merge requests found
# Version 1.39 (not yet released)
* Improvement of the layout of the relationship output handler.
# Version 1.38
* Fixed #96: use INNER JOIN on custom fields when a filter is set.
......
......@@ -137,8 +137,8 @@ class RelationshipsFieldOutputHandler extends AbstractFieldOutputHandler {
INNER JOIN civicrm_relationship_type t on r.relationship_type_id = t.id
WHERE c.is_deleted = 0 {$isDeceasedCond} AND r.is_active = 1 AND r.contact_id_b = %1";
$order = 1;
if (count($this->relationship_type_ids)) {
$order = 1;
foreach($this->relationship_type_ids as $rel_type) {
if ($rel_type['dir'] == 'a_b') {
$statement = $sql['a_b'] . " AND t.id = ".\CRM_Utils_Type::escape($rel_type['id'], 'Integer');
......@@ -148,6 +148,11 @@ class RelationshipsFieldOutputHandler extends AbstractFieldOutputHandler {
$sqlStatements[] = str_replace("'order' as `order`", "'{$order}' as `order`", $statement);
$order ++;
}
} else {
foreach($sql as $statement) {
$sqlStatements[] = str_replace("'order' as `order`", "'{$order}' as `order`", $statement);
$order ++;
}
}
$formattedValues = [];
$htmlFormattedValues = [];
......@@ -179,7 +184,7 @@ class RelationshipsFieldOutputHandler extends AbstractFieldOutputHandler {
]);
$link = '<a href="' . $url . '">' . $dao->display_name . '</a>';
$image = \CRM_Contact_BAO_Contact_Utils::getImage($dao->contact_sub_type ? $dao->contact_sub_type : $dao->contact_type, FALSE, $dao->id);
$htmlFormattedValues[] = $image .'&nbsp;' . $this->show_label ? $dao->label . ':&nbsp;' : '' . $link;
$htmlFormattedValues[] = '<div class="clear">' . $image .'&nbsp;' . ($this->show_label ? $dao->label . ':&nbsp;' : '') . $link . '</div>';
if ($this->return_as_array) {
$formattedValues[] = array(
'label' => $dao->label,
......@@ -205,7 +210,7 @@ class RelationshipsFieldOutputHandler extends AbstractFieldOutputHandler {
} else {
$output->formattedValue = implode($this->separator, $formattedValues);
}
$output->setHtmlOutput(implode("<br>", $htmlFormattedValues));
$output->setHtmlOutput(implode("\r\n", $htmlFormattedValues));
return $output;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment