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 #4959 from rohankatkar/batch-17
[civicrm-core.git]
/
CRM
/
Custom
/
Form
/
Option.php
diff --git
a/CRM/Custom/Form/Option.php
b/CRM/Custom/Form/Option.php
index 30a5d7443bfc80839e7c9f74df90182418c79723..e91b96e535d4207e0c12ab3e21011d737b37cdf7 100644
(file)
--- a/
CRM/Custom/Form/Option.php
+++ b/
CRM/Custom/Form/Option.php
@@
-67,8
+67,6
@@
class CRM_Custom_Form_Option extends CRM_Core_Form {
/**
* Set variables up before form is built
*
/**
* Set variables up before form is built
*
- * @param null
- *
* @return void
*/
public function preProcess() {
* @return void
*/
public function preProcess() {
@@
-103,9
+101,8
@@
class CRM_Custom_Form_Option extends CRM_Core_Form {
* Set default values for the form. Note that in edit/view mode
* the default values are retrieved from the database
*
* Set default values for the form. Note that in edit/view mode
* the default values are retrieved from the database
*
- * @param null
- *
- * @return array array of default values
+ * @return array
+ * array of default values
*/
public function setDefaultValues() {
$defaults = $fieldDefaults = array();
*/
public function setDefaultValues() {
$defaults = $fieldDefaults = array();
@@
-150,8
+147,6
@@
class CRM_Custom_Form_Option extends CRM_Core_Form {
/**
* Build the form object
*
/**
* Build the form object
*
- * @param null
- *
* @return void
*/
public function buildQuickForm() {
* @return void
*/
public function buildQuickForm() {
@@
-244,13
+239,13
@@
class CRM_Custom_Form_Option extends CRM_Core_Form {
* @param $files
* @param CRM_Core_Form $form
*
* @param $files
* @param CRM_Core_Form $form
*
- * @return array
list of errors to be posted back to the form
- *
@static
+ * @return array
+ *
list of errors to be posted back to the form
*/
public static function formRule($fields, $files, $form) {
*/
public static function formRule($fields, $files, $form) {
- $optionLabel
= $fields['label'];
- $optionValue
= $fields['value'];
- $fieldId
= $form->_fid;
+ $optionLabel = $fields['label'];
+ $optionValue = $fields['value'];
+ $fieldId = $form->_fid;
$optionGroupId = $form->_optionGroupID;
$temp = array();
$optionGroupId = $form->_optionGroupID;
$temp = array();
@@
-391,8
+386,6
@@
SELECT count(*)
/**
* Process the form
*
/**
* Process the form
*
- * @param null
- *
* @return void
*/
public function postProcess() {
* @return void
*/
public function postProcess() {
@@
-424,8
+417,8
@@
SELECT count(*)
}
$fieldValues = array('option_group_id' => $this->_optionGroupID);
}
$fieldValues = array('option_group_id' => $this->_optionGroupID);
- $customOption->weight
=
- CRM_Utils_Weight::updateOtherWeights(
+ $customOption->weight
+
=
CRM_Utils_Weight::updateOtherWeights(
'CRM_Core_DAO_OptionValue',
$oldWeight,
$params['weight'],
'CRM_Core_DAO_OptionValue',
$oldWeight,
$params['weight'],
@@
-455,8
+448,8
@@
SELECT count(*)
else {
$defVal[] = $customOption->value;
}
else {
$defVal[] = $customOption->value;
}
- $customField->default_value
=
- CRM_Core_DAO::VALUE_SEPARATOR .
+ $customField->default_value
+
=
CRM_Core_DAO::VALUE_SEPARATOR .
implode(CRM_Core_DAO::VALUE_SEPARATOR, $defVal) .
CRM_Core_DAO::VALUE_SEPARATOR;
$customField->save();
implode(CRM_Core_DAO::VALUE_SEPARATOR, $defVal) .
CRM_Core_DAO::VALUE_SEPARATOR;
$customField->save();
@@
-470,8
+463,8
@@
SELECT count(*)
}
}
}
}
- $customField->default_value
=
- CRM_Core_DAO::VALUE_SEPARATOR .
+ $customField->default_value
+
=
CRM_Core_DAO::VALUE_SEPARATOR .
implode(CRM_Core_DAO::VALUE_SEPARATOR, $tempVal) .
CRM_Core_DAO::VALUE_SEPARATOR;
$customField->save();
implode(CRM_Core_DAO::VALUE_SEPARATOR, $tempVal) .
CRM_Core_DAO::VALUE_SEPARATOR;
$customField->save();