Allow notification-limitation to checkbox for all event types Wunderb…

…yte-GmbH#160
michaelpollak · Jun 28, 2021 · 9cd6b97 · 9cd6b97
1 parent 156f483
commit 9cd6b97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/rule/eventnotification/rule_class.php b/rule/eventnotification/rule_class.php
@@ -93,8 +93,8 @@ public function trigger(\core\event\base $event) {
             }
         }
 
-        // If event is "update_entry" check if we only trigger on specific checkbox.
-        if ($eventname == "entry_updated" && $this->rule->param5) {
+        // Check if we only trigger on specific checkbox.
+        if ($this->rule->param5) {
 
             // If so, test for conditions and stop sending if not met.
             $entryid = $entryid = $event->get_data()['objectid'];

diff --git a/rule/rule_form.php b/rule/rule_form.php
@@ -101,8 +101,7 @@ public function definition() {
         // If we have selected entry updated, add a new UI when the instance includes a checkbox.
         if($checkboxes = $this->_df->get_fields_by_type('checkbox', true)) {
             $checkboxes = array('0' => get_string('noselection', 'datalynx')) + $checkboxes;
-            $mform->addElement('select', 'param5', get_string('triggerspecificevent', 'datalynxrule_eventnotification'), $checkboxes);
-            $mform->hideIf('param5', 'entry_updated');        
+            $mform->addElement('select', 'param5', get_string('triggerspecificevent', 'datalynxrule_eventnotification'), $checkboxes);      
         }
 
         $this->rule_definition();