tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-07-05 Hirofumi Kosaka <kosaka@rworks.jp> 

* godmode/alerts/alert_list.builder.php: Small changes. Make
	alert action list sorted (in the same order of extra action
	list that appears at the defined alert list)

	Merged from branch 4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2013-07-05 09:12:07 +00:00
parent dc94b30e48
commit 58f62b2621
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-07-05 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/alerts/alert_list.builder.php: Small changes. Make
alert action list sorted (in the same order of extra action
list that appears at the defined alert list)
Merged from branch 4.0
2013-07-05 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/alerts/alert_list.builder.php: When creating new

2
pandora_console/godmode/alerts/alert_list.builder.php
View File

@ -108,7 +108,7 @@ if (!empty($groups_user)) {
}
$table->data[2][1] = '<div class="actions_container">';
$table->data[2][1] = html_print_select(index_array ($actions, 'id', 'name'),'action_select','','','','',true, '', false);
$table->data[2][1] = html_print_select(index_array ($actions, 'id', 'name'),'action_select','','','','',true, '', true);
$table->data[2][1] .= ' <span id="advanced_action" class="advanced_actions invisible">';
$table->data[2][1] .= __('Number of alerts match from').' ';
$table->data[2][1] .= html_print_input_text ('fires_min', '', '', 4, 10, true);