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 4b93452dfa8a76cd782b69d1e7ff7bc9880a3269..bbb84df5e2f6493f9069479c185a7f722f99f8a2 100644
(file)
--- a/
CRM/Campaign/Form/Task/Release.php
+++ b/
CRM/Campaign/Form/Task/Release.php
@@
-1,7
+1,7
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
5
|
+ | CiviCRM version 4.
6
|
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
@@
-40,21
+40,21
@@
class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
/**
class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
/**
- *
s
urvet id
+ *
S
urvet id
*
* @var int
*/
protected $_surveyId;
/**
*
* @var int
*/
protected $_surveyId;
/**
- *
n
umber of voters
+ *
N
umber of voters
*
* @var int
*/
protected $_interviewerId;
/**
*
* @var int
*/
protected $_interviewerId;
/**
- *
s
urvey details
+ *
S
urvey details
*
* @var object
*/
*
* @var object
*/
@@
-63,16
+63,19
@@
class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
protected $_surveyActivities;
/**
protected $_surveyActivities;
/**
- *
b
uild all the data structures needed to build the form
+ *
B
uild all the data structures needed to build the form
*
* @return void
*
* @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;
}
@@
-132,18
+136,17
@@
class CRM_Campaign_Form_Task_Release extends CRM_Campaign_Form_Task {
}
/**
}
/**
- * Build the form
+ * 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 {
}
}
}
}
}
}
-