projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4.5' into master
[civicrm-core.git]
/
CRM
/
Campaign
/
Form
/
Task
/
Release.php
diff --git
a/CRM/Campaign/Form/Task/Release.php
b/CRM/Campaign/Form/Task/Release.php
index d2a43b8b2a06ea6cde2d6bf0d76ceb8fe4bf6d6c..bbb84df5e2f6493f9069479c185a7f722f99f8a2 100644
(file)
--- a/
CRM/Campaign/Form/Task/Release.php
+++ b/
CRM/Campaign/Form/Task/Release.php
@@
-66,13
+66,16
@@
class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
* Build all the data structures needed to build the form
*
* @return void
* Build all the data structures needed to build the form
*
* @return void
- *
@access public
-
*/
function preProcess() {
+ *
/
+ function preProcess() {
$this->_interviewToRelease = $this->get('interviewToRelease');
if ($this->_interviewToRelease) {
//user came from interview form.
foreach (array(
$this->_interviewToRelease = $this->get('interviewToRelease');
if ($this->_interviewToRelease) {
//user came from interview form.
foreach (array(
- 'surveyId', 'contactIds', 'interviewerId') as $fld) {
+ 'surveyId',
+ 'contactIds',
+ 'interviewerId'
+ ) as $fld) {
$this->{"_$fld"} = $this->get($fld);
}
$this->{"_$fld"} = $this->get($fld);
}
@@
-104,7
+107,8
@@
class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
$activityStatus = CRM_Core_PseudoConstant::activityStatus('name');
$statusIds = array();
foreach (array(
$activityStatus = CRM_Core_PseudoConstant::activityStatus('name');
$statusIds = array();
foreach (array(
- 'Scheduled') as $name) {
+ 'Scheduled'
+ ) as $name) {
if ($statusId = array_search($name, $activityStatus)) {
$statusIds[] = $statusId;
}
if ($statusId = array_search($name, $activityStatus)) {
$statusIds[] = $statusId;
}
@@
-134,16
+138,15
@@
class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
/**
* Build the form object
*
/**
* Build the form object
*
- * @access public
*
* @return void
*/
*
* @return void
*/
- function buildQuickForm() {
+
public
function buildQuickForm() {
$this->addDefaultButtons(ts('Release Respondents'), 'done');
}
$this->addDefaultButtons(ts('Release Respondents'), 'done');
}
- function postProcess() {
+
public
function postProcess() {
$deleteActivityIds = array();
foreach ($this->_contactIds as $cid) {
if (array_key_exists($cid, $this->_surveyActivities)) {
$deleteActivityIds = array();
foreach ($this->_contactIds as $cid) {
if (array_key_exists($cid, $this->_surveyActivities)) {
@@
-166,4
+169,3
@@
class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
}
}
}
}
}
}
-