diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index 81b749e3c..e82b79b3a 100644
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -310,6 +310,11 @@ static function whereClauseSingle(&$values, &$query) {
$query->_qill[$grouping][] = ts('Activity Tag %1', array(1 => $op)) . ' ' . CRM_Utils_Array::implode(' ' . ts('OR') . ' ', $names);
$query->_tables['civicrm_activity_tag'] = $query->_whereTables['civicrm_activity_tag'] = 1;
break;
+
+ case 'parent_id':
+ $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_activity.parent_id", $op, $value, "Integer");
+ $query->_qill[$grouping][] = ts('Task Parent') . ' = ' . $value;
+ break;
}
}
diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 1d2b31b84..1333c4865 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -929,6 +929,9 @@ public function postProcess($params = NULL) {
CRM_Core_Session::setStatus(ts("Selected Activity has been deleted sucessfully."));
return;
}
+ if ($this->_action & CRM_Core_Action::VIEW) {
+ return;
+ }
// store the submitted values in an array
if (!$params) {
diff --git a/CRM/Activity/Page/Tab.php b/CRM/Activity/Page/Tab.php
index d55ac273e..f83e8d63a 100644
--- a/CRM/Activity/Page/Tab.php
+++ b/CRM/Activity/Page/Tab.php
@@ -247,6 +247,25 @@ function run() {
if (in_array($activityTypeId, array($emailTypeValue, $letterTypeValue, $SMSTypeValue))) {
return;
}
+
+ // add children activity search result
+ if ($this->_action & CRM_Core_Action::VIEW) {
+ $sortID = NULL;
+ $filter = array(
+ 'parent_id' => $this->_id,
+ );
+ $queryParams = CRM_Contact_BAO_Query::convertFormValues($filter);
+ $selector = new CRM_Activity_Selector_Search($queryParams, $this->_action);
+ $controller2 = new CRM_Core_Selector_Controller($selector,
+ $this->get(CRM_Utils_Pager::PAGE_ID),
+ $sortID,
+ CRM_Core_Action::VIEW,
+ $this,
+ CRM_Core_Selector_Controller::TRANSFER
+ );
+ $controller2->setEmbedded(TRUE);
+ $controller2->run();
+ }
}
elseif ($this->_action & (CRM_Core_Action::DELETE | CRM_Core_Action::DETACH)) {
$this->delete();
diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index e1c897958..16439a350 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -1482,6 +1482,7 @@ function whereClauseSingle(&$values) {
case 'activity_engagement_level':
case 'activity_id':
case 'activity_record_id':
+ case 'parent_id':
CRM_Activity_BAO_Query::whereClauseSingle($values, $this);
return;
diff --git a/js/Common.js b/js/Common.js
index 3142513bd..5fbcae6ae 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -865,7 +865,7 @@ function mdFormElement(type, label, attr){
var id;
for(i in attr) {
if(type == 'select' && i == 'values') {
- opt = values;
+ opt = attr[i];
continue;
}
if(i == 'class') {
diff --git a/l10n/pot/civicrm.pot b/l10n/pot/civicrm.pot
index 0f45ba5e5..f72742ab4 100644
--- a/l10n/pot/civicrm.pot
+++ b/l10n/pot/civicrm.pot
@@ -49449,7 +49449,6 @@ msgstr ""
msgid "Smart Marketing Group"
msgstr ""
-
#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "Cannot retrieve remote group, try again later"
msgstr ""
@@ -49543,4 +49542,8 @@ msgid "The will be synchronized at a fixed time every day."
msgstr ""
msgid "If there is an immediate need, you can click \"Manual Sync\"."
+msgstr ""
+
+#: CRM/Group/Form/Edit.php
+msgid "Remote Group"
msgstr ""
\ No newline at end of file
diff --git a/l10n/zh_TW/LC_MESSAGES/civicrm.mo b/l10n/zh_TW/LC_MESSAGES/civicrm.mo
index d25099771..1e648f40e 100644
Binary files a/l10n/zh_TW/LC_MESSAGES/civicrm.mo and b/l10n/zh_TW/LC_MESSAGES/civicrm.mo differ
diff --git a/l10n/zh_TW/civicrm.po b/l10n/zh_TW/civicrm.po
index 95a36c4ef..91d51abdf 100644
--- a/l10n/zh_TW/civicrm.po
+++ b/l10n/zh_TW/civicrm.po
@@ -50102,3 +50102,7 @@ msgstr "將於每日固定時間會同步名單。"
msgid "If there is an immediate need, you can click \"Manual Sync\"."
msgstr "若有需要，你可點擊「手動同步」"
+
+#: CRM/Group/Form/Edit.php
+msgid "Remote Group"
+msgstr "遠端群組"
diff --git a/packages/tcpdf/tcpdf.php b/packages/tcpdf/tcpdf.php
index ad89a1632..804e85be5 100644
--- a/packages/tcpdf/tcpdf.php
+++ b/packages/tcpdf/tcpdf.php
@@ -22914,6 +22914,9 @@ public function ImageSVG($file, $x='', $y='', $w=0, $h=0, $link='', $align='', $
// sets the character data handler function for the XML parser
xml_set_character_data_handler($this->parser, 'segSVGContentHandler');
// start parsing an XML document
+ if (version_compare(PHP_VERSION, '8.0.0', '<')) {
+ libxml_set_external_entity_loader(null);
+ }
if (!xml_parse($this->parser, $svgdata)) {
$error_message = sprintf('SVG Error: %s at line %d', xml_error_string(xml_get_error_code($this->parser)), xml_get_current_line_number($this->parser));
$this->Error($error_message);
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index af74111f2..63452af6c 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -254,10 +254,24 @@
{/if}
+ {if $rows && $action eq 4}
+
+
+
+
+
+ {include file="CRM/Activity/Form/Selector.tpl}
+ {*accordion-body*}
+ |
+
+ {/if}
{if $action eq 4 AND $currentAttachmentURL}
{include file="CRM/Form/attachment.tpl"}{* For view action the include provides the row and cells. *}
- {else if $action eq 1 OR $action eq 2}
+ {elseif $action eq 1 OR $action eq 2}
|
{include file="CRM/Form/attachment.tpl"}
@@ -343,6 +357,7 @@
{ts}Delete{/ts}
{/if}
{/if}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
|