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

(-)a/authorities/merge.pl (-4 / +16 lines)
Lines 133-147 else { Link Here
133
133
134
            # Creating a loop for display
134
            # Creating a loop for display
135
135
136
            my @record1 = $recordObj1->createMergeHash($tagslib);
136
            my @records = (
137
            my @record2 = $recordObj2->createMergeHash($tagslib);
137
                {
138
                    recordid => $mergereference,
139
                    record => $recordObj1->record,
140
                    frameworkcode => $recordObj1->authtype,
141
                    display => $recordObj1->createMergeHash($tagslib),
142
                    reference => 1,
143
                },
144
                {
145
                    recordid => $notreference,
146
                    record => $recordObj2->record,
147
                    frameworkcode => $recordObj2->authtype,
148
                    display => $recordObj2->createMergeHash($tagslib),
149
                },
150
            );
138
151
139
            # Parameters
152
            # Parameters
140
            $template->param(
153
            $template->param(
141
                recordid1        => $mergereference,
154
                recordid1        => $mergereference,
142
                recordid2        => $notreference,
155
                recordid2        => $notreference,
143
                record1        => @record1,
156
                records        => \@records,
144
                record2        => @record2,
145
                framework      => $framework,
157
                framework      => $framework,
146
            );
158
            );
147
        }
159
        }
