tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-24 06:15:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

2010-08-23 Junichi Satoh <junichi@rworks.jp>

Browse Source 
* godmode/alert/alert_list.php, godmode/alert/alert_list.list.php:
	Added 'Enabled/Disabled' selection to alert filter.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3167 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2010-08-23 02:04:21 +00:00
parent 96886d6d37
commit cc33ff584f
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2010-08-23 Junichi Satoh <junichi@rworks.jp>
* godmode/alert/alert_list.php, godmode/alert/alert_list.list.php:
Added 'Enabled/Disabled' selection to alert filter.
2010-08-23 Junichi Satoh <junichi@rworks.jp> 2010-08-23 Junichi Satoh <junichi@rworks.jp>
* godmode/alert/alert_compounds.php: Fixed the problem alert compounds * godmode/alert/alert_compounds.php: Fixed the problem alert compounds

10
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -86,6 +86,14 @@ echo "<div id='alert_control' style='display:none'>\n";
echo "</td>"; echo "</td>";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n";
echo "<td>".__('Enabled / Disabled')."</td><td>";
$ed_list = array ();
$ed_list[0] = __('Enable');
$ed_list[1] = __('Disable');
print_select ($ed_list, 'enabledisable', $enabledisable, '', __('All'), -1);
echo "</td></tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td colspan='6' align='right'>"; echo "<td colspan='6' align='right'>";
print_submit_button (__('Update'), '', false, 'class="sub upd"'); print_submit_button (__('Update'), '', false, 'class="sub upd"');
@ -123,6 +131,8 @@ if ($searchFlag) {
WHERE t1.nombre LIKE '" . trim($agentName) . "')"; WHERE t1.nombre LIKE '" . trim($agentName) . "')";
if ($actionID != -1) if ($actionID != -1)
$where .= " AND id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = " . $actionID . ")"; $where .= " AND id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = " . $actionID . ")";
if ($enabledisable != -1)
$where .= " AND talert_template_modules.disabled =" . $enabledisable;
} }
$total = get_agent_alerts_simple (array_keys ($agents), false, $total = get_agent_alerts_simple (array_keys ($agents), false,

1
pandora_console/godmode/alerts/alert_list.php
View File

@ -55,6 +55,7 @@ $fieldContent = get_parameter('field_content','');
$searchType = get_parameter('search_type',''); $searchType = get_parameter('search_type','');
$priority = get_parameter('priority',''); $priority = get_parameter('priority','');
$searchFlag = get_parameter('search',0); $searchFlag = get_parameter('search',0);
$enabledisable = get_parameter('enabledisable','');
$messageAction = ''; $messageAction = '';