Bugzilla – Attachment 123759 Details for
Bug 27526
Remove Mod/AddItemFromMarc from additem.pl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 27526: Adjust code to use Koha::Items
Bug-27526-Adjust-code-to-use-KohaItems.patch (text/plain), 52.47 KB, created by
Martin Renvoize (ashimema)
on 2021-08-11 07:55:27 UTC
(
hide
)
Description:
Bug 27526: Adjust code to use Koha::Items
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-08-11 07:55:27 UTC
Size:
52.47 KB
patch
obsolete
>From 306643bf664a323200db7b59177f5baf3fd11396 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 25 Jan 2021 11:55:38 +0100 >Subject: [PATCH] Bug 27526: Adjust code to use Koha::Items > >Not that we removed all the transformations of the item and are using >Koha::Item from DB to TT (and the other way around), some code needs >adjustments. > >- Retrieve host items can be simplified (see Koha::Biblio->host_items) >- Some TT variables have been renamed for better understanding >- Koha::Item->columns_to_str return a hashref with the representation >string of the columns. A date will return the value how it must be >displayed, using output_pref. A subfield linked with a AV will be >replaced with the AV's description. >- LastCreatedItem cookie serializes and stores Koha::Item->unblessed, >no longer the MARC::Record > >Change in behaviour: If a subfield is linked with a AV cat and the value >is not a valid AV, before this patch the column was displayed with an >empty value. Now the column is hidden, it's considered empty. >In the sample data it happens with itemlost (0) and withdrawn (0). > >Test plan: >1. Test the Prefill > a. Turn PrefillItem on > b. Fill in SubfieldsToUseWhenPrefill with some subfield codes > c. Catalogue an item, save > => The values from subfields listed in SubfieldsToUseWhenPrefill must be > kept >2. more subfields > a. Add subfields that are not linked with a koha field (k is available) > b. Create an item and fill in all the values > c. Confirm that non linked subfields are stored and displayed correctly > d. Try with a "more subfield" that is linked with an authorised value > category >3. Test barcode values >4. Test the different "Add" buttons at the bottom of the form > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > Koha/Biblio.pm | 23 + > Koha/Item.pm | 73 ++- > cataloguing/additem.pl | 475 ++++++------------ > .../prog/en/modules/cataloguing/additem.tt | 115 +++-- > 4 files changed, 305 insertions(+), 381 deletions(-) > >diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm >index 26ee7abd96..4f889eead6 100644 >--- a/Koha/Biblio.pm >+++ b/Koha/Biblio.pm >@@ -419,6 +419,29 @@ sub items { > return Koha::Items->_new_from_dbic( $items_rs ); > } > >+sub host_items { >+ my ($self) = @_; >+ >+ return Koha::Items->new->empty >+ unless C4::Context->preference('EasyAnalyticalRecords'); >+ >+ my $marcflavour = C4::Context->preference("marcflavour"); >+ my $analyticfield = '773'; >+ if ( $marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC' ) { >+ $analyticfield = '773'; >+ } >+ elsif ( $marcflavour eq 'UNIMARC' ) { >+ $analyticfield = '461'; >+ } >+ my $marc_record = $self->metadata->record; >+ my @itemnumbers; >+ foreach my $field ( $marc_record->field($analyticfield) ) { >+ push @itemnumbers, $field->subfield('9'); >+ } >+ >+ return Koha::Items->search( { itemnumber => { -in => \@itemnumbers } } ); >+} >+ > =head3 itemtype > > my $itemtype = $biblio->itemtype(); >diff --git a/Koha/Item.pm b/Koha/Item.pm >index ca17ed0637..400fc2578b 100644 >--- a/Koha/Item.pm >+++ b/Koha/Item.pm >@@ -23,7 +23,7 @@ use List::MoreUtils qw( any ); > use Data::Dumper qw( Dumper ); > > use Koha::Database; >-use Koha::DateUtils qw( dt_from_string ); >+use Koha::DateUtils qw( dt_from_string output_pref ); > > use C4::Context; > use C4::Circulation qw( GetBranchItemRule ); >@@ -939,6 +939,77 @@ sub cover_images { > return Koha::CoverImages->_new_from_dbic($cover_image_rs); > } > >+sub columns_to_str { >+ my ( $self ) = @_; >+ >+ my $frameworkcode = $self->biblio->frameworkcode; >+ my $tagslib = C4::Biblio::GetMarcStructure(1, $frameworkcode); >+ my ( $itemtagfield, $itemtagsubfield) = C4::Biblio::GetMarcFromKohaField( "items.itemnumber" ); >+ >+ my $columns_info = $self->_result->result_source->columns_info; >+ >+ my $mss = C4::Biblio::GetMarcSubfieldStructure( $frameworkcode, { unsafe => 1 } ); >+ my $values = {}; >+ for my $column ( keys %$columns_info ) { >+ >+ next if $column eq 'more_subfields_xml'; >+ >+ my $value; >+ if ( Koha::Object::_datetime_column_type( $columns_info->{$column}->{data_type} ) ) { >+ $value = output_pref({ dateformat => 'rfc3339', dt => dt_from_string($value, 'sql')}); >+ } else { >+ $value = $self->$column; >+ } >+ >+ if ( not defined $value or $value eq "" ) { >+ $values->{$column} = $value; >+ next; >+ } >+ >+ my $subfield = >+ exists $mss->{"items.$column"} >+ ? @{ $mss->{"items.$column"} }[0] # Should we deal with several subfields?? >+ : undef; >+ >+ $values->{$column} = >+ $subfield >+ ? $subfield->{authorised_value} >+ ? C4::Biblio::GetAuthorisedValueDesc( $itemtagfield, >+ $subfield->{tagsubfield}, $value, '', $tagslib ) >+ : $value >+ : $value; >+ } >+ >+ my $marc_more= >+ $self->more_subfields_xml >+ ? MARC::Record->new_from_xml( $self->more_subfields_xml, 'UTF-8' ) >+ : undef; >+ >+ my $more_values; >+ if ( $marc_more ) { >+ my ( $field ) = $marc_more->fields; >+ for my $sf ( $field->subfields ) { >+ my $subfield_code = $sf->[0]; >+ my $value = $sf->[1]; >+ my $subfield = $tagslib->{$itemtagfield}->{$subfield_code}; >+ next unless $subfield; # We have the value but it's not mapped, data lose! No regression however. >+ $value = >+ $subfield->{authorised_value} >+ ? C4::Biblio::GetAuthorisedValueDesc( $itemtagfield, >+ $subfield->{tagsubfield}, $value, '', $tagslib ) >+ : $value; >+ >+ push @{$more_values->{$subfield_code}}, $value; >+ } >+ >+ while ( my ( $k, $v ) = each %$more_values ) { >+ $values->{$k} = join ' | ', @$v; >+ } >+ } >+ >+ return $values; >+} >+ > =head3 _set_found_trigger > > $self->_set_found_trigger >diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl >index 567f29adc6..eb422dcef3 100755 >--- a/cataloguing/additem.pl >+++ b/cataloguing/additem.pl >@@ -48,7 +48,6 @@ use Koha::ItemTypes; > use Koha::Libraries; > use Koha::Patrons; > use Koha::SearchEngine::Indexer; >-use List::MoreUtils qw( any ); > use C4::Search qw( enabled_staff_search_views ); > use Storable qw( freeze thaw ); > use URI::Escape qw( uri_escape_utf8 ); >@@ -57,60 +56,18 @@ use C4::Members; > use MARC::File::XML; > use URI::Escape qw( uri_escape_utf8 ); > use MIME::Base64 qw( decode_base64url encode_base64url ); >+use List::Util qw( first ); >+use List::MoreUtils qw( any uniq ); > > our $dbh = C4::Context->dbh; > >-sub find_value { >- my ($tagfield,$insubfield,$record) = @_; >- my $result; >- my $indicator; >- foreach my $field ($record->field($tagfield)) { >- my @subfields = $field->subfields(); >- foreach my $subfield (@subfields) { >- if (@$subfield[0] eq $insubfield) { >- $result .= @$subfield[1]; >- $indicator = $field->indicator(1).$field->indicator(2); >- } >- } >- } >- return($indicator,$result); >-} >- >-sub get_item_from_barcode { >- my ($barcode)=@_; >- my $dbh=C4::Context->dbh; >- my $result; >- my $rq=$dbh->prepare("SELECT itemnumber from items where items.barcode=?"); >- $rq->execute($barcode); >- ($result)=$rq->fetchrow; >- return($result); >-} >- >-# NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code >-# NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript >-sub _increment_barcode { >- my ($record, $frameworkcode) = @_; >- my ($tagfield,$tagsubfield) = &GetMarcFromKohaField( "items.barcode" ); >- unless ($record->field($tagfield)->subfield($tagsubfield)) { >- my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from items"); >- $sth_barcode->execute; >- my ($newbarcode) = $sth_barcode->fetchrow; >- $newbarcode++; >- # OK, we have the new barcode, now create the entry in MARC record >- my $fieldItem = $record->field($tagfield); >- $record->delete_field($fieldItem); >- $fieldItem->add_subfields($tagsubfield => $newbarcode); >- $record->insert_fields_ordered($fieldItem); >- } >- return $record; >-} >- >- > sub generate_subfield_form { >- my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $loop_data, $i, $restrictededition, $item) = @_; >+ my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $subfields, $i, $restrictededition, $item) = @_; > > my $frameworkcode = &GetFrameworkCode($biblionumber); > >+ $item //= {}; >+ > my %subfield_data; > my $dbh = C4::Context->dbh; > >@@ -182,7 +139,7 @@ sub generate_subfield_form { > # builds list, depending on authorised value... > if ( $subfieldlib->{authorised_value} eq "LOST" ) { > my $ClaimReturnedLostValue = C4::Context->preference('ClaimReturnedLostValue'); >- my $item_is_return_claim = $ClaimReturnedLostValue && $item && $item->itemlost && $ClaimReturnedLostValue eq $item->itemlost; >+ my $item_is_return_claim = $ClaimReturnedLostValue && exists $item->{itemlost} && $ClaimReturnedLostValue eq $item->{itemlost}; > $subfield_data{IS_RETURN_CLAIM} = $item_is_return_claim; > > $subfield_data{IS_LOST_AV} = 1; >@@ -287,7 +244,7 @@ sub generate_subfield_form { > item_style => 1, > }); > my $pars= { dbh => $dbh, record => $temp, tagslib =>$tagslib, >- id => $subfield_data{id}, tabloop => $loop_data }; >+ id => $subfield_data{id}, tabloop => $subfields }; > $plugin->build( $pars ); > if( !$plugin->errstr ) { > my $class= 'buttonDot'. ( $plugin->noclick? ' disabled': '' ); >@@ -374,34 +331,6 @@ sub generate_subfield_form { > return \%subfield_data; > } > >-# Removes some subfields when prefilling items >-# This function will remove any subfield that is not in the SubfieldsToUseWhenPrefill syspref >-sub removeFieldsForPrefill { >- >- my $item = shift; >- >- # Getting item tag >- my ($tag, $subtag) = GetMarcFromKohaField( "items.barcode" ); >- >- # Getting list of subfields to keep >- my $subfieldsToUseWhenPrefill = C4::Context->preference('SubfieldsToUseWhenPrefill'); >- >- # Removing subfields that are not in the syspref >- if ($tag && $subfieldsToUseWhenPrefill) { >- my $field = $item->field($tag); >- my @subfieldsToUse= split(/ /,$subfieldsToUseWhenPrefill); >- foreach my $subfield ($field->subfields()) { >- if (!grep { $subfield->[0] eq $_ } @subfieldsToUse) { >- $field->delete_subfield(code => $subfield->[0]); >- } >- >- } >- } >- >- return $item; >- >-} >- > my $input = CGI->new; > my $error = $input->param('error'); > >@@ -416,6 +345,8 @@ if( $input->param('itemnumber') && !$input->param('biblionumber') ){ > $itemnumber = $input->param('itemnumber'); > } > >+my $biblio = Koha::Biblios->find($biblionumber); >+ > my $op = $input->param('op') || q{}; > my $hostitemnumber = $input->param('hostitemnumber'); > my $marcflavour = C4::Context->preference("marcflavour"); >@@ -427,7 +358,7 @@ my $fa_branch = $input->param('branch'); > my $fa_stickyduedate = $input->param('stickyduedate'); > my $fa_duedatespec = $input->param('duedatespec'); > >-my $frameworkcode = &GetFrameworkCode($biblionumber); >+our $frameworkcode = &GetFrameworkCode($biblionumber); > > # Defining which userflag is needing according to the framework currently used > my $userflags; >@@ -455,29 +386,27 @@ $restrictededition = 0 if ($restrictededition != 0 && C4::Context->IsSuperLibra > # In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted > $restrictededition = 0 if ($restrictededition != 0 && $frameworkcode eq 'FA' && haspermission($uid, {'editcatalogue' => 'fast_cataloging'})); > >-my $tagslib = &GetMarcStructure(1,$frameworkcode); >+our $tagslib = &GetMarcStructure(1,$frameworkcode); > my $record = GetMarcBiblio({ biblionumber => $biblionumber }); > > output_and_exit_if_error( $input, $cookie, $template, > { module => 'cataloguing', record => $record } ); > > my $oldrecord = TransformMarcToKoha($record); >-my $itemrecord; >+my $current_item; > my $nextop="additem"; > my @errors; # store errors found while checking data BEFORE saving item. > > # Getting last created item cookie > my $prefillitem = C4::Context->preference('PrefillItem'); >-my $justaddeditem; >-my $cookieitemrecord; >+my $item_from_cookie; > if ($prefillitem) { > my $lastitemcookie = $input->cookie('LastCreatedItem'); > if ($lastitemcookie) { > $lastitemcookie = decode_base64url($lastitemcookie); > eval { > if ( thaw($lastitemcookie) ) { >- $cookieitemrecord = thaw($lastitemcookie); >- $cookieitemrecord = removeFieldsForPrefill($cookieitemrecord); >+ $item_from_cookie = thaw($lastitemcookie); > } > }; > if ($@) { >@@ -488,24 +417,13 @@ if ($prefillitem) { > } > > #------------------------------------------------------------------------------- >-my $current_item; > if ($op eq "additem") { > > my $add_submit = $input->param('add_submit'); >- my $add_duplicate_submit = $input->param('add_duplicate_submit'); > my $add_multiple_copies_submit = $input->param('add_multiple_copies_submit'); > my $number_of_copies = $input->param('number_of_copies'); > >- # This is a bit tricky : if there is a cookie for the last created item and >- # we just added an item, the cookie value is not correct yet (it will be updated >- # next page). To prevent the form from being filled with outdated values, we >- # force the use of "add and duplicate" feature, so the form will be filled with >- # correct values. >- $add_duplicate_submit = 1 if ($prefillitem); >- $justaddeditem = 1; >- > my @columns = Koha::Items->columns; >- my $biblio = Koha::Biblios->find($biblionumber); > my $item = Koha::Item->new; > $item->biblionumber($biblio->biblionumber); > for my $c ( @columns ) { >@@ -527,9 +445,9 @@ if ($op eq "additem") { > } > $item->more_subfields_xml(undef); > } else { >- my $v = $input->param("items.".$c); >- next unless defined $v; >- $item->$c($v); >+ my @v = $input->multi_param("items.".$c); >+ next unless @v; >+ $item->$c(join ' | ', uniq @v); > } > } > >@@ -540,44 +458,45 @@ if ($op eq "additem") { > } > > # If we have to add or add & duplicate, we add the item >- if ( $add_submit || $add_duplicate_submit ) { >+ if ( $add_submit || $prefillitem) { > > # check for item barcode # being unique > if ( Koha::Items->search({ barcode => $item->barcode })->count ) { > # if barcode exists, don't create, but report The problem. > push @errors, "barcode_not_unique"; >+ >+ $current_item = $item->unblessed; # Restore edit form for the same item > } > else { > $item->store->discard_changes; > >+ # This is a bit tricky : if there is a cookie for the last created item and >+ # we just added an item, the cookie value is not correct yet (it will be updated >+ # next page). To prevent the form from being filled with outdated values, we >+ # force the use of "add and duplicate" feature, so the form will be filled with >+ # correct values. >+ > # FIXME This need to be rewritten, we must store $item->unblessed instead >- ## Pushing the last created item cookie back >- #if ($prefillitem && defined $record) { >- # my $itemcookie = $input->cookie( >- # -name => 'LastCreatedItem', >- # # We encode_base64url the whole freezed structure so we're sure we won't have any encoding problems >- # -value => encode_base64url( freeze( $record ) ), >- # -HttpOnly => 1, >- # -expires => '' >- # ); >- >- # $cookie = [ $cookie, $itemcookie ]; >- #} >+ # Pushing the last created item cookie back >+ if ( $prefillitem ) { >+ $item_from_cookie = $input->cookie( >+ -name => 'LastCreatedItem', >+ # We encode_base64url the whole freezed structure so we're sure we won't have any encoding problems >+ -value => encode_base64url( freeze( { %{$item->unblessed}, itemnumber => undef } ) ), >+ -HttpOnly => 1, >+ -expires => '' >+ ); >+ >+ $cookie = [ $cookie, $item_from_cookie ]; >+ } > > } > $nextop = "additem"; > >- >- # FIXME reset item to the item we were editing >- #if ($exist_itemnumber) { >- >- # $itemrecord = $record; >- #} >- $current_item = $item->unblessed; > } > > # If we have to add & duplicate >- if ($add_duplicate_submit) { >+ if ($prefillitem) { > if (C4::Context->preference('autoBarcode') eq 'incremental') { > my ( $barcode ) = C4::Barcodes::ValueBuilder::incremental::get_barcode; > $current_item->{barcode} = $barcode; >@@ -586,14 +505,13 @@ if ($op eq "additem") { > # we have to clear the barcode field in the duplicate item record to make way for the new one generated by the javascript plugin > $current_item->{barcode} = undef; # FIXME or delete? > } >- # FIXME This subroutine needs to be adjusted >- # We want to pass $item >- # $itemrecord = removeFieldsForPrefill($itemrecord) if ($prefillitem); > } > > # If we have to add multiple copies > if ($add_multiple_copies_submit) { > >+ $current_item = $item->unblessed; >+ > my $copynumber = $current_item->{copynumber}; > my $oldbarcode = $current_item->{barcode}; > >@@ -604,7 +522,6 @@ if ($op eq "additem") { > if ( $oldbarcode && !$testbarcode ) { > > push @errors, "no_next_barcode"; >- $itemrecord = $record; > > } > else { >@@ -652,7 +569,9 @@ if ($op eq "additem") { > if ( !$exist_itemnumber ) { > delete $current_item->{itemnumber}; > $current_item = Koha::Item->new($current_item)->store( >- { skip_record_index => 1 } )->discard_changes->unblessed; >+ { skip_record_index => 1 } ); >+ $current_item->discard_changes; # Cannot chain discard_changes >+ $current_item = $current_item->unblessed; > set_item_default_location($current_item->{itemnumber}); > > # We count the item only if it was really added >@@ -692,41 +611,23 @@ if ($op eq "additem") { > } elsif ($op eq "edititem") { > #------------------------------------------------------------------------------- > # retrieve item if exist => then, it's a modif >- $itemrecord = C4::Items::GetMarcItem($biblionumber,$itemnumber); >+ $current_item = Koha::Items->find($itemnumber)->unblessed; >+ # FIXME Handle non existent item > $nextop = "saveitem"; > #------------------------------------------------------------------------------- > } elsif ($op eq "dupeitem") { > #------------------------------------------------------------------------------- > # retrieve item if exist => then, it's a modif >- $itemrecord = C4::Items::GetMarcItem($biblionumber,$itemnumber); >+ my $item = Koha::Items->find($itemnumber); >+ # FIXME Handle non existent item > if (C4::Context->preference('autoBarcode') eq 'incremental') { >- $itemrecord = _increment_barcode($itemrecord, $frameworkcode); >+ my ( $barcode ) = C4::Barcodes::ValueBuilder::incremental::get_barcode; >+ $item->barcode($barcode); > } > else { >- # we have to clear the barcode field in the duplicate item record to make way for the new one generated by the javascript plugin >- my ($tagfield,$tagsubfield) = &GetMarcFromKohaField( "items.barcode" ); >- my $fieldItem = $itemrecord->field($tagfield); >- $itemrecord->delete_field($fieldItem); >- $fieldItem->delete_subfields($tagsubfield); >- $itemrecord->insert_fields_ordered($fieldItem); >+ $item->barcode(undef); # Don't save it! > } > >- #check for hidden subfield and remove them for the duplicated item >- foreach my $field ($itemrecord->fields()){ >- my $tag = $field->{_tag}; >- foreach my $subfield ($field->subfields()){ >- my $subfieldtag = $subfield->[0]; >- if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10" >- || abs($tagslib->{$tag}->{$subfieldtag}->{hidden})>4 ){ >- my $fieldItem = $itemrecord->field($tag); >- $itemrecord->delete_field($fieldItem); >- $fieldItem->delete_subfields($subfieldtag); >- $itemrecord->insert_fields_ordered($fieldItem); >- } >- } >- } >- >- $itemrecord = removeFieldsForPrefill($itemrecord) if ($prefillitem); > $nextop = "additem"; > #------------------------------------------------------------------------------- > } elsif ($op eq "delitem") { >@@ -795,9 +696,9 @@ if ($op eq "additem") { > } > $item->more_subfields_xml(undef); > } else { >- my $v = $input->param("items.".$c); >- next unless defined $v; >- $item->$c($v); >+ my @v = $input->multi_param("items.".$c); >+ next unless @v; >+ $item->$c(join ' | ', uniq @v); > } > } > >@@ -805,6 +706,7 @@ if ($op eq "additem") { > if ( Koha::Items->search({ barcode => $item->barcode, itemnumber => { '!=' => $item->itemnumber } })->count ) { > # FIXME We shouldn't need that, ->store would explode as there is a unique constraint on items.barcode > push @errors,"barcode_not_unique"; >+ $current_item = $item->unblessed; # Restore edit form for the same item > } else { > my $newitemlost = $item->itemlost; > if ( $newitemlost && $newitemlost ge '1' && !$olditemlost ) { >@@ -844,213 +746,142 @@ if ($op) { > #------------------------------------------------------------------------------- > > # now, build existiing item list >-my $temp = GetMarcBiblio({ biblionumber => $biblionumber }); >-#my @fields = $record->fields(); >- > >-my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code >-my @big_array; >-#---- finds where items.itemnumber is stored >-my ( $itemtagfield, $itemtagsubfield) = &GetMarcFromKohaField( "items.itemnumber" ); >-my ($branchtagfield, $branchtagsubfield) = &GetMarcFromKohaField( "items.homebranch" ); >-C4::Biblio::EmbedItemsInMarcBiblio({ >- marc_record => $temp, >- biblionumber => $biblionumber }); >-my @fields = $temp->fields(); >- >- >-my @hostitemnumbers; >-if ( C4::Context->preference('EasyAnalyticalRecords') ) { >- my $analyticfield = '773'; >- if ($marcflavour eq 'MARC21' || $marcflavour eq 'NORMARC') { >- $analyticfield = '773'; >- } elsif ($marcflavour eq 'UNIMARC') { >- $analyticfield = '461'; >- } >- foreach my $hostfield ($temp->field($analyticfield)){ >- my $hostbiblionumber = $hostfield->subfield('0'); >- if ($hostbiblionumber){ >- my $hostrecord = GetMarcBiblio({ >- biblionumber => $hostbiblionumber, >- embed_items => 1 }); >- if ($hostrecord) { >- my ($itemfield, undef) = GetMarcFromKohaField( 'items.itemnumber' ); >- foreach my $hostitem ($hostrecord->field($itemfield)){ >- if ($hostitem->subfield('9') eq $hostfield->subfield('9')){ >- push (@fields, $hostitem); >- push (@hostitemnumbers, $hostfield->subfield('9')); >- } >- } >- } >- } >- } >+my @items; >+for my $item ( $biblio->items->as_list, $biblio->host_items->as_list ) { >+ push @items, $item->columns_to_str; > } > >-foreach my $field (@fields) { >- next if ( $field->tag() < 10 ); >- >- my @subf = $field->subfields or (); # don't use ||, as that forces $field->subfelds to be interpreted in scalar context >- my %this_row; >- # loop through each subfield >- my $i = 0; >- foreach my $subfield (@subf){ >- my $subfieldcode = $subfield->[0]; >- my $subfieldvalue= $subfield->[1]; >- >- next if ($tagslib->{$field->tag()}->{$subfieldcode}->{tab} ne 10 >- && ($field->tag() ne $itemtagfield >- && $subfieldcode ne $itemtagsubfield)); >- $witness{$subfieldcode} = $tagslib->{$field->tag()}->{$subfieldcode}->{lib} if ($tagslib->{$field->tag()}->{$subfieldcode}->{tab} eq 10); >- if ($tagslib->{$field->tag()}->{$subfieldcode}->{tab} eq 10) { >- $this_row{$subfieldcode} .= " | " if($this_row{$subfieldcode}); >- $this_row{$subfieldcode} .= GetAuthorisedValueDesc( $field->tag(), >- $subfieldcode, $subfieldvalue, '', $tagslib) >- || $subfieldvalue; >- } >+my @witness_attributes = uniq map { >+ my $item = $_; >+ map { defined $item->{$_} && $item->{$_} ne "" ? $_ : () } keys %$item >+} @items; > >- if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependentBranches")) { >- #verifying rights >- my $userenv = C4::Context->userenv(); >- unless (C4::Context->IsSuperLibrarian() or (($userenv->{'branch'} eq $subfieldvalue))){ >- $this_row{'nomod'} = 1; >- } >- } >- $this_row{itemnumber} = $subfieldvalue if ($field->tag() eq $itemtagfield && $subfieldcode eq $itemtagsubfield); >- >- if ( C4::Context->preference('EasyAnalyticalRecords') ) { >- foreach my $hostitemnumber (@hostitemnumbers) { >- my $item = Koha::Items->find( $hostitemnumber ); >- if ($this_row{itemnumber} eq $hostitemnumber) { >- $this_row{hostitemflag} = 1; >- $this_row{hostbiblionumber}= $item->biblio->biblionumber; >- last; >- } >- } >- } >- } >- if (%this_row) { >- push(@big_array, \%this_row); >- } >-} >+our ( $itemtagfield, $itemtagsubfield ) = &GetMarcFromKohaField("items.itemnumber"); > >-my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField( "items.holdingbranch" ); >-@big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array; >- >-# now, construct template ! >-# First, the existing items for display >-my @item_value_loop; >-my @header_value_loop; >-for my $row ( @big_array ) { >- my %row_data; >- my @item_fields; >- foreach my $key (sort keys %witness){ >- my $item_field; >- if ( $row->{$key} ){ >- $item_field->{field} = $row->{$key}; >- } else { >- $item_field->{field} = ''; >- } >+my $subfieldcode_attribute_mappings; >+for my $subfield_code ( keys %{ $tagslib->{$itemtagfield} } ) { > >- for my $kohafield ( >- qw( items.dateaccessioned items.onloan items.datelastseen items.datelastborrowed items.replacementpricedate ) >- ) >- { >- my ( undef, $subfield ) = GetMarcFromKohaField($kohafield); >- next unless $key eq $subfield; >- $item_field->{datatype} = 'date'; >- } >+ my $subfield = $tagslib->{$itemtagfield}->{$subfield_code}; > >- push @item_fields, $item_field; >+ next if IsMarcStructureInternal( $subfield ); >+ next unless $subfield->{tab} eq 10; # Is this really needed? >+ >+ my $attribute; >+ if ( $subfield->{kohafield} ) { >+ ( $attribute = $subfield->{kohafield} ) =~ s|^items\.||; >+ } else { >+ $attribute = $subfield_code; # It's in more_subfields_xml > } >- $row_data{item_value} = [ @item_fields ]; >- $row_data{itemnumber} = $row->{itemnumber}; >- #reporting this_row values >- $row_data{'nomod'} = $row->{'nomod'}; >- $row_data{'hostitemflag'} = $row->{'hostitemflag'}; >- $row_data{'hostbiblionumber'} = $row->{'hostbiblionumber'}; >-# $row_data{'countanalytics'} = $row->{'countanalytics'}; >- push(@item_value_loop,\%row_data); >+ next unless grep { $attribute eq $_ } @witness_attributes; >+ $subfieldcode_attribute_mappings->{$subfield_code} = $attribute; > } >-foreach my $subfield_code (sort keys(%witness)) { >- my %header_value; >- $header_value{header_value} = $witness{$subfield_code}; >- >- my $subfieldlib = $tagslib->{$itemtagfield}->{$subfield_code}; >- my $kohafield = $subfieldlib->{kohafield}; >- if ( $kohafield && $kohafield =~ /items.(.+)/ ) { >- $header_value{column_name} = $1; >- } > >- push(@header_value_loop, \%header_value); >-} >+my @header_value_loop = map { >+ { >+ header_value => $tagslib->{$itemtagfield}->{$_}->{lib}, >+ attribute => $subfieldcode_attribute_mappings->{$_}, >+ subfield_code => $_, >+ } >+} sort keys %$subfieldcode_attribute_mappings; > > # now, build the item form for entering a new item >-my @loop_data =(); >-my $i=0; >- > my $branch = $input->param('branch') || C4::Context->userenv->{branch}; > my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;# build once ahead of time, instead of multiple times later. > for my $library ( @$libraries ) { > $library->{selected} = 1 if $library->{branchcode} eq $branch > } > >-my $item = Koha::Items->find($itemnumber); > >-# We generate form, from actuel record >-@fields = (); >-if($itemrecord){ >- foreach my $field ($itemrecord->fields()){ >- my $tag = $field->{_tag}; >- foreach my $subfield ( $field->subfields() ){ >+# Using last created item if it exists >+$current_item = $item_from_cookie >+ if $item_from_cookie >+ && $prefillitem >+ && $op ne "additem" >+ && $op ne "edititem"; > >- my $subfieldtag = $subfield->[0]; >- my $value = $subfield->[1]; >- my $subfieldlib = $tagslib->{$tag}->{$subfieldtag}; >+my @subfields_to_prefill = split ' ', C4::Context->preference('SubfieldsToUseWhenPrefill'); > >- next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10"); >+if ( $current_item->{more_subfields_xml} ) { >+ $current_item->{marc_more_subfields_xml} = MARC::Record->new_from_xml($current_item->{more_subfields_xml}, 'UTF-8'); >+} > >- my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition, $item); >- push @fields, "$tag$subfieldtag"; >- push (@loop_data, $subfield_data); >- $i++; >+# We generate form, and fill with values if defined >+my $temp = GetMarcBiblio({ biblionumber => $biblionumber }); >+my $i = 0; >+my @subfields; >+foreach my $tag ( keys %{$tagslib} ) { >+ foreach my $subtag ( keys %{ $tagslib->{$tag} } ) { >+ >+ my $subfield = $tagslib->{$tag}{$subtag}; >+ >+ next if IsMarcStructureInternal( $subfield ); >+ next if ( $subfield->{tab} ne "10" ); >+ >+ my @values = (); >+ >+ my $subfield_data; >+ >+ # If we are not adding a new item >+ # OR >+ # If the subfield must be prefilled with last catalogued item >+ if ( >+ $nextop ne 'additem' >+ || ( >+ !$prefillitem >+ || ( $prefillitem && grep { $_ eq $subtag } >+ @subfields_to_prefill ) >+ ) >+ ) >+ { >+ my $kohafield = $subfield->{kohafield}; >+ if ($kohafield) { >+ >+ # This is a mapped field >+ ( my $attribute = $kohafield ) =~ s|^items\.||; >+ push @values, $subfield->{repeatable} >+ ? split '\s\|\s', $current_item->{$attribute} >+ : $current_item->{$attribute} >+ if defined $current_item->{$attribute}; >+ } else { >+ # Not mapped, picked the values from more_subfields_xml's MARC >+ my $marc_more = $current_item->{marc_more_subfields_xml}; >+ if ( $marc_more ) { >+ for my $f ( $marc_more->fields($tag) ) { >+ push @values, $f->subfield($subtag); > } >- > } > } >- # and now we add fields that are empty >- >-# Using last created item if it exists >+ } > >-$itemrecord = $cookieitemrecord if ($prefillitem and not $justaddeditem and $op ne "edititem"); >+ @values = ('') unless @values; > >-# We generate form, and fill with values if defined >-foreach my $tag ( keys %{$tagslib}){ >- foreach my $subtag (keys %{$tagslib->{$tag}}){ >- next if IsMarcStructureInternal($tagslib->{$tag}{$subtag}); >- next if ($tagslib->{$tag}->{$subtag}->{'tab'} ne "10"); >- next if any { /^$tag$subtag$/ } @fields; >- >- my @values = (undef); >- @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag))); >- for my $value (@values){ >- my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition, $item); >- push (@loop_data, $subfield_data); >+ for my $value (@values) { >+ my $subfield_data = generate_subfield_form( >+ $tag, $subtag, >+ $value, $tagslib, >+ $subfield, $libraries, >+ $biblionumber, $temp, >+ \@subfields, $i, >+ $restrictededition, $current_item, >+ ); >+ push @subfields, $subfield_data; > $i++; > } >- } >+ } > } >-@loop_data = sort { $a->{display_order} <=> $b->{display_order} || $a->{subfield} cmp $b->{subfield} } @loop_data; >+@subfields = sort { $a->{display_order} <=> $b->{display_order} || $a->{subfield} cmp $b->{subfield} } @subfields; > > # what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit. > $template->param( > biblionumber => $biblionumber, > title => $oldrecord->{title}, > author => $oldrecord->{author}, >- item_loop => \@item_value_loop, >+ items => \@items, > item_header_loop => \@header_value_loop, >- item => \@loop_data, >+ subfields => \@subfields, > itemnumber => $itemnumber, >- barcode => $item ? $item->barcode : undef, >+ barcode => $current_item->{barcode}, > itemtagfield => $itemtagfield, > itemtagsubfield => $itemtagsubfield, > op => $nextop, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index a360a70d1e..b6d9b98456 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -1,6 +1,7 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE Branches %] > [% USE KohaDates %] > [% USE TablesSettings %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -59,7 +60,7 @@ > [% IF last_item_for_hold %]<div class="dialog alert"><strong>Cannot delete</strong>: Last item for bibliographic record with biblio-level hold on it.</div>[% END %] > > <div id="cataloguing_additem_itemlist"> >- [% IF ( item_loop ) %] >+ [% IF items %] > [% SET date_fields = [ 'dateaccessioned', 'onloan', 'datelastseen', 'datelastborrowed', 'replacementpricedate' ] %] > <div> > <table id="itemst"> >@@ -78,54 +79,52 @@ > </tr> > </thead> > <tbody> >- [% FOREACH item_loo IN item_loop %] >- [% IF ( item_loo.itemnumber == itemnumber) %] >- [% IF item_loo.nomod %] >- <tr id="row[% item_loo.itemnumber | html %]" class="active"> >+ [% FOREACH item IN items %] >+ [% SET can_be_edited = ! ( Koha.Preference('IndependentBranches') && ! logged_in_user && item.homebranch != Branches.GetLoggedInBranchcode() ) %] >+ [% IF item.itemnumber == itemnumber%] >+ [% UNLESS can_be_edited %] >+ <tr id="row[% item.itemnumber | html %]" class="active"> > [% ELSE %] >- <tr id="row[% item_loo.itemnumber | html %]" class="active editable"> >+ <tr id="row[% item.itemnumber | html %]" class="active editable"> > [% END %] > [% ELSE %] >- [% IF item_loo.nomod %] >- <tr id="row[% item_loo.itemnumber | html %]"> >+ [% UNLESS can_be_edited %] >+ <tr id="row[% item.itemnumber | html %]"> > [% ELSE %] >- <tr id="row[% item_loo.itemnumber | html %]" class="editable"> >+ <tr id="row[% item.itemnumber | html %]" class="editable"> > [% END %] > [% END %] >- [% IF ( item_loo.nomod ) %] >+ [% UNLESS can_be_edited %] > <td> </td> > [% ELSE %] > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="itemactions[% item_loo.itemnumber | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> >- <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item_loo.itemnumber | html %]"> >+ <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item.itemnumber | html %]"> > >- [% IF ( item_loo.hostitemflag ) %] >- <li><a href="additem.pl?op=edititem&biblionumber=[% item_loo.hostbiblionumber | uri %]&itemnumber=[% item_loo.itemnumber | uri %]#edititem">Edit in host</a> <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&biblionumber=[% biblionumber | html %]&hostitemnumber=[% item_loo.itemnumber | html %]&searchid=[% searchid | html %]">Delink</a></li> >+ [% IF item.biblionumber != biblionumber %] [%# Host item %] >+ <li><a href="additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]#edititem">Edit in host</a> <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&biblionumber=[% biblionumber | html %]&hostitemnumber=[% item.itemnumber | html %]&searchid=[% searchid | html %]">Delink</a></li> > [% ELSE %] >- <li><a href="additem.pl?op=edititem&biblionumber=[% biblionumber | uri %]&itemnumber=[% item_loo.itemnumber | uri %]&searchid=[% searchid | uri %]#edititem">Edit</a></li> >- <li><a href="additem.pl?op=dupeitem&biblionumber=[% biblionumber | uri %]&itemnumber=[% item_loo.itemnumber | uri %]&searchid=[% searchid | uri %]#additema">Duplicate</a></li> >- <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&number_type=itemnumber&number_list=[% item_loo.itemnumber | uri %]" target="_blank" >Print label</a></li> >- [% IF ( item_loo.countanalytics ) %] >- <li><a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&q=% item_loo.itemnumber %]">View analytics</a></li> >- [% ELSE %] >- <li><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=[% biblionumber | html %]&itemnumber=[% item_loo.itemnumber | html %]&searchid=[% searchid | html %]" onclick="return confirm_deletion();">Delete</a></li> >- [% END %] >+ <li><a href="additem.pl?op=edititem&biblionumber=[% biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]&searchid=[% searchid | uri %]#edititem">Edit</a></li> >+ <li><a href="additem.pl?op=dupeitem&biblionumber=[% biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]&searchid=[% searchid | uri %]#additema">Duplicate</a></li> >+ <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&number_type=itemnumber&number_list=[% item.itemnumber | uri %]" target="_blank" >Print label</a></li> >+ <li><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]&searchid=[% searchid | html %]" onclick="return confirm_deletion();">Delete</a></li> > [% END %] > [% IF ( OPACBaseURL ) %] >- <li class="view-in-opac"><a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">OPAC view</a></li> >+ <li class="view-in-opac"><a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]">OPAC view</a></li> > [% END %] > </ul> > </div> > </td> > [% END %] >- [% FOREACH item_valu IN item_loo.item_value %] >- [% IF item_valu.datatype == 'date' %] >- <td data-order="[% item_valu.field | html %]">[% item_valu.field | $KohaDates %]</td> >+ [% FOREACH header IN item_header_loop %] >+ [% SET attribute = header.attribute %] >+ [% IF header.attribute AND date_fields.grep(attribute).size %] >+ <td data-order="[% item.$attribute | html %]">[% item.$attribute | $KohaDates %]</td> > [% ELSE %] >- <td>[% item_valu.field | html %]</td> >+ <td>[% item.$attribute | html %]</td> > [% END %] > [% END %] > </tr> >@@ -155,35 +154,35 @@ > [% END %] > <fieldset class="rows"> > <ol> >- [% FOREACH ite IN item %] >+ [% FOREACH subfield IN subfields %] > >- [% IF ite.kohafield == 'items.more_subfields_xml' %] >- [% SET kohafield = 'items.more_subfields_xml_' _ ite.subfield %] >+ [% IF subfield.kohafield == 'items.more_subfields_xml' %] >+ [% SET kohafield = 'items.more_subfields_xml_' _ subfield.subfield %] > [% ELSE %] >- [% SET kohafield = ite.kohafield %] >+ [% SET kohafield = subfield.kohafield %] > [% END %] > >- <li><div class="subfield_line" style="[% ite.visibility | html %]" id="subfield[% ite.tag | html %][% ite.subfield | html %][% ite.random | html %]"> >- [% IF ( ite.mandatory ) %] >- <label class="required">[% ite.subfield | html %] - [% ite.marc_lib | $raw %]</label> >+ <li><div class="subfield_line" style="[% subfield.visibility | html %]" id="subfield[% subfield.tag | html %][% subfield.subfield | html %][% subfield.random | html %]"> >+ [% IF ( subfield.mandatory ) %] >+ <label class="required">[% subfield.subfield | html %] - [% subfield.marc_lib | $raw %]</label> > [% ELSE %] >- <label>[% ite.subfield | html %] - [% ite.marc_lib | $raw %]</label> >+ <label>[% subfield.subfield | html %] - [% subfield.marc_lib | $raw %]</label> > [% END %] > >- [% SET mv = ite.marc_value %] >+ [% SET mv = subfield.marc_value %] > [% IF ( mv.type == 'hidden' ) %] >- <input type="hidden" id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]"> >+ <input type="hidden" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]"> > [% ELSIF ( mv.type == 'select' ) %] >- [% IF ( mv.readonly || ite.IS_RETURN_CLAIM ) %] >- <select name="[% kohafield %]" id="[%- mv.id | html -%]" class="input_marceditor" readonly="readonly" disabled="disabled" data-width="50%"> >+ [% IF ( mv.readonly || subfield.IS_RETURN_CLAIM ) %] >+ <select name="[% kohafield | html %]" id="[%- mv.id | html -%]" class="input_marceditor" readonly="readonly" disabled="disabled" data-width="50%"> > [% ELSE %] >- <select name="[% kohafield %]" id="[%- mv.id | html -%]" class="input_marceditor" data-category="[% mv.category | html %]" data-width="50%"> >+ <select name="[% kohafield | html %]" id="[%- mv.id | html -%]" class="input_marceditor" data-category="[% mv.category | html %]" data-width="50%"> > [% END %] > [% FOREACH aval IN mv.values %] > [% IF aval == mv.default %] > <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option> > [% ELSE %] >- [% IF ite.IS_LOST_AV && Koha.Preference("ClaimReturnedLostValue") && aval == Koha.Preference("ClaimReturnedLostValue") %] >+ [% IF subfield.IS_LOST_AV && Koha.Preference("ClaimReturnedLostValue") && aval == Koha.Preference("ClaimReturnedLostValue") %] > <option disabled="disabled" value="[%- aval | html -%]" title="Return claims must be processed from the patron details page">[%- mv.labels.$aval | html -%]</option> > [% ELSE %] > <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option> >@@ -193,17 +192,17 @@ > </select> > [% ELSIF ( mv.type == 'text_auth' ) %] > [% IF mv.readonly %] >- <input type="text" id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" readonly="readonly" /> >+ <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" readonly="readonly" /> > [% ELSE %] >- <input type="text" id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> >+ <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> > [% SET dopop = "Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=\"${mv.authtypecode}\"&index=${mv.id}','${mv.id}')" %] > <a href="#" class="buttonDot" onclick="[%- dopop | html -%]; return false;" title="Tag editor">...</a> > [% END %] > [% ELSIF ( mv.type == 'text_plugin' ) %] > [% IF mv.readonly %] >- <input type="text" id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" readonly="readonly" /> >+ <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" readonly="readonly" /> > [% ELSE %] >- <input type="text" id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> >+ <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> > [% IF ( mv.nopopup ) %] > <a href="#" id="buttonDot_[%- mv.id | html -%]" class="[%- mv.class | html -%]" title="No popup">...</a> > [% ELSE %] >@@ -213,32 +212,32 @@ > [% END %] > [% ELSIF ( mv.type == 'text' ) %] > [% IF mv.readonly %] >- <input type="text" id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" readonly="readonly" /> >+ <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" readonly="readonly" /> > [% ELSE %] >- <input type="text" id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> >+ <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> > [% END %] > [% ELSIF ( mv.type == 'textarea' ) %] > [% IF mv.readonly %] >- <textarea id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" rows="5" cols="64" readonly="readonly" >[% mv.value | html %]</textarea> >+ <textarea id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" rows="5" cols="64" readonly="readonly" >[% mv.value | html %]</textarea> > [% ELSE %] >- <textarea id="[%- mv.id | html -%]" name="[% kohafield %]" class="input_marceditor" rows="5" cols="64" >[% mv.value | html %]</textarea> >+ <textarea id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor" rows="5" cols="64" >[% mv.value | html %]</textarea> > [% END %] > [% END %] > >- [% IF ite.kohafield == 'items.more_subfields_xml' %] >- <input type="hidden" name="items.more_subfields_xml" value="[% ite.subfield %]" /> >+ [% IF subfield.kohafield == 'items.more_subfields_xml' %] >+ <input type="hidden" name="items.more_subfields_xml" value="[% subfield.subfield | html %]" /> > [% END %] >- <input type="hidden" name="tag" value="[% ite.tag | html %]" /> >- <input type="hidden" name="subfield" value="[% ite.subfield | html %]" /> >- <input type="hidden" name="mandatory" value="[% ite.mandatory | html %]" /> >- <input type="hidden" name="important" value="[% ite.important | html %]" /> >- [% IF ( ite.repeatable ) %] >+ <input type="hidden" name="tag" value="[% subfield.tag | html %]" /> >+ <input type="hidden" name="subfield" value="[% subfield.subfield | html %]" /> >+ <input type="hidden" name="mandatory" value="[% subfield.mandatory | html %]" /> >+ <input type="hidden" name="important" value="[% subfield.important | html %]" /> >+ [% IF ( subfield.repeatable ) %] > <a href="#" class="buttonPlus" onclick="CloneItemSubfield(this.parentNode.parentNode); return false;"> > <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /> > </a> > [% END %] >- [% IF ( ite.mandatory ) %] <span class="required">Required</span> >- [% ELSIF ( ite.important ) %] <span class="important">Important</span> >+ [% IF ( subfield.mandatory ) %] <span class="required">Required</span> >+ [% ELSIF ( subfield.important ) %] <span class="important">Important</span> > [% END %] > </div></li> > [% END %] >-- >2.20.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=123759">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 27526
:
115679
|
115680
|
116006
|
117806
|
117807
|
117808
|
121589
|
121590
|
121591
|
122288
|
122318
|
122655
|
122656
|
122657
|
122658
|
122676
|
122677
|
122681
|
122682
|
122694
|
122695
|
122696
|
122946
|
122947
|
122948
|
122949
|
122950
|
122951
|
122952
|
122953
|
122954
|
122957
|
122958
|
122959
|
122974
|
123006
|
123007
|
123110
|
123329
|
123372
|
123415
|
123757
|
123758
|
123759
|
123760
|
123761
|
123762
|
123763
|
123764
|
123765
|
123766
|
123767
|
123768
|
123769
|
123770
|
123771
|
123772
|
125069
|
125605
|
125606
|
125607
|
125608
|
125609
|
125610
|
125611
|
125612
|
125613
|
125614
|
125615
|
125616
|
125617
|
125618
|
125619
|
125620
|
125818
|
125839
|
125863
|
126034
|
126051
|
126143
|
126144
|
126393
|
127025
|
127032