From a8d9a461f7c5743ed3496d394b9084f5f1e9f1e9 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 24 Jul 2013 00:14:51 -0700 Subject: [PATCH] CRM-12877 - ReportInstance API - Fixes for testCreateSingleValueAlter (report_id) ---------------------------------------- * CRM-12877: Provide api for creating report instances http://issues.civicrm.org/jira/browse/CRM-12877 --- CRM/Report/BAO/ReportInstance.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/CRM/Report/BAO/ReportInstance.php b/CRM/Report/BAO/ReportInstance.php index 5357ef6cd0..07bf181d93 100644 --- a/CRM/Report/BAO/ReportInstance.php +++ b/CRM/Report/BAO/ReportInstance.php @@ -100,14 +100,17 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { $instance->id = $instanceID; } - if ($reportID = CRM_Utils_Array::value('report_id', $params)) { - $instance->report_id = $reportID; - } else if ($instanceID) { - $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl($instanceID); - } else { - // just take it from current url - $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl(); + if (! $instanceID) { + if ($reportID = CRM_Utils_Array::value('report_id', $params)) { + $instance->report_id = $reportID; + } else if ($instanceID) { + $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl($instanceID); + } else { + // just take it from current url + $instance->report_id = CRM_Report_Utils_Report::getValueFromUrl(); + } } + $instance->save(); if ($instanceID) { -- 2.25.1