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

(-)a/C4/ImportBatch.pm (-7 / +6 lines)
Lines 41-47 use Koha::SearchEngine; Link Here
41
use Koha::SearchEngine::Indexer;
41
use Koha::SearchEngine::Indexer;
42
use Koha::Plugins::Handler;
42
use Koha::Plugins::Handler;
43
use Koha::Logger;
43
use Koha::Logger;
44
use List::MoreUtils qw( uniq );
44
use List::MoreUtils qw( uniq any );
45
45
46
our ( @ISA, @EXPORT_OK );
46
our ( @ISA, @EXPORT_OK );
47
47
Lines 850-861 sub _batchCommitItems { Link Here
850
            my ( $holdingbranchfield, $holdingbranchsubfield ) = GetMarcFromKohaField('items.holdingbranch');
850
            my ( $holdingbranchfield, $holdingbranchsubfield ) = GetMarcFromKohaField('items.holdingbranch');
851
            my $holdingbranch = $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
851
            my $holdingbranch = $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
852
852
853
            my @branches = map { $_->branchcode } Koha::Libraries->search->as_list;
853
            my @branches = Koha::Libraries->search->as_list;
854
            my %branches = map { $_ => 1 } @branches;
855
854
856
            my $missing_branchcode;
855
            my $missing_branchcode;
857
            $missing_branchcode = $homebranch    if ( !exists( $branches{$homebranch} ) );
856
            $missing_branchcode = $homebranch    if not any { $_->branchcode eq $homebranch } @branches;
858
            $missing_branchcode = $holdingbranch if ( !exists( $branches{$holdingbranch} ) );
857
            $missing_branchcode = $holdingbranch if not any { $_->branchcode eq $holdingbranch } @branches;
859
            if ($missing_branchcode) {
858
            if ($missing_branchcode) {
860
                $updsth->bind_param( 1, 'error' );
859
                $updsth->bind_param( 1, 'error' );
861
                $updsth->bind_param( 2, undef );
860
                $updsth->bind_param( 2, undef );
Lines 1290-1296 sub GetImportItemsBranches { Link Here
1290
        ORDER BY import_items_id";
1289
        ORDER BY import_items_id";
1291
    my @params;
1290
    my @params;
1292
    push( @params, $batch_id );
1291
    push( @params, $batch_id );
1293
    my $sth = $dbh->prepare_cached($query);
1292
    my $sth = $dbh->prepare($query);
1294
    $sth->execute(@params);
1293
    $sth->execute(@params);
1295
    my $results = $sth->fetchall_arrayref( {} );
1294
    my $results = $sth->fetchall_arrayref( {} );
1296
    my @branch;
1295
    my @branch;
Lines 1299-1305 sub GetImportItemsBranches { Link Here
1299
    foreach my $row (@$results) {
1298
    foreach my $row (@$results) {
1300
        my $item_marc    = MARC::Record->new_from_xml( StripNonXmlChars( $row->{'marcxml'} ), 'UTF-8', $row->{'encoding'} );
1299
        my $item_marc    = MARC::Record->new_from_xml( StripNonXmlChars( $row->{'marcxml'} ), 'UTF-8', $row->{'encoding'} );
1301
        push @branch, $item_marc->subfield( $homebranchfield,    $homebranchsubfield );
1300
        push @branch, $item_marc->subfield( $homebranchfield,    $homebranchsubfield );
1302
        push @branch, $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );;
1301
        push @branch, $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
1303
    }
1302
    }
1304
    $sth->finish();
1303
    $sth->finish();
1305
    return uniq @branch;
1304
    return uniq @branch;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt (-2 / +1 lines)
Lines 258-264 Link Here
258
                            <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" />
258
                            <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" />
259
                        </fieldset>
259
                        </fieldset>
260
                        [% IF ( missing_branches ) %]
260
                        [% IF ( missing_branches ) %]
261
                            <div class="dialog alert">There are some missing libraries in your installation:
261
                            <div class="dialog alert"><span>There are some missing libraries in your installation:</span>
262
                            [% FOREACH branche IN branches %]
262
                            [% FOREACH branche IN branches %]
263
                                <a href="/cgi-bin/koha/admin/branches.pl?op=add_form" target="_blank">
263
                                <a href="/cgi-bin/koha/admin/branches.pl?op=add_form" target="_blank">
264
                                    [% branche | html %]
264
                                    [% branche | html %]
265
- 

Return to bug 21272