Bugzilla – Attachment 51474 Details for
Bug 16388
Move option to download report into reports toolbar
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16388: Use existing 'execute' parameter instead of creating a new one
Bug-16388-Use-existing-execute-parameter-instead-o.patch (text/plain), 2.22 KB, created by
Jonathan Druart
on 2016-05-13 14:30:33 UTC
(
hide
)
Description:
Bug 16388: Use existing 'execute' parameter instead of creating a new one
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-05-13 14:30:33 UTC
Size:
2.22 KB
patch
obsolete
>From 45cf688c1ca50bb5659bf3cda3c276627671a438 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 13 May 2016 15:28:50 +0100 >Subject: [PATCH] Bug 16388: Use existing 'execute' parameter instead of > creating a new one > >An existing 'execute' parameter is already passed to the template when >we need to display the 'Download' button, so let's use it instead of >creating a new one. > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc | 4 ++-- > reports/guided_reports.pl | 1 - > 2 files changed, 2 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index a24fcb9..d74d52b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >@@ -9,7 +9,7 @@ > </div> > [% END %] > >- [% IF ( showsql || execute || editsql || save_successful || runreport ) %] >+ [% IF ( showsql || execute || editsql || save_successful ) %] > [% IF ( CAN_user_reports_create_reports ) %] > [% UNLESS ( editsql ) # Do not show edit button on edit page %] > <div class="btn-group"> >@@ -46,7 +46,7 @@ > </div> > [% END %] > >- [% IF ( runreport ) %] >+ [% IF ( execute ) %] > <div class="btn-group"> > <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button> > <ul class="dropdown-menu"> >diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl >index 8fa0811..75040f4 100755 >--- a/reports/guided_reports.pl >+++ b/reports/guided_reports.pl >@@ -787,7 +787,6 @@ elsif ($phase eq 'Run this report'){ > $url = join('&sql_params=', $url, map { URI::Escape::uri_escape_utf8($_) } @sql_params); > } > $template->param( >- 'runreport' => 1, > 'results' => \@rows, > 'sql' => $sql, > 'id' => $report_id, >-- >2.7.0
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 16388
:
50977
|
50990
|
51450
|
51456
|
51473
| 51474