@@ -, +, @@ - 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. --- .../prog/en/includes/reports-toolbar.inc | 44 ++++++++++++++-------- .../en/modules/reports/guided_reports_start.tt | 18 ++++++++- 2 files changed, 45 insertions(+), 17 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ a/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 ) %] - [% UNLESS ( editsql ) # Do not show edit button on edit page %] - [% IF ( CAN_user_reports_create_reports ) %] -
- - Edit - -
- [% END %] - [% END %] + [% IF ( showsql || execute || save_successful ) %] [% IF ( CAN_user_reports_create_reports ) %]
- - Delete - + + +
+ [% END %] + + [% IF ( CAN_user_tools_schedule_tasks ) %] +
+ Schedule +
+ [% END %] + + [% IF ( save_successful ) %] +
+ Show
[% END %] [% UNLESS ( errors ) # Unless there are errors saving a report %]
- Run report + Run report
[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/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

--