From 0bbbbae1fe1366ae6192797f472ffe9bc9a48eb1 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 23 Jul 2013 23:59:58 -0700 Subject: [PATCH] CRM-12877 - ReportInstance API - Fixes for testCreateSingleValueAlter * group_role * is_reserved * header * footer ---------------------------------------- * CRM-12877: Provide api for creating report instances http://issues.civicrm.org/jira/browse/CRM-12877 --- CRM/Report/BAO/ReportInstance.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CRM/Report/BAO/ReportInstance.php b/CRM/Report/BAO/ReportInstance.php index 9f82c4d1da..5357ef6cd0 100644 --- a/CRM/Report/BAO/ReportInstance.php +++ b/CRM/Report/BAO/ReportInstance.php @@ -68,7 +68,9 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { ); } - $params['is_reserved'] = CRM_Utils_Array::value('is_reserved', $params, FALSE); + if (!isset($params['id'])) { + $params['is_reserved'] = CRM_Utils_Array::value('is_reserved', $params, FALSE); + } $instanceID = CRM_Utils_Array::value('id', $params); if (CRM_Utils_Array::value('instance_id', $params)) { @@ -90,7 +92,7 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { } // explicitly set to null if params value is empty - if (empty($params['grouprole'])) { + if (!$instanceID && empty($params['grouprole'])) { $instance->grouprole = 'null'; } @@ -130,8 +132,12 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { * @static */ static function &create(&$params) { - $params['header'] = CRM_Utils_Array::value('report_header',$params); - $params['footer'] = CRM_Utils_Array::value('report_footer',$params); + if (isset($params['report_header'])) { + $params['header'] = CRM_Utils_Array::value('report_header',$params); + } + if (isset($params['report_footer'])) { + $params['footer'] = CRM_Utils_Array::value('report_footer',$params); + } // build navigation parameters if (CRM_Utils_Array::value('is_navigation', $params)) { -- 2.25.1