From 070cedf9eafafb61bcd508bd5de9a4fc4726ac1b Mon Sep 17 00:00:00 2001 From: Aleisha Date: Sun, 17 Apr 2016 23:45:26 +0000 Subject: [PATCH] Bug 16281: Remove the use of 'onclick' from Reports module To test: 1) Go to Reports -> Dictionary a) Attempt to delete a definition. Confirm the Ok and cancel buttons in confirm dialog work as expected 2) Go to Reports -> Build new a) On each step of building a report, confirm the back button works as expected b) Confirm add column and delete column on step 3 works as expected 3) Confirm deleting a report from the toolbar triggers confirm dialog and it works as expected 4) Create a report with an SQL error and run it. Confirm that the 'Return to previous page' link works as expected Sponsored-by: Catalyst IT --- .../prog/en/includes/reports-toolbar.inc | 12 ++++++++- .../prog/en/modules/reports/dictionary.tt | 13 ++++++++- .../en/modules/reports/guided_reports_start.tt | 28 ++++++++++++++------ 3 files changed, 43 insertions(+), 10 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 eb1d266..1e92c5a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -27,7 +27,7 @@ [% IF ( CAN_user_reports_create_reports ) %]

- + Delete

@@ -50,4 +50,14 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt index fbae1d3..d11c7f8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -5,6 +5,17 @@ @@ -82,7 +93,7 @@ var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this dictionary defi [% END %] 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 dee52ed..0ff2e8b 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 @@ -68,6 +68,18 @@ function load_group_subgroups () { $(document).ready(function(){ +$(".goback").on("click",function(){ + window.history.back(); +}); + +$("#addColumn").on("click",function(){ + addColumn(); +}); + +$("#delColumn").on("click",function(){ + delColumn(); +}); + [% IF (saved1) %] var rtable = $("#table_reports").dataTable($.extend(true, {}, dataTablesDefaults, { 'bAutoWidth': false, @@ -466,7 +478,7 @@ canned reports and writing custom SQL reports.