(-)a/cataloguing/merge.pl (-1 / +1 lines)
Lines 203-209 if ($merge) { Link Here
203
            my $frameworkcode = GetFrameworkCode($biblionumber);
203
            my $frameworkcode = GetFrameworkCode($biblionumber);
204
            my $recordObj = new Koha::MetadataRecord({'record' => $marcrecord, schema => $marcflavour});
204
            my $recordObj = new Koha::MetadataRecord({'record' => $marcrecord, schema => $marcflavour});
205
            my $record = {
205
            my $record = {
206
                biblionumber => $biblionumber,
206
                recordid => $biblionumber,
207
                record => $marcrecord,
207
                record => $marcrecord,
208
                frameworkcode => $frameworkcode,
208
                frameworkcode => $frameworkcode,
209
                display => $recordObj->createMergeHash($tagslib),
209
                display => $recordObj->createMergeHash($tagslib),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc (-10 / +10 lines)
Lines 1-16 Link Here
1
[% BLOCK sourcetab %]
1
[% BLOCK sourcetab %]
2
    <div id="tabrecord[% record.biblionumber %]">
2
    <div id="tabrecord[% record.recordid %]">
3
        <div class="record">
3
        <div class="record">
4
            <ul id="ulrecord[% record.biblionumber %]">
4
            <ul id="ulrecord[% record.recordid %]">
5
                [% FOREACH field IN record.display %]
5
                [% FOREACH field IN record.display %]
6
                  [% IF field.tag != biblionumbertag %]
6
                  [% IF field.tag != biblionumbertag %]
7
                    <li id="k[% field.key %]">
7
                    <li id="k[% field.key %]">
8
                        [% IF (tabrecord.reference) %]
8
                        [% IF (tabrecord.reference) %]
9
                            <input type="checkbox" checked="checked" class="fieldpick" id="rec_[% record.biblionumber %]_[% field.key %]" />
9
                            <input type="checkbox" checked="checked" class="fieldpick" id="rec_[% record.recordid %]_[% field.key %]" />
10
                        [% ELSE %]
10
                        [% ELSE %]
11
                            <input type="checkbox" class="fieldpick" id="rec_[% record.biblionumber %]_[% field.key %]" />
11
                            <input type="checkbox" class="fieldpick" id="rec_[% record.recordid %]_[% field.key %]" />
12
                        [% END %]
12
                        [% END %]
13
                        <label for="rec_[% record.biblionumber %]_[% field.key %]"><span class="field">[% field.tag %]</span></label>
13
                        <label for="rec_[% record.recordid %]_[% field.key %]"><span class="field">[% field.tag %]</span></label>
14
14
15
                        <input type="hidden" name="tag_[% field.tag %]_indicator1_[% field.key %]" value="[% field.indicator1 %]" />
15
                        <input type="hidden" name="tag_[% field.tag %]_indicator1_[% field.key %]" value="[% field.indicator1 %]" />
16
                        <input type="hidden" name="tag_[% field.tag %]_indicator2_[% field.key %]" value="[% field.indicator2 %]" />
16
                        <input type="hidden" name="tag_[% field.tag %]_indicator2_[% field.key %]" value="[% field.indicator2 %]" />
Lines 25-35 Link Here
25
                                [% FOREACH subfield IN field.subfield %]
25
                                [% FOREACH subfield IN field.subfield %]
26
                                    <li id="k[% subfield.subkey %]">
26
                                    <li id="k[% subfield.subkey %]">
27
                                        [% IF (tabrecord.reference) %]
27
                                        [% IF (tabrecord.reference) %]
28
                                            <input type="checkbox" checked="checked" class="subfieldpick" id="rec_[% record.biblionumber %]_[% subfield.subkey %]" />
28
                                            <input type="checkbox" checked="checked" class="subfieldpick" id="rec_[% record.recordid %]_[% subfield.subkey %]" />
29
                                        [% ELSE %]
29
                                        [% ELSE %]
30
                                            <input type="checkbox" class="subfieldpick" id="rec_[% record.biblionumber %]_[% subfield.subkey %]" />
30
                                            <input type="checkbox" class="subfieldpick" id="rec_[% record.recordid %]_[% subfield.subkey %]" />
31
                                        [% END %]
31
                                        [% END %]
32
                                        <label for="rec_[% record.biblionumber %]_[% subfield.subkey %]"><span class="subfield">[% subfield.subtag %]</span> / [% subfield.value %]</label>
32
                                        <label for="rec_[% record.recordid %]_[% subfield.subkey %]"><span class="subfield">[% subfield.subtag %]</span> / [% subfield.value %]</label>
33
                                        <input type="hidden" name="tag_[% field.tag %]_code_[% subfield.subtag %]_[% field.key %]_[% subfield.subkey %]" value="[% subfield.subtag %]" />
33
                                        <input type="hidden" name="tag_[% field.tag %]_code_[% subfield.subtag %]_[% field.key %]_[% subfield.subkey %]" value="[% subfield.subtag %]" />
34
                                        <input type="hidden" name="tag_[% field.tag %]_subfield_[% subfield.subtag %]_[% subfield.key %]_[% subfield.subkey %]" value="[% subfield.value |html%]" />
34
                                        <input type="hidden" name="tag_[% field.tag %]_subfield_[% subfield.subtag %]_[% subfield.key %]_[% subfield.subkey %]" value="[% subfield.value |html%]" />
35
                                    </li>
35
                                    </li>
Lines 50-57 Link Here
50
    <ul>
50
    <ul>
51
        [% FOREACH record IN sourcerecords %]
51
        [% FOREACH record IN sourcerecords %]
52
            <li>
52
            <li>
53
                <a href="#tabrecord[% record.biblionumber %]">
53
                <a href="#tabrecord[% record.recordid %]">
54
                    [% record.biblionumber %]
54
                    [% record.recordid %]
55
                    [% IF record.reference %](ref)[% END %]
55
                    [% IF record.reference %](ref)[% END %]
56
                </a>
56
                </a>
57
            </li>
57
            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt (-5 / +4 lines)
Lines 15-29 div#result { margin-top: 1em; } Link Here
15
15
16
    // When submiting the form
16
    // When submiting the form
17
    function mergeformsubmit() {
17
    function mergeformsubmit() {
18
        $("ul#ulrecord1").remove();
18
        $('#tabs').remove();
19
        $("ul#ulrecord2").remove();
19
    }
20
}
21
20
22
$(document).ready(function(){
21
$(document).ready(function(){
23
    // Getting marc structure via ajax
22
    // Getting marc structure via ajax
24
    tagslib = [];
23
    tagslib = [];
25
    $.getJSON("/cgi-bin/koha/authorities/merge_ajax.pl", {frameworkcode : "[% framework %]" }, function(json) {
24
    $.getJSON("/cgi-bin/koha/authorities/merge_ajax.pl", {frameworkcode : "[% framework %]" }, function(json) {
26
        tagslib = json;
25
        tagslib = json;
26
        rebuild_target($("#tabs"), $("#resultul"));
27
    });
27
    });
28
28
29
    $('.preview-merge-reference').click(function (ev) {
29
    $('.preview-merge-reference').click(function (ev) {
Lines 129-135 function changeFramework(fw) { Link Here
129
129
130
<div class="yui-g">
130
<div class="yui-g">
131
<div class="yui-u first">
131
<div class="yui-u first">
132
[% PROCESS mergesource %]
132
[% PROCESS mergesource sourcerecords=records %]
133
</div>
133
</div>
134
<div class="yui-u">
134
<div class="yui-u">
135
[% PROCESS mergetarget %]
135
[% PROCESS mergetarget %]
136
- 

Return to bug 15358