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

(-)a/C4/ImportBatch.pm (-7 / +6 lines)
Lines 45-51 use Koha::SearchEngine; Link Here
45
use Koha::SearchEngine::Indexer;
45
use Koha::SearchEngine::Indexer;
46
use Koha::Plugins::Handler;
46
use Koha::Plugins::Handler;
47
use Koha::Logger;
47
use Koha::Logger;
48
use List::MoreUtils qw( uniq );
48
use List::MoreUtils qw( uniq any );
49
49
50
our ( @ISA, @EXPORT_OK );
50
our ( @ISA, @EXPORT_OK );
51
51
Lines 874-885 sub _batchCommitItems { Link Here
874
            my ( $holdingbranchfield, $holdingbranchsubfield ) = GetMarcFromKohaField('items.holdingbranch');
874
            my ( $holdingbranchfield, $holdingbranchsubfield ) = GetMarcFromKohaField('items.holdingbranch');
875
            my $holdingbranch = $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
875
            my $holdingbranch = $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
876
876
877
            my @branches = map { $_->branchcode } Koha::Libraries->search->as_list;
877
            my @branches = Koha::Libraries->search->as_list;
878
            my %branches = map { $_ => 1 } @branches;
879
878
880
            my $missing_branchcode;
879
            my $missing_branchcode;
881
            $missing_branchcode = $homebranch    if ( !exists( $branches{$homebranch} ) );
880
            $missing_branchcode = $homebranch    if not any { $_->branchcode eq $homebranch } @branches;
882
            $missing_branchcode = $holdingbranch if ( !exists( $branches{$holdingbranch} ) );
881
            $missing_branchcode = $holdingbranch if not any { $_->branchcode eq $holdingbranch } @branches;
883
            if ($missing_branchcode) {
882
            if ($missing_branchcode) {
884
                $updsth->bind_param( 1, 'error' );
883
                $updsth->bind_param( 1, 'error' );
885
                $updsth->bind_param( 2, undef );
884
                $updsth->bind_param( 2, undef );
Lines 1320-1326 sub GetImportItemsBranches { Link Here
1320
        ORDER BY import_items_id";
1319
        ORDER BY import_items_id";
1321
    my @params;
1320
    my @params;
1322
    push( @params, $batch_id );
1321
    push( @params, $batch_id );
1323
    my $sth = $dbh->prepare_cached($query);
1322
    my $sth = $dbh->prepare($query);
1324
    $sth->execute(@params);
1323
    $sth->execute(@params);
1325
    my $results = $sth->fetchall_arrayref( {} );
1324
    my $results = $sth->fetchall_arrayref( {} );
1326
    my @branch;
1325
    my @branch;
Lines 1329-1335 sub GetImportItemsBranches { Link Here
1329
    foreach my $row (@$results) {
1328
    foreach my $row (@$results) {
1330
        my $item_marc    = MARC::Record->new_from_xml( StripNonXmlChars( $row->{'marcxml'} ), 'UTF-8', $row->{'encoding'} );
1329
        my $item_marc    = MARC::Record->new_from_xml( StripNonXmlChars( $row->{'marcxml'} ), 'UTF-8', $row->{'encoding'} );
1331
        push @branch, $item_marc->subfield( $homebranchfield,    $homebranchsubfield );
1330
        push @branch, $item_marc->subfield( $homebranchfield,    $homebranchsubfield );
1332
        push @branch, $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );;
1331
        push @branch, $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
1333
    }
1332
    }
1334
    $sth->finish();
1333
    $sth->finish();
1335
    return uniq @branch;
1334
    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