fleshing report objects on schedul fetch on the server side

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6406 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm b/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm
index 7f277e1..152e6c0 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm
@@ -105,7 +105,11 @@ sub retrieve_schedules {
        my $search = { folder => $folderId };
        my $query = [
                { folder => $folderId },
-               { order_by => { rs => 'run_time DESC' } }
+               { 
+                       order_by => { rs => 'run_time DESC' } ,
+                       flesh => 1,
+                       flesh_fields => { rs => ['report'] }
+               }
        ];
 
        $query->[1]->{limit} = $limit if $limit;

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js
index 1a4066d..b47caac 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folder_window.js
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.js
@@ -399,15 +399,10 @@ oilsRptFolderWindow.prototype.fleshSchedules = function(list, idx) {
        oilsRptFetchUser(sched.runner(),
                function(user) {
                        sched.runner(user);
-                       oilsRptFetchReport(sched.report(),
-                               function(report) {
-                                       sched.report(report);
-                                       oilsRptFetchTemplate(report.template(),
-                                               function(template) {
-                                                       report.template(template);
-                                                       obj.fleshSchedules(list, ++idx);
-                                               }
-                                       );
+                       oilsRptFetchTemplate(sched.report().template(),
+                               function(template) {
+                                       sched.report().template(template);
+                                       obj.fleshSchedules(list, ++idx);
                                }
                        );
                }