From a40ef1081f57a5accd8f307cd080a1e634fc3663 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 18 Jun 2021 14:55:25 +0200 Subject: [PATCH] Bug 12561: Remove HighlightOwnItemsOnOPAC and HighlightOwnItemsOnOPACWhich This is the only remaining non-XSLT only feature. We should remove the non-XSLT views that have been deprecated for a while now, and remove this feature. --- C4/UsageStats.pm | 1 - .../data/mysql/atomicupdate/bug_12561.perl | 7 ++++ installer/data/mysql/mandatory/sysprefs.sql | 2 -- .../en/modules/admin/preferences/opac.pref | 11 ------ .../prog/en/modules/catalogue/detail.tt | 6 +--- .../bootstrap/en/modules/opac-detail.tt | 6 +--- .../bootstrap/en/modules/opac-results.tt | 7 +--- opac/opac-detail.pl | 34 ------------------ opac/opac-search.pl | 35 ------------------- 9 files changed, 10 insertions(+), 99 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_12561.perl diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm index 400709b59b1..2ff5303bcb9 100644 --- a/C4/UsageStats.pm +++ b/C4/UsageStats.pm @@ -275,7 +275,6 @@ sub _shared_preferences { COinSinOPACResults DisplayOPACiconsXSLT hidelostitems - HighlightOwnItemsOnOPAC OpacAddMastheadLibraryPulldown OPACDisplay856uAsImage OpacHighlightedWords diff --git a/installer/data/mysql/atomicupdate/bug_12561.perl b/installer/data/mysql/atomicupdate/bug_12561.perl new file mode 100644 index 00000000000..da6777467ad --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_12561.perl @@ -0,0 +1,7 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + + $dbh->do( q{ DELETE FROM systempreferences WHERE variable IN ('HighlightOwnItemsOnOPAC', 'HighlightOwnItemsOnOPACWhich')} ); + + NewVersion( $DBversion, 12561, "Remove system preferences HighlightOwnItemsOnOPAC and HighlightOwnItemsOnOPACWhich"); +} diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 6b66e42c142..c98d6032a22 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -234,8 +234,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('hidelostitems','0','','If ON, disables display of\"lost\" items in OPAC.','YesNo'), ('HidePatronName','0','','If this is switched on, patron\'s cardnumber will be shown instead of their name on the holds and catalog screens','YesNo'), ('hide_marc','0',NULL,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)','YesNo'), -('HighlightOwnItemsOnOPAC','0','','If on, and a patron is logged into the OPAC, items from their home library will be emphasized and shown first in search results and item details.','YesNo'), -('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch|OpacURLBranch','Decides which branch\'s items to emphasize. If PatronBranch, emphasize the logged in user\'s library\'s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha\'s Apache configuration file.','Choice'), ('HoldFeeMode','not_always','any_time_is_placed|not_always|any_time_is_collected','Set the hold fee mode','Choice'), ('HoldsAutoFill','0',NULL,'If on, librarian will not be asked if hold should be filled, it will be filled automatically','YesNo'), ('HoldsAutoFillPrintSlip','0',NULL,'If on, hold slip print dialog will be displayed automatically','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 535f65bd87f..49ffe1b2d62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -42,17 +42,6 @@ OPAC: 0: Disable - "Koha OPAC as public. Private OPAC requires authentication before accessing the OPAC. " - 'Note: This does not affect the public API, see the RESTPublicAnonymousRequests to control the API.' - - - - pref: HighlightOwnItemsOnOPAC - choices: - 1: Emphasize - 0: "Don't emphasize" - - "results from the " - - pref: HighlightOwnItemsOnOPACWhich - choices: - PatronBranch: "patron's home library" - OpacURLBranch: "OPAC's library via the URL" - - " by moving the results to the front and increasing the size or highlighting the rows for those results (non-XSLT only)." - - "Show star-ratings on" - pref: OpacStarRatings diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 494e836e266..680cf32aeeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -107,11 +107,7 @@ [% END %] [% IF ( AmazonCoverImages || LocalCoverImages || AdlibrisEnabled || IntranetCoce || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) ) %] - [% IF ( XSLTDetailsDisplay ) %] -
- [% ELSE %] -
- [% END %] +
[% ELSE %]
[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index dd0a4ff8eea..8336f36edf3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -1269,11 +1269,7 @@ [% FOREACH ITEM_RESULT IN items %] - [% IF ITEM_RESULT.this_branch %] - - [% ELSE %] - - [% END %] + [% IF Koha.Preference('OPACLocalCoverImages') && ( tab == 'holdings' && itemloop_has_images || tab == 'otherholdings' && otheritemloop_has_images ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index b00f066f983..4b9ef839135 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -503,12 +503,7 @@ [% IF ( SEARCH_RESULT.available_items_loop.size() ) %] Items available: [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %] - [% IF available_items_loo.this_branch %] - - [% ELSE %] - - [% END %] - + [% IF ( singleBranchMode ) %] [% available_items_loo.location | html %] [% ELSE %] diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index cbb216e291c..704bee61187 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -578,40 +578,6 @@ if ($hideitems) { @items = @all_items; } -my $branch = ''; -if (C4::Context->userenv){ - $branch = C4::Context->userenv->{branch}; -} -if ( C4::Context->preference('HighlightOwnItemsOnOPAC') ) { - if ( - ( ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) && $branch ) - || - C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' - ) { - my $branchcode; - if ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) { - $branchcode = $branch; - } - elsif ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - $branchcode = $ENV{'BRANCHCODE'}; - } - - my @our_items; - my @other_items; - - foreach my $item ( @items ) { - if ( $item->{branchcode} eq $branchcode ) { - $item->{'this_branch'} = 1; - push( @our_items, $item ); - } else { - push( @other_items, $item ); - } - } - - @items = ( @our_items, @other_items ); - } -} - my $dat = &GetBiblioData($biblionumber); my $HideMARC = $record_processor->filters->[0]->should_hide_marc( { diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 67c11c182f3..4294ea6de21 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -833,41 +833,6 @@ for (my $i=0;$i<@servers;$i++) { } $template->param(results_per_page => $results_per_page); my $hide = ($hidingrules) ? 1 : 0; - my $branch = ''; - if (C4::Context->userenv){ - $branch = C4::Context->userenv->{branch}; - } - if ( C4::Context->preference('HighlightOwnItemsOnOPAC') ) { - if ( - ( ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) && $branch ) - || - C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' - ) { - my $branchcode; - if ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'PatronBranch' ) { - $branchcode = $branch; - } - elsif ( C4::Context->preference('HighlightOwnItemsOnOPACWhich') eq 'OpacURLBranch' ) { - $branchcode = $ENV{'BRANCHCODE'}; - } - - foreach my $res ( @newresults ) { - my @new_loop; - my @top_loop; - my @old_loop = @{$res->{'available_items_loop'}}; - foreach my $item ( @old_loop ) { - if ( $item->{'branchcode'} eq $branchcode ) { - $item->{'this_branch'} = 1; - push( @top_loop, $item ); - } else { - push( @new_loop, $item ); - } - } - my @complete_loop = ( @top_loop, @new_loop ); - $res->{'available_items_loop'} = \@complete_loop; - } - } - } $template->param( SEARCH_RESULTS => \@newresults, -- 2.20.1