Attachment 37373 Details for Bug 5786 – [SIGNED-OFF] Bug 5786: Correction: Removed erroneous holdability check from opac-search.pl

[patch] [SIGNED-OFF] Bug 5786: Correction: Removed erroneous holdability check from opac-search.pl

SIGNED-OFF-Bug-5786-Correction-Removed-erroneous-h.patch (text/plain), 3.71 KB, created by Kyle M Hall (khall) on 2015-03-30 13:42:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-03-30 13:42:39 UTC

Size: 3.71 KB

patch

obsolete

>From 64feb137d07aebcc6df1e184d5ca87882b6ab5e4 Mon Sep 17 00:00:00 2001
>From: Srdjan <srdjan@catalyst.net.nz>
>Date: Thu, 26 Mar 2015 19:32:15 +1300
>Subject: [PATCH] [SIGNED-OFF] Bug 5786: Correction: Removed erroneous holdability check from opac-search.pl
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../opac-tmpl/bootstrap/en/modules/opac-results.tt |    2 +-
> opac/opac-search.pl                                |   17 -----------------
> 2 files changed, 1 insertions(+), 18 deletions(-)
>
>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 fd2cb9f..2622b59 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>@@ -471,7 +471,7 @@
>                                                 <div class="actions-menu noprint">
>                                                         [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
>                                                             [% UNLESS ( SEARCH_RESULT.norequests ) %]
>-                                                                [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && SEARCH_RESULT.holdable %]
>+                                                                [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]
>                                                                     <span class="actions"><a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a></span>
>                                                                 [% END # / IF opacuserlogin && holdable %]
>                                                             [% END # UNLESS SEARCH_RESULT.norequests %]
>diff --git a/opac/opac-search.pl b/opac/opac-search.pl
>index cdf0fbb..f634f12 100755
>--- a/opac/opac-search.pl
>+++ b/opac/opac-search.pl
>@@ -42,8 +42,6 @@ use C4::Branch; # GetBranches
> use C4::SocialData;
> use C4::Ratings;
> use C4::External::OverDrive;
>-use C4::Members;
>-use C4::Reserves;
> 
> use POSIX qw(ceil floor strftime);
> use URI::Escape;
>@@ -569,11 +567,8 @@ if ($@ || $error) {
>     exit;
> }
> 
>-my $borrower = $borrowernumber ? GetMember( borrowernumber => $borrowernumber ) : undef;
>-
> # At this point, each server has given us a result set
> # now we build that set for template display
>-my %allow_onshelf_holds;
> my @sup_results_array;
> for (my $i=0;$i<@servers;$i++) {
>     my $server = $servers[$i];
>@@ -588,23 +583,11 @@ for (my $i=0;$i<@servers;$i++) {
>                 # we need to set the offset parameter of searchResults to 0
>                 my @group_results = searchResults( 'opac', $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
>                                                    $group->{"RECORDS"});
>-                if ($borrower) {
>-                    $_->{holdable} =
>-                        IsAvailableForItemLevelRequest($_, $borrower) &&
>-                        OPACItemHoldsAllowed($_, $borrower)
>-                      foreach @group_results;
>-                }
>                 push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results };
>             }
>         } else {
>             @newresults = searchResults('opac', $query_desc, $hits, $results_per_page, $offset, $scan,
>                                         $results_hashref->{$server}->{"RECORDS"});
>-            if ($borrower) {
>-                $_->{holdable} =
>-                    IsAvailableForItemLevelRequest($_, $borrower) &&
>-                    OPACItemHoldsAllowed($_, $borrower)
>-                  foreach @newresults;
>-            }
>         }
>         $hits = 0 unless @newresults;
> 
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 5786: 4706 | 4751 | 4755 | 6898 | 7018 | 7034 | 7044 | 11116 | 11137 | 11184 | 11185 | 11190 | 11903 | 11992 | 12323 | 12440 | 12441 | 15648 | 34080 | 34534 | 34535 | 34536 | 35545 | 35546 | 35547 | 35548 | 35550 | 35567 | 35568 | 35596 | 35597 | 35598 | 35599 | 36383 | 36384 | 36405 | 36617 | 36618 | 36619 | 37253 | 37263 | 37292 | 37373