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

2011-06-14 Sergio Martin <sergio.martin@artica.es> 

* include/functions_events.php
	operation/events/events.php: Fixed multiple validation
	when events are grouped



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-06-14 11:45:17 +00:00
parent 0b61e885aa
commit 7b4e42008f
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_events.php
operation/events/events.php: Fixed multiple validation
when events are grouped
2011-06-14 Sergio Martin <sergio.martin@artica.es> 2011-06-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php * include/functions_graph.php

3
pandora_console/include/functions_events.php
View File

@ -157,10 +157,13 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
$id_event = (array) safe_int ($id_event, 1); $id_event = (array) safe_int ($id_event, 1);
/* We must validate all events like the selected */ /* We must validate all events like the selected */
if ($similars) { if ($similars) {
foreach ($id_event as $id) { foreach ($id_event as $id) {
$id_event = array_merge ($id_event, events_get_similar_ids ($id)); $id_event = array_merge ($id_event, events_get_similar_ids ($id));
} }
$id_event = array_unique($id_event);
} }
db_process_sql_begin (); db_process_sql_begin ();

3
pandora_console/operation/events/events.php
View File

@ -349,6 +349,7 @@ $(document).ready( function() {
var comment = $('#textarea_comment_'+id).val(); var comment = $('#textarea_comment_'+id).val();
var select_validate = $('#select_validate_'+id).val(); // 1 validate, 2 in process var select_validate = $('#select_validate_'+id).val(); // 1 validate, 2 in process
var checkbox_standby_alert = $('#checkbox-standby-alert-'+id).attr('checked'); var checkbox_standby_alert = $('#checkbox-standby-alert-'+id).attr('checked');
var similars = $('#group_rep').val();
if(!select_validate) { if(!select_validate) {
select_validate = 1; select_validate = 1;
@ -377,7 +378,7 @@ $(document).ready( function() {
"id" : id, "id" : id,
"comment" : comment, "comment" : comment,
"new_status" : select_validate, "new_status" : select_validate,
"similar" : <?php echo ($group_rep ? 1 : 0) ?> "similars" : similars
}, },
function (data, status) { function (data, status) {
if (data == "ok") { if (data == "ok") {