@@ -, +, @@ --- C4/Members.pm | 26 ---------- C4/Reserves.pm | 14 +++++- .../prog/en/modules/members/memberentrygen.tt | 13 +++++ .../opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 18 ++++++- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 50 +++++++++++++++++++- .../opac-tmpl/prog/en/modules/opac-privacy.tt | 21 +++++++- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 50 +++++++++++++++++++- opac/opac-privacy.pl | 38 +++++++++------ opac/opac-user.pl | 27 +++++++---- 9 files changed, 201 insertions(+), 56 deletions(-) --- a/C4/Members.pm +++ a/C4/Members.pm @@ -109,7 +109,6 @@ BEGIN { push @EXPORT, qw( &ModMember &changepassword - &ModPrivacy ); #Delete data @@ -2169,31 +2168,6 @@ sub GetBorrowersNamesAndLatestIssue { return $results; } -=head2 ModPrivacy - -=over 4 - -my $success = ModPrivacy( $borrowernumber, $privacy ); - -Update the privacy of a patron. - -return : -true on success, false on failure - -=back - -=cut - -sub ModPrivacy { - my $borrowernumber = shift; - my $privacy = shift; - return unless defined $borrowernumber; - return unless $borrowernumber =~ /^\d+$/; - - return ModMember( borrowernumber => $borrowernumber, - privacy => $privacy ); -} - =head2 AddMessage AddMessage( $borrowernumber, $message_type, $message, $branchcode ); --- a/C4/Reserves.pm +++ a/C4/Reserves.pm @@ -260,10 +260,22 @@ sub GetReserve { my ($reserve_id) = @_; my $dbh = C4::Context->dbh; + my $query = "SELECT * FROM reserves WHERE reserve_id = ?"; my $sth = $dbh->prepare( $query ); $sth->execute( $reserve_id ); - return $sth->fetchrow_hashref(); + my $res = $sth->fetchrow_hashref(); + + unless ($res) { + $query = "SELECT * FROM old_reserves WHERE reserve_id = ?"; + $sth = $dbh->prepare($query); + $sth->execute($reserve_id); + $res = $sth->fetchrow_hashref(); + } + + carp("No hold for for reserve_id $reserve_id") unless $res; + + return $res; } =head2 GetReservesFromBiblionumber --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1170,6 +1170,19 @@ [% END %] [% IF ( mandatorypassword ) %]Required[% END %][% IF ( ERROR_password_mismatch ) %]Passwords do not match[% END %] +