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

(-)a/cataloguing/merge.pl (-4 / +18 lines)
Lines 53-58 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
53
#------------------------
53
#------------------------
54
# Merging
54
# Merging
55
#------------------------
55
#------------------------
56
57
my %shelf;
58
if ($input->param("shelfname")){
59
    %shelf = (
60
        private => $input->param("shelf_private"),
61
        name    => $input->param("shelfname"),
62
        number  => $input->param("shelfnumber")
63
    );
64
}
56
if ($merge) {
65
if ($merge) {
57
66
58
    my $dbh = C4::Context->dbh;
67
    my $dbh = C4::Context->dbh;
Lines 182-191 if ($merge) { Link Here
182
191
183
    # Parameters
192
    # Parameters
184
    $template->param(
193
    $template->param(
185
        result => 1,
194
        result           => 1,
186
        report_records => \@report_records,
195
        report_records   => \@report_records,
187
        report_header => $report_header,
196
        report_header    => $report_header,
188
        ref_biblionumber => scalar $input->param('ref_biblionumber')
197
        ref_biblionumber => scalar $input->param('ref_biblionumber'),
198
        shelf            => \%shelf
189
    );
199
    );
190
200
191
#-------------------------
201
#-------------------------
Lines 255-260 if ($merge) { Link Here
255
        my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
265
        my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
256
        $template->param( frameworks => $frameworks );
266
        $template->param( frameworks => $frameworks );
257
    }
267
    }
268
    $template->param(
269
        biblionumbers => \@biblionumbers,
270
        shelf         => \%shelf
271
    );
258
}
272
}
259
273
260
if (@errors) {
274
if (@errors) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-1 / +34 lines)
Lines 17-23 div#result { margin-top: 1em; } Link Here
17
<body id="cat_merge" class="cat">
17
<body id="cat_merge" class="cat">
18
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'header.inc' %]
19
[% INCLUDE 'cataloging-search.inc' %]
19
[% INCLUDE 'cataloging-search.inc' %]
20
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Merging records</div>
20
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a>&rsaquo;
21
22
  [% IF shelf %]
23
    <a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a>&rsaquo;
24
    [% IF shelf.private %]
25
      <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=1">Your lists</a>
26
    [% ELSE %]
27
      <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;category=2">Public lists</a>
28
    [% END %]
29
    &rsaquo;<a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.number | uri %]" > Contents of <i>[% shelf.name | html %]</i></a>
30
    &rsaquo;
31
    [% IF result %]
32
      Results
33
    [% ELSE %]
34
      Merging records
35
    [% END %]
36
  [% ELSE %]
37
    <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Merging records
38
  [% END %]
39
</div>
21
40
22
<div class="main container-fluid">
41
<div class="main container-fluid">
23
    <div class="row">
42
    <div class="row">
Lines 122-127 div#result { margin-top: 1em; } Link Here
122
    [% FOREACH record IN records %]
141
    [% FOREACH record IN records %]
123
        <input type="hidden" name="biblionumber" value="[% record.biblionumber | html %]" />
142
        <input type="hidden" name="biblionumber" value="[% record.biblionumber | html %]" />
124
    [% END %]
143
    [% END %]
144
145
    [% IF shelf %]
146
        <input type="hidden" value="[% shelf.private | html %]" name="shelf_private" />
147
        <input type="hidden" value="[% shelf.name | html %]" name="shelfname" />
148
        <input type="hidden" value="[% shelf.number | html %]" name="shelfnumber" />
149
    [% END %]
150
125
    <fieldset class="action">
151
    <fieldset class="action">
126
        <input type="submit" value="Next" />
152
        <input type="submit" value="Next" />
127
    </fieldset>
153
    </fieldset>
Lines 168-173 div#result { margin-top: 1em; } Link Here
168
[% END %]
194
[% END %]
169
<input type="hidden" name="frameworkcode" value="[% framework | html %]" />
195
<input type="hidden" name="frameworkcode" value="[% framework | html %]" />
170
196
197
[% IF shelf %]
198
    <input type="hidden" value="[% shelf.private | html %]" name="shelf_private" />
199
    <input type="hidden" value="[% shelf.name | html %]" name="shelfname" />
200
    <input type="hidden" value="[% shelf.number | html %]" name="shelfnumber" />
201
    <input type="hidden" value="1" name="result" />
202
[% END %]
203
171
<fieldset class="action">
204
<fieldset class="action">
172
    <input type="submit" name="merge" value="Merge" />
205
    <input type="submit" name="merge" value="Merge" />
173
    <label for="report_fields">Fields to display in report:</label>
206
    <label for="report_fields">Fields to display in report:</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-2 / +4 lines)
Lines 646-652 Link Here
646
                $(checkboxes).each(function() {
646
                $(checkboxes).each(function() {
647
                    params.push('biblionumber=' + $(this).val());
647
                    params.push('biblionumber=' + $(this).val());
648
                });
648
                });
649
                var url = '/cgi-bin/koha/cataloguing/merge.pl?' + params.join('&');
649
                var url = '/cgi-bin/koha/cataloguing/merge.pl?' + params.join('&')
650
                [% IF shelf %]
651
                    + '&shelf_private=[% shelf.is_private | html %]&shelfname=[% shelf.shelfname | html %]&shelfnumber=[% shelf.shelfnumber | html %]'
652
                [% END %];
650
                location.href = url;
653
                location.href = url;
651
            }
654
            }
652
            return false;
655
            return false;
653
- 

Return to bug 22992