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

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

* operation/events/events_list.php, operation/events/events.php: fixed
	nested forms incompatible with some browsers that fail when validate
	several events and some errors in javascript when validate individual error.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4170 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-04-05 12:36:38 +00:00
parent 5e7339a898
commit 049cdfe2fc
3 changed files with 22 additions and 7 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-04-04 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events_list.php, operation/events/events.php: fixed
nested forms incompatible with some browsers that fail when validate
several events and some errors in javascript when validate individual error.
2011-04-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_fsgraph.php: added check if loaded the class.

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

@ -13,7 +13,6 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
global $config;
@ -383,7 +382,7 @@ $(document).ready( function() {
},
function (data, status) {
if (data == "ok") {
$("#status_img_"+id).attr ("src", "images/spiner.gif");
$("#status_img_"+id).attr ("src", "images/spinner.gif");
location.reload();
} else {
$("#result")
@ -393,7 +392,7 @@ $(document).ready( function() {
},
"html"
);
toggleCommentForm(id);
//toggleCommentForm(id);
});
$("a.delete_event").click (function () {

18
pandora_console/operation/events/events_list.php
View File

@ -452,7 +452,7 @@ foreach ($result as $event) {
array_push ($table->data, $data);
//Hiden row with description form
$string = '<form method="post" action="'.$url.'&amp;section=list">';
$string = '';//$string = '<form method="post" action="'.$url.'&amp;section=list">';
$string .= '<table border="0" style="width:80%; margin-left: 10%;"><tr><td align="left" valign="top" width="30px">';
$string .= '<td align="right"><b>' . __('Comment:') . '</b></td>';
$string .= '<td align="left" width="450px"><b>' . print_textarea("comment_".$event["id_evento"], 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . '</b></td>';
@ -472,7 +472,7 @@ foreach ($result as $event) {
if($event["id_alert_am"] != 0) {
$string .= '<div class="standby_alert_checkbox" style="display: none">'.__('Set alert on standby').'<br>'.print_checkbox('standby-alert-'.$event["id_evento"], 'ff2', false, true).'</div>';
}
$string .= '</td></tr></table></form>';
$string .= '</td></tr></table>'; //</form>';
$data = array($string);
@ -598,7 +598,8 @@ echo '<div id="events_list">';
if (!empty ($table->data)) {
pagination ($total_events, $url."&pure=".$config["pure"], $offset, $pagination);
echo '<form method="post" action="'.$url.'&amp;section=validate">';
echo '<form method="post" id="form_events" action="'.$url.'&amp;section=validate">';
echo "<input type='hidden' name='delete' id='hidden_delete_events' value='0' />";
print_table ($table);
@ -607,7 +608,16 @@ if (!empty ($table->data)) {
print_submit_button (__('Change status'), 'validate_btn', false, 'class="sub ok"');
}
if (check_acl ($config["id_user"], 0,"IM") == 1) {
print_submit_button (__('Delete'), 'delete', false, 'class="sub delete"');
print_button(__('Delete'), 'delete_button', false, 'submit_delete();', 'class="sub delete"');
?>
<script type="text/javascript">
function submit_delete() {
$("#hidden_delete_events").val(1);
$("#form_events").submit();
}
</script>
<?php
}
echo '</div></form>';