From 5a9a44d90c628a771fbc1bf8da94510cb38bd2d0 Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Thu, 13 Jun 2013 17:57:04 +0530 Subject: [PATCH] CRM-12251 ---------------------------------------- * CRM-12251: CiviMember Reports Improvements: Inner Join On Type vs Status and Add "Primary Member" http://issues.civicrm.org/jira/browse/CRM-12251 --- CRM/Report/Form.php | 3 ++- CRM/Report/Form/Member/Summary.php | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index 73e7cf691c..ab544db14f 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -785,7 +785,8 @@ class CRM_Report_Form extends CRM_Core_Form { case CRM_Report_FORM::OP_SELECT: // assume a select field $this->addElement('select', "{$fieldName}_op", ts('Operator:'), $operations); - $this->addElement('select', "{$fieldName}_value", NULL, $field['options']); + if (!empty($field['options'])) + $this->addElement('select', "{$fieldName}_value", NULL, $field['options']); break; case CRM_Report_FORM::OP_DATE: diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index 7f26933f7c..8bdd639298 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -95,6 +95,10 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { 'type' => CRM_Utils_Type::T_DATE, 'operatorType' => CRM_Report_Form::OP_DATE, ), + 'owner_membership_id' => + array('title' => ts('Membership Owner ID'), + 'operatorType' => CRM_Report_Form::OP_INT, + ), 'membership_type_id' => array('title' => ts('Membership Type'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, -- 2.25.1