@@ -, +, @@ - Set the marcflavour syspref to MARC21, NORMARC and UNIMARC, one after the other. - Check that correct doc links are shown for MARC21 and UNIMARC on the cataloguing screen, and that no checkbox and no doc links are displayed for NORMARC. --- cataloguing/addbiblio.pl | 8 ++------ .../prog/en/modules/cataloguing/addbiblio.tt | 13 +++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) --- a/cataloguing/addbiblio.pl +++ a/cataloguing/addbiblio.pl @@ -1062,16 +1062,12 @@ elsif ( $op eq "delete" ) { } $template->param( title => $record->title() ) if ( $record ne "-1" ); -if (C4::Context->preference("marcflavour") eq "MARC21"){ - $template->param(MARC21 => 1); -} - - $template->param( popup => $mode, frameworkcode => $frameworkcode, itemtype => $frameworkcode, - borrowernumber => $loggedinuser + borrowernumber => $loggedinuser, + marcflavour => C4::Context->preference("marcflavour"), ); output_html_with_http_headers $input, $cookie, $template->output; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -78,9 +78,9 @@ function PopupZ3950() { } function PopupMARCFieldDoc(field, blocknumber) { - [% IF ( MARC21 ) %] + [% IF ( marcflavour == 'MARC21' ) %] _MARC21FieldDoc(field); - [% ELSE %] + [% ELSIF ( marcflavour == 'UNIMARC' ) %] _UNIMARCFieldDoc(field, blocknumber); [% END %] } @@ -664,10 +664,10 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
- -

[% IF ( biblionumber ) %]Editing [% title |html %] (Record Number [% biblionumber %])

[% ELSE %]Add MARC Record[% END %] +[% IF marcflavour != 'NORMARC' %]
Show MARC tag documentation links
+[% END %] [% UNLESS ( number ) %] @@ -825,8 +825,9 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? [% IF advancedMARCEditor %] [% innerloo.tag %] [% ELSE %] - [% innerloo.tag %] ? + [% innerloo.tag %] + [% IF marcflavour != 'NORMARC' %] ?[% END %] + [% END %] [% IF ( innerloo.fixedfield ) %] --