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

Bug 35211: Removed local items from group tabs and removed group items from other holdings tab 

Fixed the issues with tabs.

I cannot replicate the issue in the attached screenshot. What steps did you take?

Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Eric Garcia 2025-07-10 18:52:22 +00:00 committed by Lucas Gass
parent 5c2b0fd496
commit 124c6c8670
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
catalogue/detail.pl
View File

@ -332,13 +332,7 @@ if ( defined $dat->{'itemtype'} ) {
$dat->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtypes->{ $dat->{itemtype} }->imageurl );
}
if ( C4::Context->preference('SeparateHoldings') ) {
my $SeparateHoldingsBranch = C4::Context->preference('SeparateHoldingsBranch') || 'homebranch';
my $other_holdings_count =
$items_to_display->search( { $SeparateHoldingsBranch => { '!=' => C4::Context->userenv->{branch} } } )->count;
$template->param( other_holdings_count => $other_holdings_count );
}
my $total_group_holdings_count = 0;
if ( C4::Context->preference('SeparateHoldingsByGroup') ) {
my $branchcode = C4::Context->userenv->{branch};
my @all_search_groups = Koha::Library::Groups->get_search_groups( { interface => 'staff' } );
@ -361,15 +355,13 @@ if ( C4::Context->preference('SeparateHoldingsByGroup') ) {
push @libs_branchcodes, $lib->branchcode;
}
# Push logged in branchcode
push @libs_branchcodes, $branchcode;
# Build group branchcode hash
$branchcode_hash{ $group->id } = \@libs_branchcodes;
my $group_holdings_count =
$items_to_display->search( { homebranch => { '-in' => \@libs_branchcodes } } )->count;
$holdings_count{ $group->id } = $group_holdings_count;
$total_group_holdings_count += $group_holdings_count;
push @lib_groups, $group;
}
@ -383,6 +375,13 @@ if ( C4::Context->preference('SeparateHoldingsByGroup') ) {
);
}
if ( C4::Context->preference('SeparateHoldings') ) {
my $SeparateHoldingsBranch = C4::Context->preference('SeparateHoldingsBranch') || 'homebranch';
my $other_holdings_count =
$items_to_display->search( { $SeparateHoldingsBranch => { '!=' => C4::Context->userenv->{branch} } } )->count;
$other_holdings_count -= $total_group_holdings_count;
$template->param( other_holdings_count => $other_holdings_count );
}
$template->param(
count => $all_items->count, # FIXME 'count' is used in catalog-strings.inc
# But it's not a meaningful variable, we should rename it there

4
koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
View File

@ -328,7 +328,9 @@
if ( tab_id == 'holdings' ) {
default_filters[branch] = '[% Branches.GetLoggedInBranchcode() | html %]';
} else {
default_filters[branch] = { '!=': '[% Branches.GetLoggedInBranchcode() | html %]' };
let all_branchcodes = Object.values(branchcodes).flat();
all_branchcodes.push('[% Branches.GetLoggedInBranchcode() | html %]');
default_filters[branch] = { '-not_in' : all_branchcodes };
}
[% END %]