projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 819839f)
Bug 16281: Remove the use of 'onclick' from Reports module
authorAleisha <aleishaamohia@hotmail.com>
Sun, 17 Apr 2016 23:45:26 +0000 (23:45 +0000)
committerKyle M Hall <kyle@bywatersolutions.com>
Fri, 29 Apr 2016 10:58:28 +0000 (10:58 +0000)
EDIT: Removing unnecessary functions

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
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt patch | blob | history

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..fef1166 100644 (file)
--- 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 ) %]
             <div class="btn-group">
-                <a class="confirmdelete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved" onclick="return confirm(MSG_CONFIRM_DELETE);">
+                <a class="delete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved">
                     <i class="fa fa-remove"></i> Delete
                 </a>
             </div>
@@ -50,4 +50,10 @@
 
 <script type="text/javascript">
 var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this report? This cannot be undone.");
+
+$(document).ready(function(){
+    $(".delete").on("click",function(){
+        return confirmDelete(MSG_CONFIRM_DELETE);
+    });
+});
 </script>
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..c9e8752 100644 (file)
--- 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,13 @@
 <style type="text/css">fieldset.rows table { clear: none; margin: 0;}</style>
 <script type="text/javascript">
 var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this dictionary definition? This cannot be undone.");
+
+$(document).ready(function(){
+    $("#delete").on("click",function(){
+        return confirmDelete(MSG_CONFIRM_DELETE);
+    });
+});
+
 </script>
 </head>
 <body id="rep_dictionary" class="rep">
@@ -82,7 +89,7 @@ var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this dictionary defi
                         <td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl">
                        <input type="hidden" name="id" value="[% definition.id %]" />
                        <input type="hidden" name="phase" value="Delete Definition" />
-                        <button type="submit" name="submit" class="btn btn-mini" onclick="return confirm(MSG_CONFIRM_DELETE);"><i class="fa fa-trash"></i> Delete</button>
+                        <button type="submit" name="submit" class="btn btn-mini" id="delete"><i class="fa fa-trash"></i> Delete</button>
                        </form></td>
                        </tr>
                [% 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 0dd6c5c..a139f61 100644 (file)
--- 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.</p>
 
 <fieldset class="action">
     <input type="hidden" name="phase" value="Choose this type" />
-    <input type="button" name="back" value="&lt;&lt; Back" onclick="javascript:history.back()" />
+    <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
     <input type="submit" name="submit" value="Next &gt;&gt;" />
 </fieldset>
 </form>
@@ -514,8 +526,8 @@ canned reports and writing custom SQL reports.</p>
 [% END %]
 </optgroup>
 </select></div>
-<div style="width: 6.3em; float: right; margin-top: 100px"><input type="button" name="Add" value="Add" class="button" style="width:6em;" onclick="addColumn()" /><br />
-<input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" onclick="delColumn()" /></div>
+<div style="width: 6.3em; float: right; margin-top: 100px"><input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br />
+<input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" /></div>
 </div>
 
 <div class="yui-u">
@@ -526,7 +538,7 @@ canned reports and writing custom SQL reports.</p>
 <div class="yui-g">
 <fieldset class="action">
     <input type="hidden" name="phase" value="Choose these columns" />
-    <input type="button" name="back" value="&lt;&lt; Back" onclick="javascript:history.back()" />
+    <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
     <input type="submit" name="submit" value="Next &gt;&gt;" />
 </fieldset>
 </div>
@@ -599,7 +611,7 @@ canned reports and writing custom SQL reports.</p>
 [% END %]
 
 <fieldset class="action"><input type="hidden" name="phase" value="Choose these criteria" />
-    <input type="button" name="back" value="&lt;&lt; Back" onclick="javascript:history.back()" />
+    <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
     <input type="submit" name="submit" value="Next &gt;&gt;" /> </fieldset>
 </form>
 [% END %]
@@ -631,7 +643,7 @@ canned reports and writing custom SQL reports.</p>
 </table></fieldset>
 
 <fieldset class="action"><input type="hidden" name="phase" value="Choose these operations" />
-    <input type="button" name="back" value="&lt;&lt; Back" onclick="javascript:history.back()" />
+    <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
     <input type="submit" name="submit" value="Next &gt;&gt;" /></fieldset>
 </form>
 [% END %]
@@ -738,7 +750,7 @@ canned reports and writing custom SQL reports.</p>
         </form>
         <!-- Go back to editing -->
         <form action='/cgi-bin/koha/reports/guided_reports.pl'>
-            <button type="button" class="new" onclick="history.back()"><i class="fa fa-fw fa-pencil"></i> Edit SQL</button>
+            <button type="button" class="new goback"><i class="fa fa-fw fa-pencil"></i> Edit SQL</button>
         </form>
     </div>
 [% END %]
@@ -1005,7 +1017,7 @@ Sub report:<select name="subreport">
     [% ELSE %]
     [% END %]
     <div id="onerror_actions">
-        <a href="javascript:window.history.back()" class="button">Return to previous page</a>
+        <a class="button goback">Return to previous page</a>
     </div>
 [% END %]
 </div>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git