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 #4893 from colemanw/INFRA-132
[civicrm-core.git]
/
CRM
/
Campaign
/
Form
/
Task
/
Interview.php
diff --git
a/CRM/Campaign/Form/Task/Interview.php
b/CRM/Campaign/Form/Task/Interview.php
index a6d5f0ceed0934ee84e0cb6803adf477778463cf..617b887863d8061139b6e9e5900f3aca6ebc3825 100755
(executable)
--- a/
CRM/Campaign/Form/Task/Interview.php
+++ b/
CRM/Campaign/Form/Task/Interview.php
@@
-47,7
+47,6
@@
class CRM_Campaign_Form_Task_Interview extends CRM_Campaign_Form_Task {
/**
* Variable to store redirect path
/**
* Variable to store redirect path
- *
*/
private $_userContext;
*/
private $_userContext;
@@
-95,17
+94,17
@@
class CRM_Campaign_Form_Task_Interview extends CRM_Campaign_Form_Task {
$this->_interviewerId = CRM_Utils_Array::value('survey_interviewer_id', $this->get('formValues'));
}
$this->_interviewerId = CRM_Utils_Array::value('survey_interviewer_id', $this->get('formValues'));
}
- if (
$this->_surveyId
) {
+ if (
$this->_surveyId
) {
$params = array('id' => $this->_surveyId);
CRM_Campaign_BAO_Survey::retrieve($params, $this->_surveyDetails);
}
$orderClause = FALSE;
$buttonName = $this->controller->getButtonName();
$params = array('id' => $this->_surveyId);
CRM_Campaign_BAO_Survey::retrieve($params, $this->_surveyDetails);
}
$orderClause = FALSE;
$buttonName = $this->controller->getButtonName();
- if (
$buttonName == '_qf_Interview_submit_orderBy' && !empty($_POST['order_bys'])) {
+ if ($buttonName == '_qf_Interview_submit_orderBy' && !empty($_POST['order_bys'])) {
$orderByParams = CRM_Utils_Array::value('order_bys', $_POST);
}
$orderByParams = CRM_Utils_Array::value('order_bys', $_POST);
}
- elseif (
CRM_Core_OptionGroup::getValue('activity_type', 'WalkList') == $this->_surveyDetails['activity_type_id']
) {
+ elseif (
CRM_Core_OptionGroup::getValue('activity_type', 'WalkList') == $this->_surveyDetails['activity_type_id']
) {
$orderByParams =
array(
1 => array(
$orderByParams =
array(
1 => array(
@@
-128,13
+127,13
@@
class CRM_Campaign_Form_Task_Interview extends CRM_Campaign_Form_Task {
}
$orderBy = array();
}
$orderBy = array();
- if (
!empty($orderByParams)
) {
- foreach (
$orderByParams as $key => $val
) {
+ if (
!empty($orderByParams)
) {
+ foreach (
$orderByParams as $key => $val
) {
if (!empty($val['column'])) {
$orderBy[] = "{$val['column']} {$val['order']}";
}
}
if (!empty($val['column'])) {
$orderBy[] = "{$val['column']} {$val['order']}";
}
}
- if (
!empty($orderBy)
) {
+ if (
!empty($orderBy)
) {
$orderClause = "ORDER BY " . implode(', ', $orderBy);
}
}
$orderClause = "ORDER BY " . implode(', ', $orderBy);
}
}
@@
-307,7
+306,7
@@
WHERE {$clause}
foreach ($this->_contactIds as $contactId) {
//build the profile fields.
foreach ($this->_surveyFields as $name => $field) {
foreach ($this->_contactIds as $contactId) {
//build the profile fields.
foreach ($this->_surveyFields as $name => $field) {
- if ($field){
+ if ($field)
{
CRM_Core_BAO_UFGroup::buildProfile($this, $field, NULL, $contactId);
}
}
CRM_Core_BAO_UFGroup::buildProfile($this, $field, NULL, $contactId);
}
}
@@
-400,7
+399,7
@@
WHERE {$clause}
}
}
}
}
- if (
CRM_Core_OptionGroup::getValue('activity_type', 'WalkList') == $this->_surveyDetails['activity_type_id']
) {
+ if (
CRM_Core_OptionGroup::getValue('activity_type', 'WalkList') == $this->_surveyDetails['activity_type_id']
) {
$defaults['order_bys'] =
array(
1 => array(
$defaults['order_bys'] =
array(
1 => array(
@@
-553,7
+552,7
@@
WHERE {$clause}
'source_contact_id' => 'source_contact',
'location' => 'activity_location',
'campaign_id' => 'activity_campaign_id',
'source_contact_id' => 'source_contact',
'location' => 'activity_location',
'campaign_id' => 'activity_campaign_id',
- 'duration' => 'activity_duration'
+ 'duration' => 'activity_duration'
,
);
foreach ($activityParams as $key => $field) {
if (!empty($params[$field])) {
);
foreach ($activityParams as $key => $field) {
if (!empty($params[$field])) {