projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-19769 - Add colors to entityRef output
[civicrm-core.git]
/
CRM
/
Admin
/
Page
/
AJAX.php
diff --git
a/CRM/Admin/Page/AJAX.php
b/CRM/Admin/Page/AJAX.php
index 139321abe4f53c552938678ee2c1448d47f09a50..4374d62403c4ff5501c8f75eafe52d9b8449dec6 100644
(file)
--- a/
CRM/Admin/Page/AJAX.php
+++ b/
CRM/Admin/Page/AJAX.php
@@
-266,7
+266,7
@@
class CRM_Admin_Page_AJAX {
// query to list mergable tags
$query = "
// query to list mergable tags
$query = "
-SELECT t1.name, t1.id, t1.used_for, t2.name as parent
+SELECT t1.name, t1.id, t1.used_for, t
1.color, t
2.name as parent
FROM civicrm_tag t1
LEFT JOIN civicrm_tag t2 ON t1.parent_id = t2.id
WHERE t1.id <> {$fromId} AND
FROM civicrm_tag t1
LEFT JOIN civicrm_tag t2 ON t1.parent_id = t2.id
WHERE t1.id <> {$fromId} AND
@@
-280,6
+280,7
@@
LIMIT $limit";
$row = array(
'id' => $dao->id,
'text' => ($dao->parent ? "{$dao->parent} :: " : '') . $dao->name,
$row = array(
'id' => $dao->id,
'text' => ($dao->parent ? "{$dao->parent} :: " : '') . $dao->name,
+ 'color' => isset($dao->color) ? $dao->color : NULL,
);
// Add warning about used_for types
if (!empty($dao->used_for)) {
);
// Add warning about used_for types
if (!empty($dao->used_for)) {