use number wiget for weight fields in all forms

[civicrm-core.git] / CRM / Campaign / Form / Survey / Results.php

diff --git a/CRM/Campaign/Form/Survey/Results.php b/CRM/Campaign/Form/Survey/Results.php
index d8c070c6eef75756736acbf277f9ea1f33eab56e..4dd86299f718666e30ae84a7f7d07ae95f63cc0c 100644 (file)
--- a/CRM/Campaign/Form/Survey/Results.php
+++ b/CRM/Campaign/Form/Survey/Results.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 
 /**
@@ -165,7 +165,7 @@ class CRM_Campaign_Form_Survey_Results extends CRM_Campaign_Form_Survey {
       );
 
       // weight
-      $this->add('text', "option_weight[$i]", ts('Order'),
+      $this->add('number', "option_weight[$i]", ts('Order'),
         $optionAttributes['weight']
       );
 
@@ -434,7 +434,7 @@ class CRM_Campaign_Form_Survey_Results extends CRM_Campaign_Form_Survey {
         'street_unit',
         'survey_response',
       );
-      if (CRM_Core_OptionGroup::getValue('activity_type', 'WalkList') ==
+      if (CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'WalkList') ==
         $this->_values['activity_type_id']
       ) {
         $this->_params['order_bys'] = array(
@@ -456,14 +456,14 @@ class CRM_Campaign_Form_Survey_Results extends CRM_Campaign_Form_Survey {
           ),
         );
       }
-      elseif (CRM_Core_OptionGroup::getValue('activity_type', 'PhoneBank') ==
+      elseif (CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'PhoneBank') ==
         $this->_values['activity_type_id']
       ) {
         array_push($displayFields, 'phone');
       }
-      elseif ((CRM_Core_OptionGroup::getValue('activity_type', 'Survey') ==
+      elseif ((CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Survey') ==
           $this->_values['activity_type_id']) ||
-        (CRM_Core_OptionGroup::getValue('activity_type', 'Canvass') ==
+        (CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Canvass') ==
           $this->_values['activity_type_id'])
       ) {
         array_push($displayFields, 'phone', 'city', 'state_province_id', 'postal_code', 'email');