View | Details | Raw Unified | Return to bug 14957
Collapse All | Expand All

(-)a/admin/marc-merge-rules.pl (+2 lines)
Lines 76-81 my ($template, $loggedinuser, $cookie) = get_template_and_user( Link Here
76
    }
76
    }
77
);
77
);
78
78
79
$template->param(script_name => $script_name);
80
79
my %cookies = parse CGI::Cookie($cookie);
81
my %cookies = parse CGI::Cookie($cookie);
80
our $sessionID = $cookies{'CGISESSID'}->value;
82
our $sessionID = $cookies{'CGISESSID'}->value;
81
83
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt (-21 / +23 lines)
Lines 26-32 function doSubmit(op, id) { Link Here
26
    }
26
    }
27
27
28
    var valid = true;
28
    var valid = true;
29
    if( op == 'add' || op == 'edit') {
29
    if (op == 'add' || op == 'edit') {
30
        var validate = [
30
        var validate = [
31
            $('#marc-merge-rules-form input[name="filter"]'),
31
            $('#marc-merge-rules-form input[name="filter"]'),
32
            $('#marc-merge-rules-form input[name="tag"]')
32
            $('#marc-merge-rules-form input[name="tag"]')
Lines 43-49 function doSubmit(op, id) { Link Here
43
        }
43
        }
44
    }
44
    }
45
45
46
    if(valid ) {
46
    if (valid) {
47
        $('#marc-merge-rules-form').submit();
47
        $('#marc-merge-rules-form').submit();
48
    }
48
    }
49
49
Lines 51-67 function doSubmit(op, id) { Link Here
51
}
51
}
52
52
53
$(document).ready(function(){
53
$(document).ready(function(){
54
    $('#doremove').on("click",function(){
54
    $('#doremove').on('click', function(){
55
        doSubmit('doremove');
55
        doSubmit('doremove');
56
    });
56
    });
57
    $('#doedit').on("click",function(){
57
    $('#doedit').on('click', function(){
58
        doSubmit('doedit', $("#doedit").attr('value'));
58
        doSubmit('doedit', $("#doedit").attr('value'));
59
    });
59
    });
60
    $('#add').on("click", function(){
60
    $('#add').on('click', function(){
61
        doSubmit('add');
61
        doSubmit('add');
62
        return false;
62
        return false;
63
    });
63
    });
64
    $('#btn_batchremove').on("click", function(){
64
    $('#btn_batchremove').on('click', function(){
65
        doSubmit('remove');
65
        doSubmit('remove');
66
    });
66
    });
67
67
Lines 136-156 $(document).ready(function(){ Link Here
136
      'delete': 0
136
      'delete': 0
137
    };
137
    };
138
138
139
    var merge_rules_label_to_value = {
139
    var merge_rules_label_to_value = {};
140
      'Add': 1,
140
    merge_rules_label_to_value[_("Add")] = 1;
141
      'Append': 1,
141
    merge_rules_label_to_value[_("Append")] = 1;
142
      'Remove': 1,
142
    merge_rules_label_to_value[_("Remove")] = 1;
143
      'Delete': 1,
143
    merge_rules_label_to_value[_("Delete")] = 1;
144
      'Skip': 0
144
    merge_rules_label_to_value[_("Skip")] = 0;
145
    };
145
146
    function hash_config(config) {
147
      return JSON.stringify(config, Object.keys(config).sort());
148
    }
146
149
147
    var merge_rules_preset_map = {};
150
    var merge_rules_preset_map = {};
148
    $.each(merge_rules_presets, function(preset, config) {
151
    $.each(merge_rules_presets, function(preset, config) {
149
      merge_rules_preset_map[JSON.stringify(config)] = preset;
152
      merge_rules_preset_map[hash_config(config)] = preset;
150
    });
153
    });
151
154
152
    function operations_config_merge_rule_preset(config) {
155
    function operations_config_merge_rule_preset(config) {
153
      return merge_rules_preset_map[JSON.stringify(config)] || '';
156
      return merge_rules_preset_map[hash_config(config)] || '';
154
    }
157
    }
155
158
156
    /* Set preset values according to operation config */
159
    /* Set preset values according to operation config */
Lines 162-168 $(document).ready(function(){ Link Here
162
        operations_config[$operation.data('operation')] = merge_rules_label_to_value[$operation.text()];
165
        operations_config[$operation.data('operation')] = merge_rules_label_to_value[$operation.text()];
163
      });
166
      });
164
      $('.rule-preset', $this).text(
167
      $('.rule-preset', $this).text(
165
        operations_config_merge_rule_preset(operations_config)
168
        operations_config_merge_rule_preset(operations_config) || _("Custom")
166
      );
169
      );
167
    });
170
    });
168
171
Lines 172-178 $(document).ready(function(){ Link Here
172
      var $parent_row = $(this).closest('tr');
175
      var $parent_row = $(this).closest('tr');
173
      $('.rule-operation-action-edit select', $parent_row).each(function() {
176
      $('.rule-operation-action-edit select', $parent_row).each(function() {
174
        var $this = $(this);
177
        var $this = $(this);
175
        operations_config[$this.attr('name')] = $this.val();
178
        operations_config[$this.attr('name')] = parseInt($this.val());
176
      });
179
      });
177
      $('select[name="preset"]', $parent_row).val(
180
      $('select[name="preset"]', $parent_row).val(
178
          operations_config_merge_rule_preset(operations_config)
181
          operations_config_merge_rule_preset(operations_config)
Lines 286-294 $(document).ready(function(){ Link Here
286
<p>Are you sure you want to remove the selected rule(s)?</p>
289
<p>Are you sure you want to remove the selected rule(s)?</p>
287
290
288
<form action="[% script_name %]" method="GET">
291
<form action="[% script_name %]" method="GET">
289
    <input type="submit" value="No, do not remove" class="deny"/>
292
    <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not remove</button>
290
</form>
293
</form>
291
<input type="button" value="Yes, remove" class="approve" id="doremove" />
294
    <button type="button" class="approve" id="doremove"><i class="fa fa-fw fa-check"></i> Yes, remove</button>
292
</div>
295
</div>
293
[% END %]
296
[% END %]
294
297
Lines 451-457 $(document).ready(function(){ Link Here
451
                </td>
454
                </td>
452
                <td class="actions">
455
                <td class="actions">
453
                    <button class="btn btn-sm" title="Save" id="doedit" value="[% rule.id | html %]"><i class="fa fa-check"></i> Save</button>
456
                    <button class="btn btn-sm" title="Save" id="doedit" value="[% rule.id | html %]"><i class="fa fa-check"></i> Save</button>
454
                    <a href="?"><button class="btn btn-sm" title="Cancel" ><i class="fa fa-times"></i> Cancel</button></a>
457
                    <button type="submit" class="btn btn-sm" title="Cancel" ><i class="fa fa-times"></i> Cancel</button>
455
                </td>
458
                </td>
456
                <td></td>
459
                <td></td>
457
            [% ELSE %]
460
            [% ELSE %]
458
- 

Return to bug 14957