From dd12fe0d5ddffd1753fc6b24624c1ba458588735 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 Dec 2015 10:54:55 -0500 Subject: [PATCH] Bug 16000 [Revised] Duplicate a report from the New Reports button This patch creates a combined edit/duplicate/delete toolbar menu option similar to the one on the bibliographic detail page. Also added is the "Schedule" link which was previously only available from the main list of saved reports. Also added is some deletion confirmation JavaScript for deletions initiated from the toolbar. To test, apply the patch and go to Reports -> Saved reports. - Click "Show" in the menu for any saved report. The toolbar which appears on this page should show the new menu items. - Confirm the behavior of all the buttons. - As you check the behavior of the button actions, check that the toolbar is shown and hidden appropriately for each action. - Confirm that the toolbar is correctly shown or hidden when building a guided report. - Confirm that the "Schedule" button is shown or hidden according to the logged-in user's "schedule_tasks" permission. - Confirm that clicking the "Delete" menu option triggers a JS confirmation. Revision passes the sql data to the template in the case of the "save_successful" screen. Signed-off-by: Christopher Brannon --- .../prog/en/includes/reports-toolbar.inc | 42 ++++++++++++-------- .../en/modules/reports/guided_reports_start.tt | 18 ++++++++- reports/guided_reports.pl | 1 + 3 files changed, 42 insertions(+), 19 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 373df25..46661c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -1,7 +1,7 @@
[% IF ( CAN_user_reports_create_reports ) %]
- +
[% END %] - [% IF ( showsql || execute || editsql || save_successful ) %] + [% IF ( showsql || execute || save_successful ) %] [% IF ( CAN_user_reports_create_reports ) %] - [% UNLESS ( editsql ) # Do not show edit button on edit page %] - - [% END %]
- - Duplicate - + +
[% END %] - [% IF ( CAN_user_reports_create_reports ) %] + [% IF ( CAN_user_tools_schedule_tasks ) %] + [% END %] + + [% IF ( save_successful ) %] + [% END %] [% UNLESS ( errors ) # Unless there are errors saving a report %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 0a7d80f..1b40d70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -167,6 +167,15 @@ $(document).ready(function(){ } }); + $("#deletereport").on("click",function(){ + $(".btn-group").removeClass("open"); + if(confirm(_("Are you sure you want to delete this saved report?"))){ + return true; + } else { + return false; + } + }); + [% IF (create || editsql || save) %] $("#select_group").change(function() { if($(this).attr('checked')) { @@ -230,7 +239,9 @@ $(document).ready(function(){ [% ELSIF ( showsql ) %]› Saved reports › SQL view [% ELSIF ( editsql ) %]› Saved reports › Edit SQL report [% ELSIF ( execute ) %]› Saved reports[% name %] Report -[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %]› Build a report +[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %] + [% guided = 1 %] + › Build a report [% IF ( build1 ) %]› Step 1 of 6: Choose a module [% ELSIF ( build2 ) %]› Step 2 of 6: Pick a report type [% ELSIF ( build3 ) %]› Step 3 of 6: Select columns for display @@ -245,7 +256,10 @@ $(document).ready(function(){
- [% INCLUDE "reports-toolbar.inc" %] + + [% UNLESS ( editsql || create || enter_params || guided || save ) %] + [% INCLUDE "reports-toolbar.inc" %] + [% END %] [% IF ( start ) %]

Guided reports

diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index 4b45f95..c6f9a61 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -240,6 +240,7 @@ elsif ( $phase eq 'Update SQL'){ $template->param( 'save_successful' => 1, 'reportname' => $reportname, + 'sql' => $sql, 'id' => $id, ); logaction( "REPORTS", "MODIFY", $id, "$reportname | $sql" ) if C4::Context->preference("ReportsLog"); -- 1.7.10.4