From 96f374804e877d191f7ca3a144677ce13f2ba0ab Mon Sep 17 00:00:00 2001 From: David Gustafsson Date: Thu, 31 Oct 2019 13:19:54 +0100 Subject: [PATCH] Bug 14957: Add icons for confirmation dialog and set preset based on actions configuration --- admin/marc-merge-rules.pl | 2 + .../prog/en/modules/admin/marc-merge-rules.tt | 43 ++++++++++++---------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/admin/marc-merge-rules.pl b/admin/marc-merge-rules.pl index dd2a055fa4..0c9a5433fe 100755 --- a/admin/marc-merge-rules.pl +++ b/admin/marc-merge-rules.pl @@ -76,6 +76,8 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user( } ); +$template->param(script_name => $script_name); + my %cookies = parse CGI::Cookie($cookie); our $sessionID = $cookies{'CGISESSID'}->value; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt index 64f0530d91..5300b351d6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt @@ -26,7 +26,7 @@ function doSubmit(op, id) { } var valid = true; - if( op == 'add' || op == 'edit') { + if (op == 'add' || op == 'edit') { var validate = [ $('#marc-merge-rules-form input[name="filter"]'), $('#marc-merge-rules-form input[name="tag"]') @@ -43,7 +43,7 @@ function doSubmit(op, id) { } } - if(valid ) { + if (valid) { $('#marc-merge-rules-form').submit(); } @@ -51,17 +51,17 @@ function doSubmit(op, id) { } $(document).ready(function(){ - $('#doremove').on("click",function(){ + $('#doremove').on('click', function(){ doSubmit('doremove'); }); - $('#doedit').on("click",function(){ + $('#doedit').on('click', function(){ doSubmit('doedit', $("#doedit").attr('value')); }); - $('#add').on("click", function(){ + $('#add').on('click', function(){ doSubmit('add'); return false; }); - $('#btn_batchremove').on("click", function(){ + $('#btn_batchremove').on('click', function(){ doSubmit('remove'); }); @@ -136,21 +136,24 @@ $(document).ready(function(){ 'delete': 0 }; - var merge_rules_label_to_value = { - 'Add': 1, - 'Append': 1, - 'Remove': 1, - 'Delete': 1, - 'Skip': 0 - }; + var merge_rules_label_to_value = {}; + merge_rules_label_to_value[_("Add")] = 1; + merge_rules_label_to_value[_("Append")] = 1; + merge_rules_label_to_value[_("Remove")] = 1; + merge_rules_label_to_value[_("Delete")] = 1; + merge_rules_label_to_value[_("Skip")] = 0; + + function hash_config(config) { + return JSON.stringify(config, Object.keys(config).sort()); + } var merge_rules_preset_map = {}; $.each(merge_rules_presets, function(preset, config) { - merge_rules_preset_map[JSON.stringify(config)] = preset; + merge_rules_preset_map[hash_config(config)] = preset; }); function operations_config_merge_rule_preset(config) { - return merge_rules_preset_map[JSON.stringify(config)] || ''; + return merge_rules_preset_map[hash_config(config)] || ''; } /* Set preset values according to operation config */ @@ -162,7 +165,7 @@ $(document).ready(function(){ operations_config[$operation.data('operation')] = merge_rules_label_to_value[$operation.text()]; }); $('.rule-preset', $this).text( - operations_config_merge_rule_preset(operations_config) + operations_config_merge_rule_preset(operations_config) || _("Custom") ); }); @@ -172,7 +175,7 @@ $(document).ready(function(){ var $parent_row = $(this).closest('tr'); $('.rule-operation-action-edit select', $parent_row).each(function() { var $this = $(this); - operations_config[$this.attr('name')] = $this.val(); + operations_config[$this.attr('name')] = parseInt($this.val()); }); $('select[name="preset"]', $parent_row).val( operations_config_merge_rule_preset(operations_config) @@ -286,9 +289,9 @@ $(document).ready(function(){

Are you sure you want to remove the selected rule(s)?

- +
- + [% END %] @@ -451,7 +454,7 @@ $(document).ready(function(){ - + [% ELSE %] -- 2.11.0