From be09038f298af47ed8c58a392d26521f9d16cfd9 Mon Sep 17 00:00:00 2001
From: vivekarora <vivek11112@gmail.com>
Date: Wed, 4 Sep 2013 12:13:57 +0530
Subject: [PATCH] CRM-13325 - Corrected code formatting

----------------------------------------
* CRM-13325: Custom field HTML should indicate group+field name
  http://issues.civicrm.org/jira/browse/CRM-13325
---
 CRM/Core/BAO/CustomField.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index 929093fad9..fe4d9d9e73 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -741,8 +741,9 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
     $field = self::getFieldObject($fieldId);
     
     // Custom field HTML should indicate group+field name
-    $groupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup',$field->custom_group_id);
-    $dataCrmCustomAttr = 'data-crm-custom="'.$groupName.':'.$field->name.'"';
+    $groupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $field->custom_group_id);
+    $dataCrmCustomVal = $groupName.':'.$field->name;
+    $dataCrmCustomAttr = 'data-crm-custom="'.$dataCrmCustomVal.'"';
     $field->attributes .= $dataCrmCustomAttr;
     
     // Fixed for Issue CRM-2183
@@ -805,7 +806,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
               'timeFormat' => $field->time_format,
               'startOffset' => $field->start_date_years,
               'endOffset' => $field->end_date_years,
-              'data-crm-custom' =>$groupName.':'.$field->name,
+              'data-crm-custom' => $dataCrmCustomVal,
             )
           );
 
@@ -815,7 +816,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
               'timeFormat' => $field->time_format,
               'startOffset' => $field->start_date_years,
               'endOffset' => $field->end_date_years,
-              'data-crm-custom' =>$groupName.':'.$field->name,
+              'data-crm-custom' => $dataCrmCustomVal,
             )
           );
         }
@@ -827,7 +828,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
               'timeFormat' => $field->time_format,
               'startOffset' => $field->start_date_years,
               'endOffset' => $field->end_date_years,
-          	  'data-crm-custom' =>$groupName.':'.$field->name,
+          	  'data-crm-custom' => $dataCrmCustomVal,
             ));
         }
         break;
@@ -885,7 +886,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
             'size' => 5,
             'style' => '',
             'class' => 'advmultiselect',
-          	'data-crm-custom' =>$groupName.':'.$field->name,
+          	'data-crm-custom' => $dataCrmCustomVal,
           )
         );
 
@@ -906,7 +907,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
         ) {
           $selectOption['CiviCRM_OP_OR'] = ts('Select to match ANY; unselect to match ALL');
         }
-        $qf->addElement('select', $elementName, $label, $selectOption, array('size' => '5', 'multiple','data-crm-custom' =>$groupName.':'.$field->name));
+        $qf->addElement('select', $elementName, $label, $selectOption, array('size' => '5', 'multiple', 'data-crm-custom' => $dataCrmCustomVal));
 
         if ($useRequired && !$search) {
           $qf->addRule($elementName, ts('%1 is a required field.', array(1 => $label)), 'required');
@@ -919,12 +920,12 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
         );
         $check = array();
         foreach ($customOption as $v => $l) {
-          $check[] = &$qf->addElement('advcheckbox', $v, NULL, (string)$l,array('data-crm-custom' =>$groupName.':'.$field->name));
+          $check[] = &$qf->addElement('advcheckbox', $v, NULL, $l, array('data-crm-custom' => $dataCrmCustomVal));
         }
         if ($search &&
           count($check) > 1
         ) {
-          $check[] = &$qf->addElement('advcheckbox', 'CiviCRM_OP_OR', NULL, ts('Check to match ANY; uncheck to match ALL'),$field->attributes,array('data-crm-custom' =>$groupName.':'.$field->name));
+          $check[] = &$qf->addElement('advcheckbox', 'CiviCRM_OP_OR', NULL, ts('Check to match ANY; uncheck to match ALL'), array('data-crm-custom' => $dataCrmCustomVal));
         }
         $qf->addGroup($check, $elementName, $label);
         if ($useRequired && !$search) {
@@ -960,7 +961,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
         //Add Multi-select State/Province
         $stateOption = CRM_Core_PseudoConstant::stateProvince();
 
-        $qf->addElement('select', $elementName, $label, $stateOption, array('size' => '5', 'multiple','data-crm-custom' =>$groupName.':'.$field->name));
+        $qf->addElement('select', $elementName, $label, $stateOption, array('size' => '5', 'multiple', 'data-crm-custom' => $dataCrmCustomVal));
         if ($useRequired && !$search) {
           $qf->addRule($elementName, ts('%1 is a required field.', array(1 => $label)), 'required');
         }
@@ -978,14 +979,14 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
       case 'Multi-Select Country':
         //Add Country
         $countryOption = CRM_Core_PseudoConstant::country();
-        $qf->addElement('select', $elementName, $label, $countryOption, array('size' => '5', 'multiple','data-crm-custom' =>$groupName.':'.$field->name));
+        $qf->addElement('select', $elementName, $label, $countryOption, array('size' => '5', 'multiple', 'data-crm-custom' => $dataCrmCustomVal));
         if ($useRequired && !$search) {
           $qf->addRule($elementName, ts('%1 is a required field.', array(1 => $label)), 'required');
         }
         break;
 
       case 'RichTextEditor':
-        $attributes = array('rows' => $field->note_rows, 'cols' => $field->note_columns,'data-crm-custom' =>$groupName.':'.$field->name);
+        $attributes = array('rows' => $field->note_rows, 'cols' => $field->note_columns, 'data-crm-custom' => $dataCrmCustomVal);
         if ($field->text_length) {
           $attributes['maxlength'] = $field->text_length;
         }
-- 
2.25.1