From 35e282d5cd67037dcea5d2cb42534004d931b4e3 Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap@edeveloper.nl>
Date: Wed, 11 Mar 2015 16:28:45 +0100
Subject: [PATCH] array merge removes the keys
---
CRM/Civirules/Form/Rule.php | 7 +++++--
CRM/Civirules/Form/RuleAction.php | 2 +-
CRM/Civirules/Form/RuleCondition.php | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CRM/Civirules/Form/Rule.php b/CRM/Civirules/Form/Rule.php
index ebef293..e4912cc 100755
--- a/CRM/Civirules/Form/Rule.php
+++ b/CRM/Civirules/Form/Rule.php
@@ -165,7 +165,7 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
$this->add('checkbox', 'rule_is_active', ts('Enabled'));
$this->add('text', 'rule_created_date', ts('Created Date'));
$this->add('text', 'rule_created_contact', ts('Created By'));
- $eventList = array_merge(array(' - select - '), CRM_Civirules_Utils::buildEventList());
+ $eventList = array(' - select - ') + CRM_Civirules_Utils::buildEventList();
asort($eventList);
$this->add('select', 'rule_event_select', ts('Select Event'), $eventList);
if ($this->_action == CRM_Core_Action::UPDATE) {
@@ -347,7 +347,10 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
'id' => $this->ruleId,
'event_id' => $formValues['rule_event_select']
);
- CRM_Civirules_BAO_Rule::add($ruleParams);
+ var_dump($this->_submitValues);
+ var_dump($ruleParams);
+ $result = CRM_Civirules_BAO_Rule::add($ruleParams);
+ var_dump($result); exit();
}
}
}
diff --git a/CRM/Civirules/Form/RuleAction.php b/CRM/Civirules/Form/RuleAction.php
index 894ad6f..e6ab9fc 100644
--- a/CRM/Civirules/Form/RuleAction.php
+++ b/CRM/Civirules/Form/RuleAction.php
@@ -74,7 +74,7 @@ class CRM_Civirules_Form_RuleAction extends CRM_Core_Form {
*/
protected function createFormElements() {
$this->add('hidden', 'rule_id');
- $actionList = array_merge(array(' - select - '), CRM_Civirules_Utils::buildActionList());
+ $actionList = array(' - select - ') + CRM_Civirules_Utils::buildActionList();
asort($actionList);
$this->add('select', 'rule_action_select', ts('Select Action'), $actionList);
diff --git a/CRM/Civirules/Form/RuleCondition.php b/CRM/Civirules/Form/RuleCondition.php
index c032bb5..baabf19 100755
--- a/CRM/Civirules/Form/RuleCondition.php
+++ b/CRM/Civirules/Form/RuleCondition.php
@@ -81,7 +81,7 @@ class CRM_Civirules_Form_RuleCondition extends CRM_Core_Form {
*/
$linkList = array('AND' => 'AND', 'OR' =>'OR');
$this->add('select', 'rule_condition_link_select', ts('Select Link Operator'), $linkList);
- $conditionList = array_merge(array(' - select - '), CRM_Civirules_Utils::buildConditionList());
+ $conditionList = array(' - select - ') + CRM_Civirules_Utils::buildConditionList();
asort($conditionList);
$this->add('select', 'rule_condition_select', ts('Select Condition'), $conditionList);
--
GitLab