CRM-18327 Fix filter value on the contact deleted by merge activity

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index dab2d8ccd1796f2a559e6eeb9d17195db6e76706..94ed0dfb1b50b39bb07834b1bb53f88f38e5c0fc 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -552,6 +552,7 @@ FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_
       'label' => ts('Contact Deleted by Merge'),
       'description' => ts('Contact was merged into another contact'),
       'is_active' => TRUE,
+      'filter' => 1,
     ));
     return TRUE;
   }

diff --git a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
index a3a4f62583e7d6e91831d34aed4d4fc2bbc3ac47..1023eb3b9655d5b6cad2e34e78b0a55ac83128af 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
@@ -16,3 +16,9 @@ SET
   nav2.weight = nav1.weight,
   nav2.has_separator = 1,
   nav2.label = 'Extensions';
+
+--CRM-18327 filter value missed on the contact deleted by merge activity --
+UPDATE civicrm_option_value ov
+LEFT JOIN civicrm_option_group og ON og.id = ov.option_group_id
+SET filter = 1
+WHERE ov.name = 'Contact Deleted by Merge' AND og.name = 'activity_type'