From 881030853b4c234e382929f3b2bfea7726677143 Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 30 Apr 2019 17:01:11 +1200 Subject: [PATCH] Convert dedupe select to select 2 and remove not-used var --- CRM/Contact/Form/DedupeRules.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CRM/Contact/Form/DedupeRules.php b/CRM/Contact/Form/DedupeRules.php index c33f4d5010..318138ff76 100644 --- a/CRM/Contact/Form/DedupeRules.php +++ b/CRM/Contact/Form/DedupeRules.php @@ -113,22 +113,16 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form { ); $this->addField('used', ['label' => ts('Usage')], TRUE); - $disabled = []; $reserved = $this->addField('is_reserved', ['label' => ts('Reserved?')]); if (!empty($this->_defaults['is_reserved'])) { $reserved->freeze(); } $attributes = ['class' => 'two']; - if (!empty($disabled)) { - $attributes = array_merge($attributes, $disabled); - } for ($count = 0; $count < self::RULES_COUNT; $count++) { $this->add('select', "where_$count", ts('Field'), - [ - NULL => ts('- none -'), - ] + $this->_fields, FALSE, $disabled + $this->_fields, FALSE, ['class' => 'crm-select2', 'placeholder' => ts('Select Field')] ); $this->addField("length_$count", ['entity' => 'Rule', 'name' => 'rule_length'] + $attributes); $this->addField("weight_$count", ['entity' => 'Rule', 'name' => 'rule_weight'] + $attributes); -- 2.25.1