2009-11-30 Miguel de Dios <miguel.dedios@artica.es>

* include/functions_ui.php: show the deault action with other style.
	Fixes: 2905966



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2146 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-11-30 15:42:57 +00:00
parent 958aea710b
commit 8e786e3604
2 changed files with 17 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2009-11-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php: show the deault action with other style.
Fixes: 2905966
2009-11-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_alerts.php: fix deletion of compound alerts in the

View File

@ -369,10 +369,20 @@ function format_alert_row ($alert, $compound = false, $agent = true, $url = '')
}
$data[$index['description']] .= $disabledHtmlStart . mb_substr (safe_input ($description), 0, 35) . $disabledHtmlEnd;
$actionDefault = get_db_value_sql("SELECT id_alert_action
FROM talert_templates WHERE id = " . $alert['id_alert_template']);
$actions = get_alert_agent_module_actions ($alert['id']);
$actionText = '<ul>';
foreach ($actions as $action)
$actionText .= '<li>' . $action['name'] . '</li>';
foreach ($actions as $action) {
$defaultTagIni = $defaultTagEnd = '';
if ($action['id'] == $actionDefault) {
$defaultTagIni = '<i>';
$defaultTagEnd = ' (' . __('default') . ') </i>';
}
$actionText .= '<li>' . $defaultTagIni . $action['name'] .
$defaultTagEnd . '</li>';
}
$actionText .= '</ul>';
$data[$index['action']] = $actionText;