From 87d53fa2e5a9db74a95b7aad0a30033f05c64f8a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 1 Aug 2016 11:15:33 -0400 Subject: [PATCH] Bug 17012 - Remove more event attributes from administration templates MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit There are several administration templates which still contain event attributes. This patch move event definition to the JavaScript. To test you must have the SMSSendDriver system preference set to "Email." Apply the patch and go to Administration. - In Global system preferences, change the value of any input or select and then click the "Cancel" link for that section. After confirming your choice, the page should reload with your changes reset. - In Circulation and fine rules, edit any existing rule. In the editing row, click the "Clear" button. The data for that rule should be cleared. - In Transport cost matrix, make any change to the matrix. Submitting the form should work correctly. - In MARC bibliographic framework, choose 'MARC structure' for any framework. - Checking or unchecking the 'Display only used tags/subfields' checkbox should reload the page and change the display according to your choice. - In Did you mean?, make changes to the existing configuration. - Clicking "Cancel" should reload the page and discard your changes. - Clicking "Save configuration" should correcly save your changes. - In SMS cellular providers, click to edit any existing provider. Clicking the "Cancel" link should cancel the editing process and return you to the list of providers. Signed-off-by: Frédéric Demians Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../intranet-tmpl/prog/en/modules/admin/didyoumean.tt | 10 +++++++++- .../prog/en/modules/admin/marctagstructure.tt | 9 +++++++-- .../intranet-tmpl/prog/en/modules/admin/preferences.tt | 6 +++++- .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 6 +++++- .../prog/en/modules/admin/sms_providers.tt | 2 +- .../prog/en/modules/admin/transport-cost-matrix.tt | 5 ++++- koha-tmpl/intranet-tmpl/prog/js/sms_providers.js | 6 +++++- 7 files changed, 36 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt index 3b565f97ee..0fb602d288 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -29,6 +29,14 @@ .addClass( "ui-widget-header ui-corner-all" ) .end() .find( ".plugindesc" ); + $(".save-all").on("click",function(e){ + e.preventDefault(); + yesimeant(); + }); + $(".force_reload").on("click",function(e){ + e.preventDefault(); + window.location.reload(true); + }); }); function yesimeant() { @@ -93,7 +101,7 @@ Intranet [% PROCESS pluginlist plugins=INTRApluginlist type='intranet' %] -
Cancel
+
Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 1f0a5d8c83..d1823549b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -19,6 +19,11 @@ $(document).ready(function() { ], "sPaginationType": "four_button" })); + $("#select_display").on("change",function(){ + var checked = $(this).prop("checked") ? 1: 0; + $.cookie('marctagstructure_selectdisplay', checked); + this.form.submit(); + }); }); //]]> @@ -174,9 +179,9 @@ $(document).ready(function() {

[% IF ( select_display ) %] - + [% ELSE %] - + [% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt index 8f1e824b80..22fb0011ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -25,6 +25,10 @@ countSelected: _("# of % selected"), noMatchesFound: _("No matches found") } ); + $(".force_reload").on("click",function(e){ + e.preventDefault(); + window.location.reload(true); + }); }); // This is here because of its dependence on template variables, everything else should go in js/pages/preferences.js - jpw var to_highlight = "[% searchfield |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; @@ -179,7 +183,7 @@ [% IF ( loop.last ) %][% END %] [% END %] [% END %] -
Cancel
+
Cancel
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 4a941a7af2..9e87404d0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -101,6 +101,10 @@ $(document).ready(function() { $("#default-circulation-rules tr:last td:eq(1) select").prop('disabled', true); return false; }); + $(".clear_edit").on("click",function(e){ + e.preventDefault(); + clear_edit(); + }); }); //]]> @@ -355,7 +359,7 @@ $(document).ready(function() { - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt index 2979b5162f..3e991f94e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -90,7 +90,7 @@
- Cancel + Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt index 87a1c151f5..0231f641fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt @@ -52,6 +52,9 @@ $(document).ready(function(){ $("body").on("change",".disable_transport_cost",function(){ disable_transport_cost_chg(this); }); + $("#cost_matrix_form").on("submit",function(){ + return form_submit(this); + }); }) //]]> @@ -89,7 +92,7 @@ $(document).ready(function(){ [% END %] -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js b/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js index bccedeb532..3fe6f76fa5 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js +++ b/koha-tmpl/intranet-tmpl/prog/js/sms_providers.js @@ -20,6 +20,10 @@ $(document).ready(function() { delete_provider( providerid ); } }); + $(".cancel_edit").on("click",function(e){ + e.preventDefault(); + cancel_edit(); + }); }); function clear_form(){ @@ -70,4 +74,4 @@ function delete_provider( id, users ) { $("#id").val( id ); $("#sms_form").submit(); } -} \ No newline at end of file +} -- 2.39.5