Skip to content
Snippets Groups Projects
Commit 20534911 authored by jaapjansma's avatar jaapjansma
Browse files

Merge branch 'event-type-is' into 'master'

Fixes #67 ("Event Type is" condition)

Closes #67

See merge request extensions/civirules!41
parents 37625016 93fe0d75
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* Added condition: "Contact added by Contact (not) in Group(s)" * Added condition: "Contact added by Contact (not) in Group(s)"
* Added action: "Update Numeric Value" * Added action: "Update Numeric Value"
* Also check smartgroups for 'Contact in group' condition * Also check smartgroups for 'Contact in group' condition
* Fixed issue #67 ("Event Type is" condition doesn't work)
## Version 2.11 ## Version 2.11
......
...@@ -12,7 +12,7 @@ class CRM_CivirulesConditions_Form_Event_EventType extends CRM_CivirulesConditio ...@@ -12,7 +12,7 @@ class CRM_CivirulesConditions_Form_Event_EventType extends CRM_CivirulesConditio
$eventTypeList = civicrm_api3('OptionValue', 'get', array('option_group_id' => "event_type", 'options' => ['limit' => 0])); $eventTypeList = civicrm_api3('OptionValue', 'get', array('option_group_id' => "event_type", 'options' => ['limit' => 0]));
$eventTypes = array(); $eventTypes = array();
foreach($eventTypeList['values'] as $eventType) { foreach($eventTypeList['values'] as $eventType) {
$eventTypes[$eventType['id']] = $eventType['label']; $eventTypes[$eventType['value']] = $eventType['label'];
} }
return $eventTypes; return $eventTypes;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment