projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-24-15-59-25
[civicrm-core.git]
/
CRM
/
Activity
/
BAO
/
Query.php
diff --git
a/CRM/Activity/BAO/Query.php
b/CRM/Activity/BAO/Query.php
index 0fa38fe4ab53281e281b042e4bfbbf1ff4b52f5c..e378efe51d8390975174709584c5f86c1b7514ef 100644
(file)
--- a/
CRM/Activity/BAO/Query.php
+++ b/
CRM/Activity/BAO/Query.php
@@
-51,7
+51,7
@@
class CRM_Activity_BAO_Query {
}
if (!empty($query->_returnProperties['activity_type_id'])) {
}
if (!empty($query->_returnProperties['activity_type_id'])) {
- $query->_select['activity_type_id'] = "activity_type.
id
as activity_type_id";
+ $query->_select['activity_type_id'] = "activity_type.
value
as activity_type_id";
$query->_element['activity_type_id'] = 1;
$query->_tables['civicrm_activity'] = 1;
$query->_tables['activity_type'] = 1;
$query->_element['activity_type_id'] = 1;
$query->_tables['civicrm_activity'] = 1;
$query->_tables['activity_type'] = 1;
@@
-60,8
+60,7
@@
class CRM_Activity_BAO_Query {
}
if (!empty($query->_returnProperties['activity_type'])) {
}
if (!empty($query->_returnProperties['activity_type'])) {
- $query->_select['activity_type'] = "activity_type.label as activity_type,
- civicrm_activity.activity_type_id as activity_type_id";
+ $query->_select['activity_type'] = "activity_type.label as activity_type";
$query->_element['activity_type'] = 1;
$query->_tables['civicrm_activity'] = 1;
$query->_tables['activity_type'] = 1;
$query->_element['activity_type'] = 1;
$query->_tables['civicrm_activity'] = 1;
$query->_tables['activity_type'] = 1;
@@
-91,7
+90,8
@@
class CRM_Activity_BAO_Query {
}
if (!empty($query->_returnProperties['activity_status'])) {
}
if (!empty($query->_returnProperties['activity_status'])) {
- $query->_select['activity_status'] = "activity_status.label as activity_status";
+ $query->_select['activity_status'] = "activity_status.label as activity_status,
+ civicrm_activity.status_id as status_id";
$query->_element['activity_status'] = 1;
$query->_tables['civicrm_activity'] = 1;
$query->_tables['activity_status'] = 1;
$query->_element['activity_status'] = 1;
$query->_tables['civicrm_activity'] = 1;
$query->_tables['activity_status'] = 1;