From fdee8d8dae0414f77ad69cd84b56f75fe67e404a Mon Sep 17 00:00:00 2001
From: Sudha Bisht <sudha.bisht@webaccessglobal.com>
Date: Tue, 23 Jun 2015 16:28:18 +0530
Subject: [PATCH] Upgrade Changes

---
 CRM/Report/Form/ActivitySummary.php           | 30 ++++++++++++-------
 .../Incremental/sql/4.7.alpha1.mysql.tpl      | 11 ++++++-
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/CRM/Report/Form/ActivitySummary.php b/CRM/Report/Form/ActivitySummary.php
index 17db33618d..75eb5c7424 100644
--- a/CRM/Report/Form/ActivitySummary.php
+++ b/CRM/Report/Form/ActivitySummary.php
@@ -108,7 +108,7 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
             'type' => CRM_Utils_Type::T_STRING,
           ),
           'status_id' => array(
-            'title' => ts('Status'),
+            'title' => ts('Activity Status'),
             'default' => TRUE,
             'type' => CRM_Utils_Type::T_STRING,
           ),
@@ -156,7 +156,7 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
             'default' => TRUE,
           ),
           'status_id' => array(
-            'title' => ts('Status'),
+            'title' => ts('Activity Status'),
             'default' => TRUE,
           ),
         ),
@@ -499,6 +499,13 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
     return $statistics;
   }
 
+  public function modifyColumnHeaders() {
+    //CRM-16719 modify name of column
+    if (!empty($this->_columnHeaders['civicrm_activity_status_id'])) {
+      $this->_columnHeaders['civicrm_activity_status_id']['title'] = "Status";
+    }
+  }
+
   /**
    * Alter display of rows.
    *
@@ -509,7 +516,6 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
    *   Rows generated by SQL, with an array for each row.
    */
   public function alterDisplay(&$rows) {
-
     $entryFound = FALSE;
     $activityType = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE);
     $activityStatus = CRM_Core_PseudoConstant::activityStatus();
@@ -519,12 +525,19 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
       // make count columns point to activity detail report
       if (!empty($row['civicrm_activity_id_count'])) {
         $url =array();
-        $urlParams = array('activity_type_id', 'gid', 'status_id', 'contact_id', 'activity_date_time');
-        foreach ($urlParams as $fieldName => $field) {
+        $urlParams = array('activity_type_id', 'gid', 'status_id', 'contact_id');
+        foreach ($urlParams as $field) {
           if (!empty($row['civicrm_activity_'.$field])) {
             $url[] = "{$field}_op=in&{$field}_value={$row['civicrm_activity_'.$field]}";
           }
-          elseif ($field == 'activity_date_time' && (!empty($this->_params['activity_date_time_relative']) || !empty($this->_params['activity_date_time_from']))) {
+          elseif (!empty($this->_params[$field.'_value'])) {
+            $val = implode(",",$this->_params[$field.'_value']);
+            $url[] = "{$field}_op=in&{$field}_value={$val}";
+          }
+        }
+        $date_suffixes = array('relative', 'from', 'to');
+        while (list(, $suffix) = each($date_suffixes)) {
+          if (!empty($this->_params['activity_date_time_' . $suffix])) {
             list($from, $to)
               = $this->getFromTo(
                 CRM_Utils_Array::value("activity_date_time_relative", $this->_params),
@@ -532,10 +545,7 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
                 CRM_Utils_Array::value("activity_date_time_to", $this->_params)
              );
             $url[] = "activity_date_time_from={$from}&activity_date_time_to={$to}";
-          }
-          elseif (!empty($this->_params[$field.'_value'])) {
-            $val = implode(",",$this->_params[$field.'_value']);
-            $url[] = "{$field}_op=in&{$field}_value={$val}";
+            break;
           }
         }
         $url=implode('&', $url);
diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
index 28fb04ba90..3650787a60 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
@@ -9,4 +9,13 @@ UPDATE civicrm_option_group SET name = 'Textarea', {localize field='label'}label
 DELETE FROM civicrm_option_value WHERE name IN ('Joomla Default Editor', 'Drupal Default Editor')
   AND option_group_id = @option_group_id_wysiwyg;
 
-UPDATE civicrm_option_group SET is_active = 1, is_reserved = 1 WHERE option_group_id = @option_group_id_wysiwyg;
\ No newline at end of file
+UPDATE civicrm_option_group SET is_active = 1, is_reserved = 1 WHERE option_group_id = @option_group_id_wysiwyg;
+
+--CRM-16719
+SELECT @option_group_id_report := max(id) from civicrm_option_group where name = 'report_template';
+
+UPDATE civicrm_option_value SET {localize field="label"}label = 'Activity Details Report'{/localize}
+  WHERE value = 'activity' AND option_group_id = @option_group_id_report;
+
+UPDATE civicrm_option_value SET {localize field="label"}label = 'Activity Summary Report'{/localize}
+  WHERE value = 'activitySummary' AND option_group_id = @option_group_id_report;
-- 
2.25.1