From 4b3df96638e432678f8922ba92f6901878b176df Mon Sep 17 00:00:00 2001 From: Srdjan Jankovic Date: Fri, 1 Apr 2011 16:13:53 +1300 Subject: [PATCH] wr78692 (bug 6024): add "Run report" link on the new report creation success page --- C4/Reports/Guided.pm | 9 ++++++--- .../en/modules/reports/guided_reports_start.tmpl | 3 +++ reports/guided_reports.pl | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm index 7231457..4c6cbbb 100644 --- a/C4/Reports/Guided.pm +++ b/C4/Reports/Guided.pm @@ -468,7 +468,8 @@ sub execute_query ($;$$$) { =item save_report($sql,$name,$type,$notes) -Given some sql and a name this will saved it so that it can resued +Given some sql and a name this will saved it so that it can reused +Returns id of the newly created report =cut @@ -478,8 +479,10 @@ sub save_report { $sql =~ s/(\s*\;\s*)$//; # removes trailing whitespace and /;/ my $query = "INSERT INTO saved_sql (borrowernumber,date_created,last_modified,savedsql,report_name,type,notes) VALUES (?,now(),now(),?,?,?,?)"; - my $sth = $dbh->prepare($query); - $sth->execute( $borrowernumber, $sql, $name, $type, $notes ); + $dbh->do( $query, undef, $borrowernumber, $sql, $name, $type, $notes ); + my $id = $dbh->selectrow_array("SELECT max(id) FROM saved_sql WHERE borrowernumber=? AND report_name=?", undef, + $borrowernumber, $name); + return $id; } sub update_sql { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl index eb8d4fb..705fd6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl @@ -617,6 +617,9 @@ Sub report: