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

2013-02-04 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/alerts/configure_alert_action.php: fixed sustitution the
	values in the macros when load a action.
	
	Fixes: #3603125




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7565 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-04 09:55:38 +00:00
parent 3750c7fc46
commit 421197f66f
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-02-04 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_action.php: fixed sustitution the
values in the macros when load a action.
Fixes: #3603125
2013-02-04 Miguel de Dios <miguel.dedios@artica.es> 2013-02-04 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/alert_list.list.php, * godmode/alerts/alert_list.list.php,

19
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -97,7 +97,7 @@ if ($id) {
$action = alerts_get_alert_action ($id); $action = alerts_get_alert_action ($id);
$name = $action['name']; $name = $action['name'];
$id_command = $action['id_alert_command']; $id_command = $action['id_alert_command'];
$group = $action ['id_group']; $group = $action ['id_group'];
$action_threshold = $action ['action_threshold']; $action_threshold = $action ['action_threshold'];
} }
@ -137,9 +137,10 @@ $table->data[3][0] = __('Threshold');
$table->data[3][1] = html_print_input_text ('action_threshold', $action_threshold, '', 5, 7, true); $table->data[3][1] = html_print_input_text ('action_threshold', $action_threshold, '', 5, 7, true);
$table->data[3][1] .= ' '.__('seconds') . ui_print_help_icon ('action_threshold', true, ui_get_full_url(false, false, false, false)); $table->data[3][1] .= ' '.__('seconds') . ui_print_help_icon ('action_threshold', true, ui_get_full_url(false, false, false, false));
$table->data[4][0] = __('Command preview'); $table->data[4][0] = __('Command preview');
$table->data[4][1] = html_print_textarea ('command_preview', 10, 30, '', 'disabled="disabled"', true); $table->data[4][1] = html_print_textarea ('command_preview', 10, 30, '',
'disabled="disabled"', true);
$row = 5; $row = 5;
for($i=1;$i<=10;$i++) { for ($i=1; $i<=10; $i++) {
$table->data['field'.$i][0] = html_print_image('images/spinner.gif',true); $table->data['field'.$i][0] = html_print_image('images/spinner.gif',true);
$table->data['field'.$i][1] = html_print_image('images/spinner.gif',true); $table->data['field'.$i][1] = html_print_image('images/spinner.gif',true);
// Store the value in a hidden to keep it on first execution // Store the value in a hidden to keep it on first execution
@ -168,8 +169,7 @@ ui_require_javascript_file ('pandora_alerts');
<script type="text/javascript"> <script type="text/javascript">
$(document).ready (function () { $(document).ready (function () {
<?php <?php
if ($id_command) if ($id_command) {
{
?> ?>
original_command = "<?php original_command = "<?php
$command = alerts_get_alert_command_command ($id_command); $command = alerts_get_alert_command_command ($id_command);
@ -183,6 +183,7 @@ $(document).ready (function () {
<?php <?php
} }
?> ?>
$("#id_command").change (function () { $("#id_command").change (function () {
values = Array (); values = Array ();
values.push ({name: "page", values.push ({name: "page",
@ -198,10 +199,10 @@ $(document).ready (function () {
render_command_preview (original_command); render_command_preview (original_command);
command_description = js_html_entity_decode (data["description"]); command_description = js_html_entity_decode (data["description"]);
render_command_description(command_description); render_command_description(command_description);
for(i=1;i<=10;i++) { for (i=1; i<=10; i++) {
var old_value = ''; var old_value = '';
// Only keep the value if is provided from hidden (first time) // Only keep the value if is provided from hidden (first time)
if($("[name=field"+i+"_value]").attr('id') == "hidden-field"+i+"_value") { if ($("[name=field"+i+"_value]").attr('id') == "hidden-field" + i + "_value") {
old_value = $("[name=field"+i+"_value]").val(); old_value = $("[name=field"+i+"_value]").val();
} }
@ -209,8 +210,10 @@ $(document).ready (function () {
$("[name=field"+i+"_value]").val(old_value); $("[name=field"+i+"_value]").val(old_value);
} }
render_command_preview(original_command);
$(".fields").keyup (function() { $(".fields").keyup (function() {
render_command_preview(original_command) render_command_preview(original_command);
}); });
}, },
"json" "json"