Bugzilla – Attachment 11809 Details for
Bug 7993
saved report with hierarchies
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Signed off patch
0003-Bug-7993-Several-bug-fixes.patch (text/plain), 2.87 KB, created by
Chris Cormack
on 2012-08-23 21:33:50 UTC
(
hide
)
Description:
Signed off patch
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2012-08-23 21:33:50 UTC
Size:
2.87 KB
patch
obsolete
>From 1a8b41594b33176debf92472da347c93714584f0 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Thu, 23 Aug 2012 13:36:15 +0200 >Subject: [PATCH] Bug 7993: Several bug fixes > >- Re-display text input for sql params that are not linked to a list of > values >- Fix passing report id to template > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >--- > reports/guided_reports.pl | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > >diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl >index b249a90..baadab0 100755 >--- a/reports/guided_reports.pl >+++ b/reports/guided_reports.pl >@@ -608,14 +608,16 @@ elsif ($phase eq 'Run this report'){ > -multiple => 0, > -tabindex => 1, > ); >- push @tmpl_parameters, {'entry' => $text, 'input' => $input }; >+ } else { >+ $input = '<input type="text" name="sql_params" />'; > } >+ push @tmpl_parameters, {'entry' => $text, 'input' => $input }; > } > $template->param('sql' => $sql, > 'name' => $name, > 'sql_params' => \@tmpl_parameters, > 'enter_params' => 1, >- 'reports' => $report, >+ 'reports' => $report->{id}, > ); > } else { > # OK, we have parameters, or there are none, we run the report >@@ -632,7 +634,7 @@ elsif ($phase eq 'Run this report'){ > my ($sth, $errors) = execute_query($sql, $offset, $limit); > my $total = nb_rows($sql) || 0; > unless ($sth) { >- die "execute_query failed to return sth for report $report: $sql"; >+ die "execute_query failed to return sth for report $report->{id}: $sql"; > } else { > my $headref = $sth->{NAME} || []; > my @headers = map { +{ cell => $_ } } @$headref; >@@ -644,14 +646,14 @@ elsif ($phase eq 'Run this report'){ > } > > my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0); >- my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report&phase=Run%20this%20report"; >+ my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report->{id}&phase=Run%20this%20report"; > if (@sql_params) { > $url = join('&sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params); > } > $template->param( > 'results' => \@rows, > 'sql' => $sql, >- 'id' => $report, >+ 'id' => $report->{id}, > 'execute' => 1, > 'name' => $name, > 'notes' => $notes, >-- >1.7.9.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7993
:
10394
|
10618
|
11656
|
11686
|
11688
|
11775
|
11776
|
11809
|
12095
|
12126