arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Put custom reports back in

Browse Source
This commit is contained in:
dave 2010-03-15 06:02:25 +00:00
parent adf606f0d3
commit 76eefdf3cd
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/reports.php
View File

@ -180,6 +180,7 @@ function add_report()
function gen_report() { function gen_report() {
report_gen($('#report').val()); report_gen($('#report').val());
return false;
} }
var edit=false; var edit=false;
@ -312,7 +313,12 @@ $(document).ready(function() {
<? <?
/* Load available reports */ /* Load available reports */
$reports = report_load_all(); $reports = report_load_all();
foreach($report_custom as $id=>$r) {
$r['id'] = -$id;
$reports[-$id] = $r;
}
?> ?>
<hr /> <hr />
<h4><?=i18n("All Reports")?></h3> <h4><?=i18n("All Reports")?></h3>

9
admin/reports_gen.php
View File

@ -56,6 +56,15 @@ if(is_array($_GET['filter'])) {
switch($_GET['action']) { switch($_GET['action']) {
case 'dialog_gen': case 'dialog_gen':
if($id < 0) {
$u = "{$config['SFIABDIRECTORY']}/{$report_custom[-$id]['custom_url']}";
?>
<script type="text/javascript">
window.location.href="<?=$u?>";
</script>
<?
exit;
}
?> ?>
<div id="report_dialog_gen" title="Generate Report" style="display: none"> <div id="report_dialog_gen" title="Generate Report" style="display: none">
<div id="report_gen_tabs"> <div id="report_gen_tabs">