projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3746 from eileenmcnaughton/prtest
[civicrm-core.git]
/
CRM
/
Report
/
Form.php
diff --git
a/CRM/Report/Form.php
b/CRM/Report/Form.php
index 2dbc1bd4b74019ae5dc0c35508cd1cb78c920235..2e70b5ac93310771c70b58d07ecc48f8d6afbeb9 100644
(file)
--- a/
CRM/Report/Form.php
+++ b/
CRM/Report/Form.php
@@
-967,6
+967,14
@@
class CRM_Report_Form extends CRM_Core_Form {
}
}
}
}
}
}
+
+ $stateCountryMap[] = array(
+ 'country' => 'country_id_value',
+ 'state_province' => 'state_province_id_value',
+ 'county' => 'county_id_value'
+ );
+ CRM_Core_BAO_Address::addStateCountryMap($stateCountryMap);
+
$this->assign('filters', $filters);
}
$this->assign('filters', $filters);
}
@@
-1100,13
+1108,13
@@
class CRM_Report_Form extends CRM_Core_Form {
if (CRM_Core_Permission::check('administer Reports') && $this->_add2groupSupported) {
$this->addElement('select', 'groups', ts('Group'),
if (CRM_Core_Permission::check('administer Reports') && $this->_add2groupSupported) {
$this->addElement('select', 'groups', ts('Group'),
- array('' => ts('- select group -')) + CRM_Core_PseudoConstant::staticGroup()
+ array('' => ts('Add Contacts to Group')) + CRM_Core_PseudoConstant::nestedGroup(),
+ array('class' => 'crm-select2 crm-action-menu action-icon-plus huge')
);
$this->assign('group', TRUE);
}
);
$this->assign('group', TRUE);
}
- $label = ts('Add These Contacts to Group');
- $this->addElement('submit', $this->_groupButtonName, $label, array('onclick' => 'return checkGroup();'));
+ $this->addElement('submit', $this->_groupButtonName, '', array('style' => 'display: none;'));
$this->addChartOptions();
$this->addButtons(array(
$this->addChartOptions();
$this->addButtons(array(
@@
-2992,37
+3000,37
@@
WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
if (!is_array($value)) {
$value = array($value);
}
if (!is_array($value)) {
$value = array($value);
}
-
+
$tmp_membership_org_sql_list = implode(', ', $value);
return " {$this->_aliases['civicrm_contact']}.id {$sqlOp} (
SELECT DISTINCT mem.contact_id
$tmp_membership_org_sql_list = implode(', ', $value);
return " {$this->_aliases['civicrm_contact']}.id {$sqlOp} (
SELECT DISTINCT mem.contact_id
- FROM civicrm_membership mem
+ FROM civicrm_membership mem
LEFT JOIN civicrm_membership_status mem_status ON mem.status_id = mem_status.id
LEFT JOIN civicrm_membership_status mem_status ON mem.status_id = mem_status.id
- LEFT JOIN civicrm_membership_type mt ON mem.membership_type_id = mt.id
+ LEFT JOIN civicrm_membership_type mt ON mem.membership_type_id = mt.id
WHERE mt.member_of_contact_id IN (".$tmp_membership_org_sql_list.")
AND mt.is_active = '1'
AND mem_status.is_current_member = '1'
AND mem_status.is_active = '1' ) ";
WHERE mt.member_of_contact_id IN (".$tmp_membership_org_sql_list.")
AND mt.is_active = '1'
AND mem_status.is_current_member = '1'
AND mem_status.is_active = '1' ) ";
- }
+ }
function whereMembershipTypeClause($field, $value, $op) {
$sqlOp = $this->getSQLOperator($op);
if (!is_array($value)) {
$value = array($value);
}
function whereMembershipTypeClause($field, $value, $op) {
$sqlOp = $this->getSQLOperator($op);
if (!is_array($value)) {
$value = array($value);
}
-
+
$tmp_membership_sql_list = implode(', ', $value);
return " {$this->_aliases['civicrm_contact']}.id {$sqlOp} (
SELECT DISTINCT mem.contact_id
$tmp_membership_sql_list = implode(', ', $value);
return " {$this->_aliases['civicrm_contact']}.id {$sqlOp} (
SELECT DISTINCT mem.contact_id
- FROM civicrm_membership mem
- LEFT JOIN civicrm_membership_status mem_status ON mem.status_id = mem_status.id
- LEFT JOIN civicrm_membership_type mt ON mem.membership_type_id = mt.id
+ FROM civicrm_membership mem
+ LEFT JOIN civicrm_membership_status mem_status ON mem.status_id = mem_status.id
+ LEFT JOIN civicrm_membership_type mt ON mem.membership_type_id = mt.id
WHERE mem.membership_type_id IN (".$tmp_membership_sql_list.")
AND mt.is_active = '1'
AND mem_status.is_current_member = '1'
AND mem_status.is_active = '1' ) ";
}
WHERE mem.membership_type_id IN (".$tmp_membership_sql_list.")
AND mt.is_active = '1'
AND mem_status.is_current_member = '1'
AND mem_status.is_active = '1' ) ";
}
-
+
/**
* @param string $tableAlias
*/
/**
* @param string $tableAlias
*/