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

2009-12-09 Raul Mateos <raulofpandora@gmail.com> 

* godmode/reporting/reporting_builder.php: Print table of items only
	if the the tables has data, else print no items defined.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2186 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-12-09 13:49:12 +00:00
parent bc519097c0
commit df962dcbf7
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,6 +1,11 @@
2009-12-08 Miguel de Dios <miguel.dedios@artica.es>
2009-12-09 Raul Mateos <raulofpandora@gmail.com>
* godmode/reporting/reporting_builder.php: test empty title report before on
* godmode/reporting/reporting_builder.php: Print table of items only
if the the tables has data, else print no items defined.
2009-12-09 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php: Test empty title report before on
submit in javascript, and test empty this title in PHP.
Fixes: 2910627

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

@ -348,7 +348,7 @@ if ($edit_sla_report_content) {
if ($id_report) {
// Part 2 - Add new items to report
echo "<h2>".__('Add item to report')."</h2>";
echo "<h3>".__('Add item to report')."</h3>";
/* We're reusing some $table attributes */
$table->id = 'table-add-item';
@ -414,7 +414,6 @@ if ($edit_sla_report_content) {
echo "</form>";
// Part 3 - List of already assigned report items
echo "<h2>".__('Report items')."</h2>";
$table->id = 'table-assigned-reports';
$table->width = '90%';
$table->data = array ();
@ -436,7 +435,7 @@ if ($edit_sla_report_content) {
}
$report_contents = get_report_contents ($id_report);
if (sizeof ($report_contents)) {
$first_id = $report_contents[0]['id_rc'];
$last_id = $report_contents[sizeof ($report_contents) - 1]['id_rc'];
@ -465,6 +464,7 @@ if ($edit_sla_report_content) {
true, array ('title' => __('Down')));
$data[0] .= '</form>';
}
$data[1] = get_report_name ($report_content['type']);
$data[2] = get_agent_name ($report_content['id_agent']);
@ -502,7 +502,12 @@ if ($edit_sla_report_content) {
array_push ($table->data, $data);
}
}
print_table ($table);
if ($data) {
echo "<h3>".__('Report items')."</h3>";
print_table ($table);
} else {
echo "<div class='nf'>".__('No items defined')."</div>";
}
}
} else {
// Report LIST