Revision: 1893
http://mrbs.svn.sourceforge.net/mrbs/?rev=1893&view=rev
Author: cimorrison
Date: 2011-08-27 16:13:02 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
Fixed bug which resulted in invalid Ajax data when the Summary table is also
selected
Modified Paths:
--------------
mrbs/branches/datatables/web/report.php
Modified: mrbs/branches/datatables/web/report.php
===================================================================
--- mrbs/branches/datatables/web/report.php 2011-08-27 15:42:16 UTC (rev
1892)
+++ mrbs/branches/datatables/web/report.php 2011-08-27 16:13:02 UTC (rev
1893)
@@ -1391,7 +1391,7 @@
report_row($row, $sortby);
}
- if ($summarize & SUMMARY)
+ if (!$ajax && ($summarize & SUMMARY))
{
(empty($row['enable_periods']) ?
accumulate($row, $count, $hours, $report_start, $report_end,
@@ -1407,7 +1407,7 @@
close_report();
}
- if ($summarize & SUMMARY)
+ if (!$ajax && ($summarize & SUMMARY))
{
do_summary($count, $hours, $room_hash, $name_hash);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
