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

2008-06-17 Esteban Sanchez <estebans@artica.es> 

* godmode/reporting/reporting_builder.php: Changing the group of a
        report is not allowed. It will imply removing all the report contents
        that belongs to an agent of the group. Fixed an error on javascript
        changing the group.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@870 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
esanchezm 2008-06-17 14:43:15 +00:00
parent e59a524f82
commit ea980468d4
2 changed files with 18 additions and 6 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 @@
2008-06-17 Esteban Sanchez <estebans@artica.es>
* godmode/reporting/reporting_builder.php: Changing the group of a
report is not allowed. It will imply removing all the report contents
that belongs to an agent of the group. Fixed an error on javascript
changing the group.
2008-06-17 Esteban Sanchez <estebans@artica.es> 2008-06-17 Esteban Sanchez <estebans@artica.es>
* ajax.php: Added to repository. AJAX interface for Pandora. A new * ajax.php: Added to repository. AJAX interface for Pandora. A new

17
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -170,10 +170,10 @@ if ($create_report) {
// Update report // Update report
if ($update_report) { if ($update_report) {
$sql = sprintf ('UPDATE treport SET name = "%s", $sql = sprintf ('UPDATE treport SET name = "%s",
description = "%s", private = %d, id_group = %d description = "%s", private = %d
WHERE id_report = %d', WHERE id_report = %d',
$report_name, $report_description, $report_name, $report_description,
$report_private, $report_id_group, $id_report); $report_private, $id_report);
$result = mysql_query ($sql); $result = mysql_query ($sql);
if ($result) if ($result)
echo "<h3 class=suc>".lang_string ('modify_ok')."</h3>"; echo "<h3 class=suc>".lang_string ('modify_ok')."</h3>";
@ -320,9 +320,14 @@ if ($edit_sla_report_content) {
$table->data[0][0] = lang_string ('report_name'); $table->data[0][0] = lang_string ('report_name');
$table->data[0][1] = print_input_text ('report_name', $report_name, '', 35, 150, true); $table->data[0][1] = print_input_text ('report_name', $report_name, '', 35, 150, true);
$table->data[1][0] = lang_string ('group'); $table->data[1][0] = lang_string ('group');
$table->data[1][1] = print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo ORDER BY nombre', if ($report_id_group) {
'report_id_group', $report_id_group, '', '--', 0, true); /* Changing the group is not allowed. */
$table->data[1][1] .= '<span id="icon_preview">'; $table->data[1][1] = dame_grupo ($report_id_group);
} else {
$table->data[1][1] = print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo ORDER BY nombre',
'report_id_group', $report_id_group, '', '--', 0, true);
}
$table->data[1][1] .= ' <span id="icon_preview">';
if ($report_id_group) { if ($report_id_group) {
$table->data[1][1] .= '<img src="images/groups_small/'.dame_grupo_icono ($report_id_group).'.png" />'; $table->data[1][1] .= '<img src="images/groups_small/'.dame_grupo_icono ($report_id_group).'.png" />';
} }
@ -618,7 +623,7 @@ function group_changed () {
$(document).ready (function () { $(document).ready (function () {
$('#id_agent').change (agent_changed); $('#id_agent').change (agent_changed);
$('#type').change (report_type_changed); $('#type').change (report_type_changed);
$('#id_group').change (group_changed); $('#report_id_group').change (group_changed);
}); });
</script> </script>