gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 29144: Show html opac_info on opac-detail page 

Note: This patch disables the API call (which is not really needed),
and still needs attention in a following patch.

Test plan:
Add opac_info for two libraries and a branchurl for one of the two.
Select a biblio with an item having these two libraries as either
home or holding branch.
Toggle OpacLocationBranchToDisplay and check items table on opac
detail. Click on the library name.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Marcel de Rooy 2022-08-03 12:13:20 +00:00 committed by Tomas Cohen Arazi
parent 3f6d3b9af6
commit f7c7051b9f
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
2 changed files with 66 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
View File

@ -1246,16 +1246,19 @@
<link property="itemOffered" href="#record" />
<link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
[% IF ( ITEM_RESULT.holding_branch.opac_info ) %]
<a href="[% ITEM_RESULT.holding_branch.branchurl | url %]" class="library_info" data-branchcode="[% ITEM_RESULT.holding_branch.branchcode | html %]">
<i class="fa fa-info-circle" aria-hidden="true"></i> [% ITEM_RESULT.holding_branch.branchname | html %]
[%# Show opac_info or branchurl from holding library %]
[% SET holding_library_name = ITEM_RESULT.branchname %]
[% SET holding_library_url = Branches.GetURL( ITEM_RESULT.holdingbranch ) %]
[% IF ( ITEM_RESULT.holding_library_info ) %]
<a href="[% holding_library_url | url %]" class="library_info" data-info="[% ITEM_RESULT.holding_library_info | html %]" data-name="[% holding_library_name | html %]">
<i class="fa fa-info-circle" aria-hidden="true"></i> [% holding_library_name | html %]
</a>
[% ELSIF ( ITEM_RESULT.holding_branch.branchurl ) %]
<a href="[% ITEM_RESULT.branchurl | url %]">
[% ITEM_RESULT.holding_branch.branchname | html %]
[% ELSIF holding_library_url %]
<a href="[% holding_library_url | url %]">
[% holding_library_name | html %]
</a>
[% ELSE %]
<span>[% ITEM_RESULT.holding_branch.branchname | html %]</span>
<span>[% holding_library_name | html %]</span>
[% END %]
[% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
@ -1270,16 +1273,19 @@
<link property="itemOffered" href="#record" />
<link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
[% IF ( ITEM_RESULT.holding_branch.opac_info ) %] [%# FIXME Shouldn't this be home_branch instead of holding_branch? %]
<a href="[% ITEM_RESULT.home_branch.branchurl | url %]" class="library_info" data-branchcode="[% ITEM_RESULT.home_branch.branchchode | html %]">
<i class="fa fa-info-circle" aria-hidden="true"></i> [% ITEM_RESULT.home_branch.branchname | html %]
[%# Show opac_info or branchurl from home library %]
[% SET home_library_name = Branches.GetName( ITEM_RESULT.homebranch ) %]
[% SET home_library_url = Branches.GetURL( ITEM_RESULT.homebranch ) %]
[% IF ( ITEM_RESULT.home_library_info ) %]
<a href="[% home_library_url | url %]" class="library_info" data-info="[% ITEM_RESULT.home_library_info | html %]" data-name="[% home_library_name | html %]">
<i class="fa fa-info-circle" aria-hidden="true"></i> [% home_library_name | html %]
</a>
[% ELSIF ( ITEM_RESULT.home_branch.branchurl ) %]
<a href="[% ITEM_RESULT.home_branch.branchurl | url %]">
[% ITEM_RESULT.home_branch.branchname | html %]
[% ELSIF home_library_url %]
<a href="[% home_library_url | url %]">
[% home_library_name | html %]
</a>
[% ELSE %]
<span>[% ITEM_RESULT.home_branch.branchname | html %]</span>
<span>[% home_library_name | html %]</span>
[% END %]
[% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
@ -1955,29 +1961,42 @@
$(".library_info").on("click", function(e){
e.preventDefault();
var branchcode = $(this).data("branchcode");
var library_name = $(this).data("name");
var opac_info = $(this).data("info");
var url = $(this).attr("href");
$.ajax({
url: "/api/v1/public/libraries/" + branchcode,
type: 'GET',
dataType: 'json',
success: function(result) {
$("#libraryInfoModalLabel").html( result.name );
$("#libraryInfo").html( result.opac_info );
if( result.url ){
$("#libraryInfoLink").attr("href", result.url );
$("#libraryInfoLink").show();
} else {
$("#libraryInfoLink").hide();
}
$("#libraryInfoModal").modal("show");
},
error: function(xhr, status, error) {
if( url ){
location.href = url;
}
if( 1 ) {
$("#libraryInfoModalLabel").html( library_name );
$("#libraryInfo").html( opac_info );
if( url ){
$("#libraryInfoLink").attr("href", url );
$("#libraryInfoLink").show();
} else {
$("#libraryInfoLink").hide();
}
});
$("#libraryInfoModal").modal("show");
} else { // FIXME Temporary disabled: see BZ 29144
$.ajax({
url: "/api/v1/public/libraries/" + branchcode,
type: 'GET',
dataType: 'json',
success: function(result) {
$("#libraryInfoModalLabel").html( result.name );
$("#libraryInfo").html( opac_info );
if( result.url ){
$("#libraryInfoLink").attr("href", result.url );
$("#libraryInfoLink").show();
} else {
$("#libraryInfoLink").hide();
}
$("#libraryInfoModal").modal("show");
},
error: function(xhr, status, error) {
if( url ){
location.href = url;
}
}
});
}
});
$("#libraryInfoModal").on("hide.bs.modal", function(){
$("#libraryInfoModalLabel, #libraryInfo").html("");

13
opac/opac-detail.pl
View File

@ -626,11 +626,12 @@ if ( $showcomp eq 'both' || $showcomp eq 'opac' ) {
# XSLT processing of some stuff
my $variables = {};
my $lang = C4::Languages::getlanguage();
my @plugin_responses = Koha::Plugins->call(
'opac_detail_xslt_variables',
{
biblio_id => $biblionumber,
lang => C4::Languages::getlanguage(),
lang => $lang,
patron_id => $borrowernumber,
},
);
@ -679,11 +680,21 @@ if ( not $viewallitems and $items->count > $max_items_to_display ) {
);
}
else {
my $library_info;
while ( my $item = $items->next ) {
my $item_info = $item->unblessed;
$item_info->{holds_count} = $item_reserves{ $item->itemnumber };
$item_info->{priority} = $priority{ $item->itemnumber };
# Get opac_info from Additional contents for home and holding library
my ( $opac_info_home, $opac_info_holding );
$opac_info_holding = $library_info->{ $item->holdingbranch } // $item->holding_branch->opac_info({ lang => $lang });
$library_info->{ $item->holdingbranch } = $opac_info_holding;
$opac_info_home = $library_info->{ $item->homebranch } // $item->home_branch->opac_info({ lang => $lang });
$library_info->{ $item->homebranch } = $opac_info_home;
$item_info->{holding_library_info} = $opac_info_holding->content if $opac_info_holding;
$item_info->{home_library_info} = $opac_info_home->content if $opac_info_home;
$allow_onshelf_holds = Koha::CirculationRules->get_onshelfholds_policy(
{ item => $item, patron => $patron } )
unless $allow_onshelf_holds;