Commit b1b66103 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '5729-php-error-in-class_groupmanagement-inc' into '1.3-dev'

Resolve "PHP error in class_groupManagement.inc"

See merge request fusiondirectory/fd!71
Showing with 9 additions and 5 deletions
+9 -5
......@@ -187,19 +187,23 @@ class groupManagement extends simpleManagement
// Prepare event to be added
$events = argonautEventTypes::get_event_types();
if (isset($events[$event])) {
$this->dialogObject = new argonautAction($event, $mac);
$this->dialogObject = new argonautAction($event, $mac, !$triggered);
if ($triggered) {
$this->dialogObject->scheduled = FALSE;
$res = $o_queue->append($this->dialogObject);
if ($o_queue->is_error()) {
msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
} else {
msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
if (is_array($res) && count($res) > 1) {
msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (results were "%s")'), implode(', ', $res)), INFO_DIALOG);
} else {
if (is_array($res)) {
$res = $res[0];
}
msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
}
}
$this->closeDialogs();
} else {
$this->dialogObject->scheduled = TRUE;
}
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment