Attachment #88755 for bug #20447

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

Lines 2831-2837 sub EmbedItemsInMarcBiblio { Link Here

(-)a/C4/Biblio.pm (-1 lines)
2831	$itemnumbers = [] unless defined $itemnumbers;	2831	$itemnumbers = [] unless defined $itemnumbers;
2832		2832
2833	if ( !$skip_holdings && C4::Context->preference('SummaryHoldings') && !@$itemnumbers ) {	2833	if ( !$skip_holdings && C4::Context->preference('SummaryHoldings') && !@$itemnumbers ) {
2834	require Koha::Holdings;
2835	my $holdings_fields = Koha::Holdings->get_embeddable_marc_fields({ biblionumber => $biblionumber });	2834	my $holdings_fields = Koha::Holdings->get_embeddable_marc_fields({ biblionumber => $biblionumber });
2836	$marc->append_fields(@$holdings_fields) if ( @$holdings_fields );	2835	$marc->append_fields(@$holdings_fields) if ( @$holdings_fields );
2837	}	2836	}

Lines 1694-1700 sub MoveItemFromBiblio { Link Here

(-)a/C4/Items.pm (-1 / +1 lines)
1694	\|, undef, $tobiblioitem, $tobiblio, $itemnumber, $frombiblio );	1694	\|, undef, $tobiblioitem, $tobiblio, $itemnumber, $frombiblio );
1695	if ($return == 1) {	1695	if ($return == 1) {
1696	# Check if the moved item is attached to a holdings record	1696	# Check if the moved item is attached to a holdings record
1697	my $item = my $item = Koha::Items->find($itemnumber);	1697	my $item = Koha::Items->find($itemnumber);
1698	if ($item->holding_id()) {	1698	if ($item->holding_id()) {
1699	my $oldHolding = Koha::Holdings->find($item->holding_id());	1699	my $oldHolding = Koha::Holdings->find($item->holding_id());
1700	if ($oldHolding) {	1700	if ($oldHolding) {

Lines 2259-2265 sub searchResults { Link Here

(-)a/C4/Search.pm (-1 / +1 lines)
2259		2259
2260	# Fetch summary holdings	2260	# Fetch summary holdings
2261	if (C4::Context->preference('SummaryHoldings')) {	2261	if (C4::Context->preference('SummaryHoldings')) {
2262	$summary_holdings = Koha::Holdings->search({ biblionumber => $oldbiblio->{biblionumber}, deleted_on => undef })->unblessed;	2262	$summary_holdings = Koha::Holdings->search({ biblionumber => $oldbiblio->{biblionumber}, deleted_on => undef });
2263	}	2263	}
2264		2264
2265	# XSLT processing of some stuff	2265	# XSLT processing of some stuff




use Koha::Database;
use Koha::DateUtils qw(dt_from_string);
use Koha::Holdings::Metadatas;
use Koha::Items;

use base qw(Koha::Object);



=cut

=head3 holding_branch

my $branch = $hold->holding_branch();

Returns the holding branch for this record.

=cut

sub holding_branch {
    my ($self) = @_;

    my $branch = $self->_result->holdingbranch();
    return Koha::Library->_new_from_dbic($branch);
}

=head3 metadata

my $metadata = $holding->metadata();

sub metadata {
    my ($self) = @_;

    my $metadata = $self->_result()->metadata();
    return unless $metadata;
    return Koha::Holdings::Metadata->_new_from_dbic($metadata);
}

=head3 set_marc

    $self->{_marcxml} = $record->as_xml_record($encoding);
    my $fields = $self->marc_to_koha_fields({ record => $record });
    delete $fields->{holding_id};
    # Filter the columns since we have e.g. public_note that's not stored in the database
    my $columns = [$self->_result()->result_source()->columns()];
    my $db_fields = {};
    foreach my $key (keys %{$fields}) {
        if (grep {/^$key$/} @{$columns}) {
            $db_fields->{$key} = $fields->{$key};
        }
    }
    $self->set($db_fields);

    return $self;
}

sub items {
    my ($self) = @_;

    my $items_rs = $self->_result->items;

    return
        wantarray
        ? Koha::Items->_new_from_dbic($items_rs)->as_list
        : Koha::Items->_new_from_dbic($items_rs);
}

=head3 store




        return '';
    }

    if (ref($holding) ne 'Koha::Holding') {
        $holding = Koha::Holdings->find($holding);
        if (!$holding) {
            return '';
        }

    my @parts;

    if ($opac) {
        if (my $branch = $holding->holding_branch()) {
            push @parts, $branch->branchname();
            my $sth = C4::Context->dbh->prepare($query);
            $sth->execute($holding->{'holdingbranch'});
            my $b = $sth->fetchrow_hashref();
            push @parts, $b->{'branchname'} if $b;
            $sth->finish();
        }
        if ($holding->location()) {
            my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $holding->location() });
            push @parts, $av->next()->opac_description() if $av->count;
        }
        push @parts, $holding->callnumber() if $holding->callnumber();
        return join(' - ', @parts);
    }

    push @parts, $holding->holding_id();
    push @parts, $holding->holdingbranch() if $holding->holdingbranch();
    push @parts, $holding->location() if $holding->location();
    push @parts, $holding->ccode() if $holding->ccode();
    push @parts, $holding->callnumber() if $holding->callnumber();
    return join(' ', @parts);
}


        return '';
    }

    if (ref($holding) ne 'Koha::Holding') {
        $holding = Koha::Holdings->find($holding);
        if (!$holding) {
            return '';
        }
    }

    my $holding_marc = $holding->metadata()->record();

    return Koha::Holding->marc_to_koha_fields({ record => $holding_marc });
}

1;

Lines 195-201 foreach my $subscription (@subscriptions) { Link Here

(-)a/catalogue/detail.pl (-1 / +1 lines)
195	# Summary holdings	195	# Summary holdings
196	my $summary_holdings;	196	my $summary_holdings;
197	if (C4::Context->preference('SummaryHoldings')) {	197	if (C4::Context->preference('SummaryHoldings')) {
198	$summary_holdings = Koha::Holdings->search({ biblionumber => $biblionumber, deleted_on => undef })->unblessed;	198	$summary_holdings = Koha::Holdings->search({ biblionumber => $biblionumber, deleted_on => undef });
199	}	199	}
200		200
201	# Get acquisition details	201	# Get acquisition details

Lines 11-17 CAN_user_serials_create_subscription ) %] Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc (-1 / +1 lines)
11	[% END %]	11	[% END %]
12		12
13	[% IF ( show_summary_holdings && CAN_user_editcatalogue_edit_items ) %]	13	[% IF ( show_summary_holdings && CAN_user_editcatalogue_edit_items ) %]
14	<li><a id="newholding" href="/cgi-bin/koha/cataloguing/addholding.pl?biblionumber=[% biblionumber %]#addholding">New holdings record</a></li>	14	<li><a id="newholding" href="/cgi-bin/koha/cataloguing/addholding.pl?biblionumber=[% biblionumber \| uri %]#addholding">New holdings record</a></li>
15	[% END %]	15	[% END %]
16		16
17	[% IF ( CAN_user_editcatalogue_edit_items ) %]	17	[% IF ( CAN_user_editcatalogue_edit_items ) %]





<ul>
    [% IF (show_summary_holdings) %]
        <li><a href="#summaryholdings">Holdings ([% summary_holdings.count() || 0 | html %])</a></li>
    [% END %]
    [% IF (SeparateHoldings) %]
        <li>

                [% FOREACH holding IN summary_holdings %]
                    <tr>
                        <td class="branch">[% UNLESS ( singlebranchmode ) %][% Branches.GetName( holding.holdingbranch ) | html %] [% END %]</td>
                        <td class="location"><span class="shelvingloc">[% holding.location | html %]</span>
                        <td class="collection">[% holding.ccode | html %]</span>
                        <td class="itemcallnumber">[% IF ( holding.callnumber ) %] [% holding.callnumber | html %][% END %]</td>
                        <td class="status">

                        </td>
                    [% IF CAN_user_editcatalogue_edit_items %]
                        <td class="actions">
                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/addholding.pl?op=edit&biblionumber=[% holding.biblionumber | uri %]&holding_id=[% holding.holding_id | uri %]#editholding"><i class="fa fa-pencil"></i> Edit</a>
                            <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/cataloguing/addholding.pl?op=delete&biblionumber=[% holding.biblionumber | uri %]&holding_id=[% holding.holding_id | uri %]"><i class="fa fa-eraser"></i> Delete</a>
                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% holding.biblionumber | uri %]&holding_id=[% holding.holding_id | uri %]#additema"><i class="fa fa-plus"></i> Add item</a>
                            <a class="btn btn-default btn-xs previewMARC" href="/cgi-bin/koha/catalogue/showmarc.pl?holding_id=[% holding.holding_id | uri %]&amp;viewas=html" title="MARC">Show MARC</a>
                        </td>
                    [% END %]




 [% Asset.js("js/cataloging.js") | $raw %]
[% INCLUDE 'browser-strings.inc' %]
[% Asset.js("js/browser.js") | $raw %]
[% Asset.css("css/addholding.css") | $raw %]
[% INCLUDE 'select2.inc' %]
[% IF ( bidi ) %]
   [% Asset.css("css/right-to-left.css") | $raw %]
[% END %]
</head>
<body id="cat_addholding" class="cat">

   <div id="loading">
       <div>Loading, please wait...</div>
   </div>
    var Sticky;
    $(document).ready(function() {
        $('#addholdingtabs').tabs().bind('show.ui-tabs', function(e, ui) {
            $("#"+ui.panel.id+" input:eq(0)").focus();
        });

[% INCLUDE 'header.inc' %]
            $('#addholdingtabs').selectTabByID("#[% tab | html %]");
        [% END %]

<div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
 &rsaquo; Edit <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]">[% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</a>
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/addholding.pl?biblionumber=[% biblionumber | uri %]">Holdings</a>
</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-md-10 col-md-offset-1">
        } else {
            toggleMARCdocLinks(true);
        }

<h1>
[% IF ( holding_id ) %]Editing holdings record number [% holding_id | html %]
[% ELSE %]Add holdings record
[% END %]
</h1>
            }
        });

[% IF ( error_items_exist ) %]<div class="dialog alert"><strong>This holdings record has items attached.</strong> Please delete them first.</div>[% END %]
[% IF ( error_delete_failed ) %]<div class="dialog alert"><strong>Error deleting the record.</strong></div>[% END %]
        if (marctags_cookie == 'hide'){
            toggleMARCTagLinks(false);
        } else if( marctags_cookie == 'show'){
            toggleMARCTagLinks(true)
        } else {
            [% UNLESS Koha.Preference("hide_marc") %]
                toggleMARCTagLinks(true)
            [% ELSE %]
                toggleMARCTagLinks(false);
            [% END %]
        }

[% IF ( done ) %]
    <script>
        opener.document.forms['f'].holding_id.value=[% holding_id | html %];
        window.close();
    </script>
[% ELSE %]
    <form method="post" name="f" id="f" action="/cgi-bin/koha/cataloguing/addholding.pl" onsubmit="return Check();">
    <input type="hidden" value="[% IF ( holding_id ) %]view[% ELSE %]holdings[% END %]" id="redirect" name="redirect" />
    <input type="hidden" value="" id="current_tab" name="current_tab" />
[% END %]

<div id="toolbar" class="btn-toolbar">
    [% IF CAN_user_editcatalogue_edit_items %]
        <div class="btn-group">
            <button class="btn btn-default btn-sm" id="saverecord"><i class="fa fa-save"></i> Save</button>
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
            <span class="caret"></span>
            </button>
            <ul class="dropdown-menu">
                <li><a id="saveandview" href="#">Save and view record</a></li>
                <li><a id="saveanditems" href="#">Save and edit items</a></li>
                <li><a id="saveandcontinue" href="#">Save and continue editing</a></li>
            </ul>
        </div>
    [% END %]

    <div class="btn-group">
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button>
        <ul id="settings-menu" class="dropdown-menu">
            [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 %]
                [% # disabled until supported <li><a href="#" id="switcheditor">Switch to advanced editor</a></li> %]
            [% END %]
            [% IF marcflavour != 'NORMARC' AND NOT advancedMARCEditor %]
                <li>
                    <a href="#" id="marcDocsSelect"><i class="fa fa-check-square-o"></i> Show MARC tag documentation links</a>
                <li>
                    <a href="#" id="marcTagsSelect"><i class="fa fa-check-square-o"></i> Show tags</a>
                </li>
            [% END %]
            <li class="divider"></li>
            <li class="nav-header">Change framework</li>
            <li>
                <a href="#" class="change-framework" data-frameworkcode="">
                    [% IF ( frameworkcode ) %]
                       <i class="fa fa-fw">&nbsp;</i>
                    [% ELSE %]
                        <i class="fa fa-fw fa-check"></i>
                    [% END %]
                    Default
                </a>
            </li>
            [% FOREACH framework IN frameworks%]
                <li>
                    <a href="#" class="change-framework" data-frameworkcode="[% framework.frameworkcode | html %]">
                        [% IF framework.frameworkcode == frameworkcode %]
                            <i class="fa fa-fw fa-check"></i>
                        [% ELSE %]
                            <i class="fa fa-fw">&nbsp;</i>
                        [% END %]
                        [% framework.frameworktext | html %]
                    </a>
                </li>
            [% END %]
        </ul>
    </div>
    <div class="btn-group">
        <a class="btn btn-default btn-sm" id="cancel" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | url %]">Cancel</a>
    </div>
</div>

[% IF ( popup ) %]
        <input type="hidden" name="mode" value="popup" />
[% END %]
        <input type="hidden" name="op" value="add" />
        <input type="hidden" id="frameworkcode" name="frameworkcode" value="[% frameworkcode | html %]" />
        <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
        <input type="hidden" name="holding_id" value="[% holding_id | html %]" />
        <input type="hidden" name="changed_framework" value="" />
            tab = tab.replace('#', '');
            $("#current_tab").val(tab);
            redirect("just_save", tab);
            return false;
        });

<div id="addholdingtabs" class="toptabs numbered">
    <ul>
        [% FOREACH BIG_LOO IN BIG_LOOP %]
        <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li>
        [% END %]
    </ul>

[% FOREACH BIG_LOO IN BIG_LOOP %]
    <div id="tab[% BIG_LOO.number | html %]XX">

    [% FOREACH innerloo IN BIG_LOO.innerloop %]
    [% IF ( innerloo.tag ) %]
    <div class="tag" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
        <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
            [% IF advancedMARCEditor %]
                <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a>
            [% ELSE %]
                <span class="tagnum" title="[% innerloo.tag_lib | html %]">[% innerloo.tag | html %]</span>
                [% IF marcflavour != 'NORMARC' %]<a href="#" class="marcdocs" onclick="PopupMARCFieldDoc('[% innerloo.tag | html %]'); return false;">&nbsp;?</a>[% END %]
            [% END %]
                [% IF ( innerloo.fixedfield ) %]
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        style="display:none;"
                        name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator1 | html %]" />
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        style="display:none;"
                        name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator2 | html %]" />
                [% ELSE %]
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator1 | html %]" />
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator2 | html %]" />
                [% END %] -

            [% UNLESS advancedMARCEditor %]
                <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a>
            [% END %]
                <span class="field_controls">
                [% IF ( innerloo.repeatable ) %]
                    <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]','0','[% advancedMARCEditor | html %]'); return false;" title="Repeat this Tag">
                        <img src="[% interface | html %]/[% theme | html %]/img/repeat-tag.png" alt="Repeat this Tag" />
                    </a>
                [% END %]
                    <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag">
                        <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" />
                    </a>
                </span>

        </div>
        } );
        $(".change-framework").on("click", function(){
            var frameworkcode = $(this).data("frameworkcode");
            $("#frameworkcode").val( frameworkcode );
            Changefwk();
        });
    });

        [% FOREACH subfield_loo IN innerloo.subfield_loop %]
            <!--  One line on the marc editor -->
            <div class="subfield_line" style="[% subfield_loo.visibility | html %]" id="subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]">
}

                [% UNLESS advancedMARCEditor %]
                    [% IF ( subfield_loo.fixedfield ) %]<label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" style="display:none;" class="labelsubfield">
                    [% ELSE %]<label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield">
                    [% END %]
                [% END %]

                <span class="subfieldcode">
                    [% IF ( subfield_loo.fixedfield ) %]
                        <img class="buttonUp" style="display:none;" src="[% interface | html %]/[% theme | html %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]')" alt="Move Up" title="Move Up" />
                    [% ELSE %]
                        <img class="buttonUp" src="[% interface | html %]/[% theme | html %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]')" alt="Move Up" title="Move Up" />
                    [% END %]
                        <input type="text"
                            title="[% subfield_loo.marc_lib | html %]"
                            style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;"
                            name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]"
                            value="[% subfield_loo.subfield | html %]"
                            size="1"
                            maxlength="1"
                            class="flat"
                            tabindex="0" />
                </span>

                [% UNLESS advancedMARCEditor %]
                    [% IF ( subfield_loo.mandatory ) %]<span class="subfield subfield_mandatory">[% ELSE %]<span class="subfield">[% END %]
                        [% subfield_loo.marc_lib | html %]
                        [% IF ( subfield_loo.mandatory ) %]<span class="mandatory_marker" title="This field is mandatory">*</span>[% END %]
                    </span>
                    </label>
                [% END %]

                [% SET mv = subfield_loo.marc_value %]
                [% IF ( mv.type == 'text' ) %]
                    [% IF ( mv.readonly == 1 ) %]
                    <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor readonly" tabindex="1" size="[%- mv.size | html -%]" maxlength="[%- mv.maxlength | html -%]" readonly="readonly" />
                    [% ELSE %]
                    <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" size="[%- mv.size | html -%]" maxlength="[%- mv.maxlength | html -%]" />
                    [% END %]
                    [% IF ( mv.authtype ) %]
                    <span class="subfield_controls"><a href="#" class="buttonDot tag_editor" onclick="openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'[%- mv.authtype | html -%]','holding'); return false;" tabindex="1" title="Tag editor">Tag editor</a></span>
                    [% END %]
                [% ELSIF ( mv.type == 'text_complex' ) %]
                    <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor framework_plugin" tabindex="1" size="[%- mv.size | html -%]" maxlength="[%- mv.maxlength | html -%]" />
                    <span class="subfield_controls">
                        [% IF mv.noclick %]
                            <a href="#" class="buttonDot tag_editor disabled" tabindex="-1" title="No popup"></a>
                        [% ELSE %]
                            <a href="#" id="buttonDot_[% mv.id | html %]" class="buttonDot tag_editor framework_plugin" tabindex="1" title="Tag editor">Tag editor</a>
                        [% END %]
                    </span>
                    [% mv.javascript | $raw %]
                [% ELSIF ( mv.type == 'hidden' ) %]
                    <input tabindex="1" type="hidden" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" size="[%- mv.size | html -%]" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" />
                [% ELSIF ( mv.type == 'textarea' ) %]
                    <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1">[%- mv.value | html -%]</textarea>
                [% ELSIF ( mv.type == 'select' ) %]
                    <select name="[%- mv.name | html -%]" tabindex="1" size="1" class="input_marceditor" id="[%- mv.id | html -%]">
                    [% FOREACH aval IN mv.values %]
                        [% IF aval == mv.default %]
                        <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option>
                        [% ELSE %]
                        <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option>
                        [% END %]
                    [% END %]
                    </select>
                [% END %]

                <span class="subfield_controls">
                [% IF ( subfield_loo.repeatable ) %]
                    <a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]','[% advancedMARCEditor | html %]'); return false;">
                        <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" />
                    </a>
                    <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]'); return false;">
                        <img src="[% interface | html %]/[% theme | html %]/img/delete-subfield.png" alt="Delete" title="Delete this subfield" />
                    </a>
                [% END %]
                </span>

            </div>
            <!-- End of the line -->
        [% END %]

    </div>
    [% END %]<!-- if innerloo.tag -->
    [% END %]<!-- BIG_LOO.innerloop -->
    </div>
[% END %]<!-- BIG_LOOP -->

</div><!-- tabs -->

</form>

</div>
</div>
</div>

<script>
    var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
    browser.show();

    $(window).load(function() {
        $("#loading").hide();
    });
    var Sticky;
    $(document).ready(function() {
        $('#addholdingtabs').tabs().bind('show.ui-tabs', function(e, ui) {
            $("#"+ui.panel.id+" input:eq(0)").focus();
        });

        [% IF tab %]
            $('#addholdingtabs').selectTabByID("#[% tab | html %]");
        [% END %]

        Sticky = $("#toolbar");
        Sticky.hcSticky({
            stickTo: ".main",
            stickyClass: "floating"
        });

        /* check cookie to hide/show marcdocs*/
        if($.cookie("marcdocs_[% borrowernumber | html %]") == 'hide'){
            toggleMARCdocLinks(false);
        } else {
            toggleMARCdocLinks(true);
        }

        $("#marcDocsSelect").click(function(){
            if($.cookie("marcdocs_[% borrowernumber | html %]") == 'hide'){
                toggleMARCdocLinks(true);
            } else {
                toggleMARCdocLinks(false);
            }
        });

        /* check cookie to hide/show marc tags*/
        var marctags_cookie = $.cookie("marctags_[% borrowernumber | html %]");
        if (marctags_cookie == 'hide'){
            toggleMARCTagLinks(false);
        } else if( marctags_cookie == 'show'){
            toggleMARCTagLinks(true)
        } else {
            [% UNLESS Koha.Preference("hide_marc") %]
                toggleMARCTagLinks(true)
            [% ELSE %]
                toggleMARCTagLinks(false);
            [% END %]
        }

        $("#marcTagsSelect").click(function(){
            if( $.cookie("marctags_[% borrowernumber | html %]") == 'hide'){
                toggleMARCTagLinks(true)
            } else {
                toggleMARCTagLinks(false);
            }
        });

        $("#saverecord").click(function(){
            $(".btn-group").removeClass("open");
            onOption();
            return false;
        });

        $("#saveandview").click(function(){
            $(".btn-group").removeClass("open");
            redirect("view");
            return false;
        });

        $("#saveanditems").click(function(){
            $(".btn-group").removeClass("open");
            redirect("items");
            return false;
        });
        $("#saveandcontinue").click(function(){
            $(".btn-group").removeClass("open");
            var tab = $("#addholdingtabs li.ui-tabs-active:first a").attr('href');
            tab = tab.replace('#', '');
            $("#current_tab").val(tab);
            redirect("just_save", tab);
            return false;
        });

        $( '#switcheditor' ).click( function() {

            if ( !confirm( _("Any changes will not be saved. Continue?") ) ) return false;

            $.cookie( 'catalogue_editor_[% USER_INFO.borrowernumber | html %]', 'advanced', { expires: 365, path: '/' } );

            var holding_id = [% holding_id || "''" | html %];
            window.location = '/cgi-bin/koha/cataloguing/editor.pl#catalog/' + biblionumber + '/holdings/' + holding_id;

            return false;
        } );
        $(".change-framework").on("click", function(){
            var frameworkcode = $(this).data("frameworkcode");
            $("#frameworkcode").val( frameworkcode );
            Changefwk();
        });
    });

function redirect(dest){
    $("#redirect").attr("value",dest);
    return Check();
}

[% IF ( CAN_user_editcatalogue_edit_items ) %]
    var onOption = function () {
        return Check();
    }

    f.submit();
}

$(document).ready(function() {
</script>
[% Asset.css("css/addholding.css") | $raw %]

[% INCLUDE 'select2.inc' %]
<script>
  $(document).ready(function() {
    $('.subfield_line select').select2();
});
</script>

[% IF ( bidi ) %]
   [% Asset.css("css/right-to-left.css") | $raw %]
[% END %]
</head>
<body id="cat_addholding" class="cat">

   <div id="loading">
       <div>Loading, please wait...</div>
   </div>

[% INCLUDE 'header.inc' %]

<div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
 &rsaquo; Edit <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">[% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</a>
 &rsaquo; <a href="/cgi-bin/koha/cataloguing/addholding.pl?biblionumber=[% biblionumber | html %]">Holdings</a>
</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-md-10 col-md-offset-1">

<h1>
[% IF ( holding_id ) %]Editing holdings record number [% holding_id | html %]
[% ELSE %]Add holdings record
[% END %]
</h1>

[% IF ( error_items_exist ) %]<div class="dialog alert"><strong>This holdings record has items attached.</strong> Please delete them first.</div>[% END %]
[% IF ( error_delete_failed ) %]<div class="dialog alert"><strong>Error deleting the record.</strong></div>[% END %]

[% IF ( done ) %]
    <script type="text/javascript">
        opener.document.forms['f'].holding_id.value=[% holding_id | html %];
        window.close();
    </script>
[% ELSE %]
    <form method="post" name="f" id="f" action="/cgi-bin/koha/cataloguing/addholding.pl" onsubmit="return Check();">
    <input type="hidden" value="[% IF ( holding_id ) %]view[% ELSE %]holdings[% END %]" id="redirect" name="redirect" />
    <input type="hidden" value="" id="current_tab" name="current_tab" />
[% END %]

<div id="toolbar" class="btn-toolbar">
    [% IF CAN_user_editcatalogue_edit_items %]
        <div class="btn-group">
            <button class="btn btn-default btn-sm" id="saverecord"><i class="fa fa-save"></i> Save</button>
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
            <span class="caret"></span>
            </button>
            <ul class="dropdown-menu">
                <li><a id="saveandview" href="#">Save and view record</a></li>
                <li><a id="saveanditems" href="#">Save and edit items</a></li>
                <li><a id="saveandcontinue" href="#">Save and continue editing</a></li>
            </ul>
        </div>
    [% END %]

    <div class="btn-group">
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button>
        <ul id="settings-menu" class="dropdown-menu">
            [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 %]
                [% # disabled until supported <li><a href="#" id="switcheditor">Switch to advanced editor</a></li> %]
            [% END %]
            [% IF marcflavour != 'NORMARC' AND NOT advancedMARCEditor %]
                <li>
                    <a href="#" id="marcDocsSelect"><i class="fa fa-check-square-o"></i> Show MARC tag documentation links</a>
                <li>
                    <a href="#" id="marcTagsSelect"><i class="fa fa-check-square-o"></i> Show tags</a>
                </li>
            [% END %]
            <li class="divider"></li>
            <li class="nav-header">Change framework</li>
            <li>
                <a href="#" class="change-framework" data-frameworkcode="">
                    [% IF ( frameworkcode ) %]
                       <i class="fa fa-fw">&nbsp;</i>
                    [% ELSE %]
                        <i class="fa fa-fw fa-check"></i>
                    [% END %]
                    Default
                </a>
            </li>
            [% FOREACH framework IN frameworks%]
                <li>
                    <a href="#" class="change-framework" data-frameworkcode="[% framework.frameworkcode | html %]">
                        [% IF framework.frameworkcode == frameworkcode %]
                            <i class="fa fa-fw fa-check"></i>
                        [% ELSE %]
                            <i class="fa fa-fw">&nbsp;</i>
                        [% END %]
                        [% framework.frameworktext | html %]
                    </a>
                </li>
            [% END %]
        </ul>
    </div>
    <div class="btn-group">
        <a class="btn btn-default btn-sm" id="cancel" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | url %]">Cancel</a>
    </div>
</div>

[% IF ( popup ) %]
        <input type="hidden" name="mode" value="popup" />
[% END %]
        <input type="hidden" name="op" value="add" />
        <input type="hidden" id="frameworkcode" name="frameworkcode" value="[% frameworkcode | html %]" />
        <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
        <input type="hidden" name="holding_id" value="[% holding_id | html %]" />
        <input type="hidden" name="changed_framework" value="" />

<div id="addholdingtabs" class="toptabs numbered">
    <ul>
        [% FOREACH BIG_LOO IN BIG_LOOP %]
        <li><a href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a></li>
        [% END %]
    </ul>

[% FOREACH BIG_LOO IN BIG_LOOP %]
    <div id="tab[% BIG_LOO.number | html %]XX">

    [% FOREACH innerloo IN BIG_LOO.innerloop %]
    [% IF ( innerloo.tag ) %]
    <div class="tag" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
        <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]">
            [% IF advancedMARCEditor %]
                <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag %]</a>
            [% ELSE %]
                <span class="tagnum" title="[% innerloo.tag_lib %]">[% innerloo.tag | html %]</span>
                [% IF marcflavour != 'NORMARC' %]<a href="#" class="marcdocs" onclick="PopupMARCFieldDoc('[% innerloo.tag | html %]'); return false;">&nbsp;?</a>[% END %]
            [% END %]
                [% IF ( innerloo.fixedfield ) %]
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        style="display:none;"
                        name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator1 | html %]" />
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        style="display:none;"
                        name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator2 | html %]" />
                [% ELSE %]
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator1 | html %]" />
                    <input type="text"
                        tabindex="1"
                        class="indicator flat"
                        name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]"
                        size="1"
                        maxlength="1"
                        value="[% innerloo.indicator2 | html %]" />
                [% END %] -

            [% UNLESS advancedMARCEditor %]
                <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a>
            [% END %]
                <span class="field_controls">
                [% IF ( innerloo.repeatable ) %]
                    <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]','0','[% advancedMARCEditor | html %]'); return false;" title="Repeat this Tag">
                        <img src="[% interface | html %]/[% theme | html %]/img/repeat-tag.png" alt="Repeat this Tag" />
                    </a>
                [% END %]
                    <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag">
                        <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" />
                    </a>
                </span>

        </div>

        [% FOREACH subfield_loo IN innerloo.subfield_loop %]
            <!--  One line on the marc editor -->
            <div class="subfield_line" style="[% subfield_loo.visibility | html %]" id="subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]">

                [% UNLESS advancedMARCEditor %]
                    [% IF ( subfield_loo.fixedfield ) %]<label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" style="display:none;" class="labelsubfield">
                    [% ELSE %]<label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield">
                    [% END %]
                [% END %]

                <span class="subfieldcode">
                    [% IF ( subfield_loo.fixedfield ) %]
                        <img class="buttonUp" style="display:none;" src="[% interface | html %]/[% theme | html %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]')" alt="Move Up" title="Move Up" />
                    [% ELSE %]
                        <img class="buttonUp" src="[% interface | html %]/[% theme | html %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]')" alt="Move Up" title="Move Up" />
                    [% END %]
                        <input type="text"
                            title="[% subfield_loo.marc_lib | html %]"
                            style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;"
                            name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]"
                            value="[% subfield_loo.subfield | html %]"
                            size="1"
                            maxlength="1"
                            class="flat"
                            tabindex="0" />
                </span>

                [% UNLESS advancedMARCEditor %]
                    [% IF ( subfield_loo.mandatory ) %]<span class="subfield subfield_mandatory">[% ELSE %]<span class="subfield">[% END %]
                        [% subfield_loo.marc_lib %]
                        [% IF ( subfield_loo.mandatory ) %]<span class="mandatory_marker" title="This field is mandatory">*</span>[% END %]
                    </span>
                    </label>
                [% END %]

                [% SET mv = subfield_loo.marc_value %]
                [% IF ( mv.type == 'text' ) %]
                    [% IF ( mv.readonly == 1 ) %]
                    <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor readonly" tabindex="1" size="[%- mv.size | html -%]" maxlength="[%- mv.maxlength | html -%]" readonly="readonly" />
                    [% ELSE %]
                    <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" size="[%- mv.size | html -%]" maxlength="[%- mv.maxlength | html -%]" />
                    [% END %]
                    [% IF ( mv.authtype ) %]
                    <span class="subfield_controls"><a href="#" class="buttonDot tag_editor" onclick="openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'[%- mv.authtype | html -%]','holding'); return false;" tabindex="1" title="Tag editor">Tag editor</a></span>
                    [% END %]
                [% ELSIF ( mv.type == 'text_complex' ) %]
                    <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor framework_plugin" tabindex="1" size="[%- mv.size | html -%]" maxlength="[%- mv.maxlength | html -%]" />
                    <span class="subfield_controls">
                        [% IF mv.noclick %]
                            <a href="#" class="buttonDot tag_editor disabled" tabindex="-1" title="No popup"></a>
                        [% ELSE %]
                            <a href="#" id="buttonDot_[% mv.id | html %]" class="buttonDot tag_editor framework_plugin" tabindex="1" title="Tag editor">Tag editor</a>
                        [% END %]
                    </span>
                    [% mv.javascript %]
                [% ELSIF ( mv.type == 'hidden' ) %]
                    <input tabindex="1" type="hidden" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" size="[%- mv.size | html -%]" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" />
                [% ELSIF ( mv.type == 'textarea' ) %]
                    <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1">[%- mv.value -%]</textarea>
                [% ELSIF ( mv.type == 'select' ) %]
                    <select name="[%- mv.name | html -%]" tabindex="1" size="1" class="input_marceditor" id="[%- mv.id | html -%]">
                    [% FOREACH aval IN mv.values %]
                        [% IF aval == mv.default %]
                        <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option>
                        [% ELSE %]
                        <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option>
                        [% END %]
                    [% END %]
                    </select>
                [% END %]

                <span class="subfield_controls">
                [% IF ( subfield_loo.repeatable ) %]
                    <a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]','[% advancedMARCEditor | html %]'); return false;">
                        <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" />
                    </a>
                    <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]'); return false;">
                        <img src="[% interface | html %]/[% theme | html %]/img/delete-subfield.png" alt="Delete" title="Delete this subfield" />
                    </a>
                [% END %]
                </span>

            </div>
            <!-- End of the line -->
        [% END %]

    </div>
    [% END %]<!-- if innerloo.tag -->
    [% END %]<!-- BIG_LOO.innerloop -->
    </div>
[% END %]<!-- BIG_LOOP -->

</div><!-- tabs -->

</form>

</div>
</div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]




</table>
<fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
</form>
<script>
    function report() {
        var doc   = opener.document;
        var field = doc.getElementById("[% index | html %]");

        field.value =
        document.f_pop.f1.value+
        document.f_pop.f6.value+
        document.f_pop.f7.value+
        (document.f_pop.f8.value + '    ').substr(0, 4)+
        document.f_pop.f12.value+
        document.f_pop.f13.value+
        document.f_pop.f14.value+
        document.f_pop.f15.value+
        document.f_pop.f16.value+
        (document.f_pop.f17.value + '   ').substr(0, 3)+
        document.f_pop.f20.value+
        document.f_pop.f21.value+
        (document.f_pop.f22.value + '   ').substr(0, 3)+
        document.f_pop.f25.value+
        document.f_pop.f26.value;
        self.close();
        return false;
    }
    //]]>
</script>

[% INCLUDE 'popup-bottom.inc' %]




</table>
<fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
</form>
<script>
    function report() {
        var doc   = opener.document;
        var field = doc.getElementById("[% index | html %]");
            var field = doc.getElementById("[% index | html %]");

        field.value =
        '     '+
        document.f_pop.f5.value+
        document.f_pop.f6.value+
        '  '+
        'a'+ // MARC21 UNICODE flag - must be 'a' for Koha
        '22     '+
        document.f_pop.f17.value+
        document.f_pop.f18.value+
        ' '+
        '4500';
        self.close();
        return false;
    }
    //]]>
</script>
[% INCLUDE 'popup-bottom.inc' %]

Lines 750-756 if (scalar(@itemloop) == 0 \|\| scalar(@otheritemloop) == 0) { Link Here

(-)a/opac/opac-detail.pl (-1 / +1 lines)
750		750
751	# Fetch summary holdings	751	# Fetch summary holdings
752	if (C4::Context->preference('SummaryHoldings')) {	752	if (C4::Context->preference('SummaryHoldings')) {
753	my $summary_holdings = Koha::Holdings->search({ biblionumber => $biblionumber, deleted_on => undef })->unblessed;	753	my $summary_holdings = Koha::Holdings->search({ biblionumber => $biblionumber, deleted_on => undef });
754	$template->param( summary_holdings => $summary_holdings );	754	$template->param( summary_holdings => $summary_holdings );
755	}	755	}
756		756





use C4::Biblio;

use Koha::BiblioFramework;
use Koha::BiblioFrameworks;
use Koha::Database;
use Koha::Libraries;
use Koha::Library;
use Koha::MarcSubfieldStructure;
use Koha::MarcSubfieldStructures;

BEGIN {


subtest 'Koha::Holding tests' => sub {

    plan tests => 19;

    $schema->storage->txn_begin;


    is($holding->frameworkcode(), $frameworkcode, 'Framework code correct in Koha::Holding object');
    is($holding->holdingbranch(), 'ABC', 'Location correct in Koha::Holding object');

    my $branch = $holding->holding_branch();
    is(ref $branch, 'Koha::Library', 'holding_branch() returns a Koha::Library object');
    is($branch->branchname(), 'Abc', 'holding_branch() returns correct library');

    my $metadata = $holding->metadata;
    is( ref $metadata, 'Koha::Holdings::Metadata', 'Method metadata() returned a Koha::Holdings::Metadata object');


Lines 23-32 use t::lib::TestBuilder; Link Here

(-)a/t/db_dependent/Koha/Holdings.t (-3 lines)
23		23
24	use C4::Biblio;	24	use C4::Biblio;
25		25
26	use Koha::BiblioFramework;
27	use Koha::BiblioFrameworks;	26	use Koha::BiblioFrameworks;
28	use Koha::Database;	27	use Koha::Database;
29	use Koha::MarcSubfieldStructure;
30	use Koha::MarcSubfieldStructures;	28	use Koha::MarcSubfieldStructures;
31		29
32	BEGIN {	30	BEGIN {
33	-

Return to bug 20447

Lines 56-63 sub GetLocation { Link Here

(-)a/Koha/Template/Plugin/Holdings.pm (-22 / +20 lines)
56	return '';	56	return '';
57	}	57	}
58		58
59	if (ref($holding) ne 'HASH') {	59	if (ref($holding) ne 'Koha::Holding') {
60	$holding = Koha::Holdings->find($holding)->unblessed;	60	$holding = Koha::Holdings->find($holding);
61	if (!$holding) {	61	if (!$holding) {
62	return '';	62	return '';
63	}	63	}
Lines 66-92 sub GetLocation { Link Here
66	my @parts;	66	my @parts;
67		67
68	if ($opac) {	68	if ($opac) {
69	if ($holding->{'holdingbranch'}) {	69	if (my $branch = $holding->holding_branch()) {
70	my $query = "SELECT branchname FROM branches WHERE branchcode = ?";	70	push @parts, $branch->branchname();
71	my $sth = C4::Context->dbh->prepare($query);
72	$sth->execute($holding->{'holdingbranch'});
73	my $b = $sth->fetchrow_hashref();
74	push @parts, $b->{'branchname'} if $b;
75	$sth->finish();
76	}	71	}
77	if ($holding->{'location'}) {	72	if ($holding->location()) {
78	my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $holding->{'location'} });	73	my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $holding->location() });
79	push @parts, $av->next->opac_description if $av->count;	74	push @parts, $av->next()->opac_description() if $av->count;
80	}	75	}
81	push @parts, $holding->{'callnumber'} if $holding->{'callnumber'};	76	push @parts, $holding->callnumber() if $holding->callnumber();
82	return join(' - ', @parts);	77	return join(' - ', @parts);
83	}	78	}
84		79
85	push @parts, $holding->{'holding_id'};	80	push @parts, $holding->holding_id();
86	push @parts, $holding->{'holdingbranch'} if $holding->{'holdingbranch'};	81	push @parts, $holding->holdingbranch() if $holding->holdingbranch();
87	push @parts, $holding->{'location'} if $holding->{'location'};	82	push @parts, $holding->location() if $holding->location();
88	push @parts, $holding->{'ccode'} if $holding->{'ccode'};	83	push @parts, $holding->ccode() if $holding->ccode();
89	push @parts, $holding->{'callnumber'} if $holding->{'callnumber'};	84	push @parts, $holding->callnumber() if $holding->callnumber();
90	return join(' ', @parts);	85	return join(' ', @parts);
91	}	86	}
92		87
Lines 106-118 sub GetDetails { Link Here
106	return '';	101	return '';
107	}	102	}
108		103
109	if (ref($holding) eq 'HASH') {	104	if (ref($holding) ne 'Koha::Holding') {
110	$holding = $holding->{'holding_id'};	105	$holding = Koha::Holdings->find($holding);
		106	if (!$holding) {
		107	return '';
		108	}
111	}	109	}
112		110
113	my $holding_marc = Koha::Holdings->find($holding)->metadata()->record();	111	my $holding_marc = $holding->metadata()->record();
114		112
115	return Koha::Holding::marc_to_koha_fields({ record => $holding_marc });	113	return Koha::Holding->marc_to_koha_fields({ record => $holding_marc });
116	}	114	}
117		115
118	1;	116	1;

Lines 164-194 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_holdings.tt (-20 / +19 lines)
164	</table>	164	</table>
165	<fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>	165	<fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
166	</form>	166	</form>
167	<script type="text/javascript">//<![CDATA[	167	<script>
168	function report() {	168	function report() {
169	var doc = opener.document;	169	var doc = opener.document;
170	var field = doc.getElementById("[% index \| html %]");	170	var field = doc.getElementById("[% index \| html %]");
171		171
172	field.value =	172	field.value =
173	document.f_pop.f1.value+	173	document.f_pop.f1.value+
174	document.f_pop.f6.value+	174	document.f_pop.f6.value+
175	document.f_pop.f7.value+	175	document.f_pop.f7.value+
176	(document.f_pop.f8.value + ' ').substr(0, 4)+	176	(document.f_pop.f8.value + ' ').substr(0, 4)+
177	document.f_pop.f12.value+	177	document.f_pop.f12.value+
178	document.f_pop.f13.value+	178	document.f_pop.f13.value+
179	document.f_pop.f14.value+	179	document.f_pop.f14.value+
180	document.f_pop.f15.value+	180	document.f_pop.f15.value+
181	document.f_pop.f16.value+	181	document.f_pop.f16.value+
182	(document.f_pop.f17.value + ' ').substr(0, 3)+	182	(document.f_pop.f17.value + ' ').substr(0, 3)+
183	document.f_pop.f20.value+	183	document.f_pop.f20.value+
184	document.f_pop.f21.value+	184	document.f_pop.f21.value+
185	(document.f_pop.f22.value + ' ').substr(0, 3)+	185	(document.f_pop.f22.value + ' ').substr(0, 3)+
186	document.f_pop.f25.value+	186	document.f_pop.f25.value+
187	document.f_pop.f26.value;	187	document.f_pop.f26.value;
188	self.close();	188	self.close();
189	return false;	189	return false;
190	}	190	}
191	//]]>
192	</script>	191	</script>
193		192
194	[% INCLUDE 'popup-bottom.inc' %]	193	[% INCLUDE 'popup-bottom.inc' %]

Lines 28-33 use C4::Log; Link Here

(-)a/Koha/Holding.pm (-6 / +33 lines)
28	use Koha::Database;	28	use Koha::Database;
29	use Koha::DateUtils qw(dt_from_string);	29	use Koha::DateUtils qw(dt_from_string);
30	use Koha::Holdings::Metadatas;	30	use Koha::Holdings::Metadatas;
		31	use Koha::Items;
31		32
32	use base qw(Koha::Object);	33	use base qw(Koha::Object);
33		34
Lines 41-46 Koha::Holding - Koha Holding Object class Link Here
41		42
42	=cut	43	=cut
43		44
		45	=head3 holding_branch
		46
		47	my $branch = $hold->holding_branch();
		48
		49	Returns the holding branch for this record.
		50
		51	=cut
		52
		53	sub holding_branch {
		54	my ($self) = @_;
		55
		56	my $branch = $self->_result->holdingbranch();
		57	return Koha::Library->_new_from_dbic($branch);
		58	}
		59
44	=head3 metadata	60	=head3 metadata
45		61
46	my $metadata = $holding->metadata();	62	my $metadata = $holding->metadata();
Lines 52-60 Returns a Koha::Holding::Metadata object Link Here
52	sub metadata {	68	sub metadata {
53	my ($self) = @_;	69	my ($self) = @_;
54		70
55	$self->{_metadata} \|\|= Koha::Holdings::Metadatas->find({ holding_id => $self->id });	71	my $metadata = $self->_result()->metadata();
56		72	return unless $metadata;
57	return $self->{_metadata};	73	return Koha::Holdings::Metadata->_new_from_dbic($metadata);
58	}	74	}
59		75
60	=head3 set_marc	76	=head3 set_marc
Lines 92-98 sub set_marc { Link Here
92	$self->{_marcxml} = $record->as_xml_record($encoding);	108	$self->{_marcxml} = $record->as_xml_record($encoding);
93	my $fields = $self->marc_to_koha_fields({ record => $record });	109	my $fields = $self->marc_to_koha_fields({ record => $record });
94	delete $fields->{holding_id};	110	delete $fields->{holding_id};
95	$self->set($fields);	111	# Filter the columns since we have e.g. public_note that's not stored in the database
		112	my $columns = [$self->_result()->result_source()->columns()];
		113	my $db_fields = {};
		114	foreach my $key (keys %{$fields}) {
		115	if (grep {/^$key$/} @{$columns}) {
		116	$db_fields->{$key} = $fields->{$key};
		117	}
		118	}
		119	$self->set($db_fields);
96		120
97	return $self;	121	return $self;
98	}	122	}
Lines 110-118 or list of Koha::Item objects in list context. Link Here
110	sub items {	134	sub items {
111	my ($self) = @_;	135	my ($self) = @_;
112		136
113	$self->{_items} \|\|= Koha::Items->search( { holding_id => $self->holding_id() } );	137	my $items_rs = $self->_result->items;
114		138
115	return wantarray ? $self->{_items}->as_list : $self->{_items};	139	return
		140	wantarray
		141	? Koha::Items->_new_from_dbic($items_rs)->as_list
		142	: Koha::Items->_new_from_dbic($items_rs);
116	}	143	}
117		144
118	=head3 store	145	=head3 store

Lines 145-151 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-5 / +5 lines)
145		145
146	<ul>	146	<ul>
147	[% IF (show_summary_holdings) %]	147	[% IF (show_summary_holdings) %]
148	<li><a href="#summaryholdings">Holdings ([% summary_holdings.size() \|\| 0 \| html %])</a></li>	148	<li><a href="#summaryholdings">Holdings ([% summary_holdings.count() \|\| 0 \| html %])</a></li>
149	[% END %]	149	[% END %]
150	[% IF (SeparateHoldings) %]	150	[% IF (SeparateHoldings) %]
151	<li>	151	<li>
Lines 197-203 Link Here
197	[% FOREACH holding IN summary_holdings %]	197	[% FOREACH holding IN summary_holdings %]
198	<tr>	198	<tr>
199	<td class="branch">[% UNLESS ( singlebranchmode ) %][% Branches.GetName( holding.holdingbranch ) \| html %] [% END %]</td>	199	<td class="branch">[% UNLESS ( singlebranchmode ) %][% Branches.GetName( holding.holdingbranch ) \| html %] [% END %]</td>
200	<td class="location"><span class="shelvingloc">[% holding.location \| html %][% IF ( holding.sub_location ) %] ([% holding.sub_location \| html %])[% END %]</span>	200	<td class="location"><span class="shelvingloc">[% holding.location \| html %]</span>
201	<td class="collection">[% holding.ccode \| html %]</span>	201	<td class="collection">[% holding.ccode \| html %]</span>
202	<td class="itemcallnumber">[% IF ( holding.callnumber ) %] [% holding.callnumber \| html %][% END %]</td>	202	<td class="itemcallnumber">[% IF ( holding.callnumber ) %] [% holding.callnumber \| html %][% END %]</td>
203	<td class="status">	203	<td class="status">
Lines 207-215 Link Here
207	</td>	207	</td>
208	[% IF CAN_user_editcatalogue_edit_items %]	208	[% IF CAN_user_editcatalogue_edit_items %]
209	<td class="actions">	209	<td class="actions">
210	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/addholding.pl?op=edit&biblionumber=[% holding.biblionumber %]&holding_id=[% holding.holding_id %]#editholding"><i class="fa fa-pencil"></i> Edit</a>	210	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/addholding.pl?op=edit&biblionumber=[% holding.biblionumber \| uri %]&holding_id=[% holding.holding_id \| uri %]#editholding"><i class="fa fa-pencil"></i> Edit</a>
211	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/cataloguing/addholding.pl?op=delete&biblionumber=[% holding.biblionumber %]&holding_id=[% holding.holding_id %]"><i class="fa fa-eraser"></i> Delete</a>	211	<a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/cataloguing/addholding.pl?op=delete&biblionumber=[% holding.biblionumber \| uri %]&holding_id=[% holding.holding_id \| uri %]"><i class="fa fa-eraser"></i> Delete</a>
212	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% holding.biblionumber %]&holding_id=[% holding.holding_id %]#additema"><i class="fa fa-plus"></i> Add item</a>	212	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% holding.biblionumber \| uri %]&holding_id=[% holding.holding_id \| uri %]#additema"><i class="fa fa-plus"></i> Add item</a>
213	<a class="btn btn-default btn-xs previewMARC" href="/cgi-bin/koha/catalogue/showmarc.pl?holding_id=[% holding.holding_id \| uri %]&viewas=html" title="MARC">Show MARC</a>	213	<a class="btn btn-default btn-xs previewMARC" href="/cgi-bin/koha/catalogue/showmarc.pl?holding_id=[% holding.holding_id \| uri %]&viewas=html" title="MARC">Show MARC</a>
214	</td>	214	</td>
215	[% END %]	215	[% END %]

Lines 23-34 use t::lib::TestBuilder; Link Here

(-)a/t/db_dependent/Koha/Holding.t (-3 / +5 lines)
23		23
24	use C4::Biblio;	24	use C4::Biblio;
25		25
26	use Koha::BiblioFramework;
27	use Koha::BiblioFrameworks;	26	use Koha::BiblioFrameworks;
28	use Koha::Database;	27	use Koha::Database;
29	use Koha::Libraries;	28	use Koha::Libraries;
30	use Koha::Library;	29	use Koha::Library;
31	use Koha::MarcSubfieldStructure;
32	use Koha::MarcSubfieldStructures;	30	use Koha::MarcSubfieldStructures;
33		31
34	BEGIN {	32	BEGIN {
Lines 40-46 my $schema = Koha::Database->new->schema; Link Here
40		38
41	subtest 'Koha::Holding tests' => sub {	39	subtest 'Koha::Holding tests' => sub {
42		40
43	plan tests => 17;	41	plan tests => 19;
44		42
45	$schema->storage->txn_begin;	43	$schema->storage->txn_begin;
46		44
Lines 109-114 subtest 'Koha::Holding tests' => sub { Link Here
109	is($holding->frameworkcode(), $frameworkcode, 'Framework code correct in Koha::Holding object');	107	is($holding->frameworkcode(), $frameworkcode, 'Framework code correct in Koha::Holding object');
110	is($holding->holdingbranch(), 'ABC', 'Location correct in Koha::Holding object');	108	is($holding->holdingbranch(), 'ABC', 'Location correct in Koha::Holding object');
111		109
		110	my $branch = $holding->holding_branch();
		111	is(ref $branch, 'Koha::Library', 'holding_branch() returns a Koha::Library object');
		112	is($branch->branchname(), 'Abc', 'holding_branch() returns correct library');
		113
112	my $metadata = $holding->metadata;	114	my $metadata = $holding->metadata;
113	is( ref $metadata, 'Koha::Holdings::Metadata', 'Method metadata() returned a Koha::Holdings::Metadata object');	115	is( ref $metadata, 'Koha::Holdings::Metadata', 'Method metadata() returned a Koha::Holdings::Metadata object');
114		116