View | Details | Raw Unified | Return to bug 18403
Collapse All | Expand All

(-)a/C4/Auth.pm (-1 / +1 lines)
Lines 254-260 sub get_template_and_user { Link Here
254
            );
254
            );
255
        }
255
        }
256
256
257
        $template->param( "USER_INFO" => $patron->unblessed );
257
        $template->param( "USER_INFO" => $patron->unblessed ) if $borrowernumber != 0;
258
258
259
        my $all_perms = get_all_subpermissions();
259
        my $all_perms = get_all_subpermissions();
260
260
(-)a/Koha/ArticleRequests.pm (-1 / +1 lines)
Lines 51-57 sub search_limited { Link Here
51
51
52
    my $userenv = C4::Context->userenv;
52
    my $userenv = C4::Context->userenv;
53
    my @restricted_branchcodes;
53
    my @restricted_branchcodes;
54
    if ( $userenv ) {
54
    if ( $userenv and $userenv->{number} ) {
55
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
55
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
56
        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
56
        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
57
    }
57
    }
(-)a/Koha/Libraries.pm (-1 / +2 lines)
Lines 46-52 sub search_filtered { Link Here
46
    my ( $self, $params, $attributes ) = @_;
46
    my ( $self, $params, $attributes ) = @_;
47
47
48
    my @branchcodes;
48
    my @branchcodes;
49
    if ( my $userenv = C4::Context->userenv ) {
49
    my $userenv = C4::Context->userenv;
50
    if ( $userenv and $userenv->{number} ) {
50
        my $only_from_group = $params->{only_from_group};
51
        my $only_from_group = $params->{only_from_group};
51
        if ( $only_from_group ) {
52
        if ( $only_from_group ) {
52
            my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
53
            my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
(-)a/Koha/Patron/Discharge.pm (-1 / +1 lines)
Lines 184-190 sub search_limited { Link Here
184
    my ( $params, $attributes ) = @_;
184
    my ( $params, $attributes ) = @_;
185
    my $userenv = C4::Context->userenv;
185
    my $userenv = C4::Context->userenv;
186
    my @restricted_branchcodes;
186
    my @restricted_branchcodes;
187
    if ( $userenv ) {
187
    if ( $userenv and $userenv->{number} ) {
188
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
188
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
189
        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
189
        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
190
    }
190
    }
(-)a/Koha/Patron/Modifications.pm (-1 / +1 lines)
Lines 54-60 sub pending_count { Link Here
54
54
55
    my $userenv = C4::Context->userenv;
55
    my $userenv = C4::Context->userenv;
56
    my @branchcodes;
56
    my @branchcodes;
57
    if ( $userenv ) {
57
    if ( $userenv and $userenv->{number} ) {
58
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
58
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
59
        if ($branchcode) {
59
        if ($branchcode) {
60
            return 0 unless $logged_in_user->can_see_patrons_from($branchcode);
60
            return 0 unless $logged_in_user->can_see_patrons_from($branchcode);
(-)a/Koha/Patrons.pm (-1 / +1 lines)
Lines 54-60 sub search_limited { Link Here
54
54
55
    my $userenv = C4::Context->userenv;
55
    my $userenv = C4::Context->userenv;
56
    my @restricted_branchcodes;
56
    my @restricted_branchcodes;
57
    if ( $userenv ) {
57
    if ( $userenv and $userenv->{number} ) {
58
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
58
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
59
        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
59
        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
60
    }
60
    }
(-)a/Koha/Reviews.pm (-1 / +1 lines)
Lines 48-54 sub search_limited { Link Here
48
48
49
    my $userenv = C4::Context->userenv;
49
    my $userenv = C4::Context->userenv;
50
    my @restricted_branchcodes;
50
    my @restricted_branchcodes;
51
    if ( $userenv ) {
51
    if ( $userenv and $userenv->{number} ) {
52
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
52
        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
53
        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
53
        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
54
    }
54
    }
(-)a/members/member-flags.pl (-2 / +5 lines)
Lines 45-52 my ($template, $loggedinuser, $cookie) = get_template_and_user({ Link Here
45
        debug           => 1,
45
        debug           => 1,
46
});
46
});
47
47
48
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
48
my $userenv = C4::Context->userenv;
49
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
49
if ( $userenv and $userenv->{number} ) { # Allow DB user to create a superlibrarian patron
50
    my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
51
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
52
}
50
53
51
my %member2;
54
my %member2;
52
$member2{'borrowernumber'}=$member;
55
$member2{'borrowernumber'}=$member;
(-)a/members/memberentry.pl (-3 / +5 lines)
Lines 76-82 my ($template, $loggedinuser, $cookie) Link Here
76
       });
76
       });
77
77
78
my $borrowernumber = $input->param('borrowernumber');
78
my $borrowernumber = $input->param('borrowernumber');
79
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
80
my $patron         = Koha::Patrons->find($borrowernumber);
79
my $patron         = Koha::Patrons->find($borrowernumber);
81
80
82
if ( C4::Context->preference('SMSSendDriver') eq 'Email' ) {
81
if ( C4::Context->preference('SMSSendDriver') eq 'Email' ) {
Lines 107-113 my $borrower_data; Link Here
107
my $NoUpdateLogin;
106
my $NoUpdateLogin;
108
my $userenv = C4::Context->userenv;
107
my $userenv = C4::Context->userenv;
109
108
110
111
## Deal with debarments
109
## Deal with debarments
112
$template->param(
110
$template->param(
113
    debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) );
111
    debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) );
Lines 154-160 $template->param( "quickadd" => 1 ) if ( $quickadd ); Link Here
154
$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
152
$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
155
$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
153
$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
156
if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) {
154
if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) {
157
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
155
    if ( $patron and $userenv and $userenv->{number} ) { # Allow DB user to create a superlibrarian patron
156
        my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
157
        output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
158
    }
159
158
    $borrower_data = $patron->unblessed;
160
    $borrower_data = $patron->unblessed;
159
    $borrower_data->{category_type} = $patron->category->category_type;
161
    $borrower_data->{category_type} = $patron->category->category_type;
160
}
162
}
(-)a/members/moremember.pl (-4 / +5 lines)
Lines 121-129 $borrowernumber = HTML::Entities::encode($borrowernumber); Link Here
121
my $error = $input->param('error');
121
my $error = $input->param('error');
122
$template->param( error => $error ) if ( $error );
122
$template->param( error => $error ) if ( $error );
123
123
124
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
125
my $patron         = Koha::Patrons->find( $borrowernumber );
124
my $patron         = Koha::Patrons->find( $borrowernumber );
126
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
125
my $userenv = C4::Context->userenv;
126
if ( $userenv and $userenv->{number} ) { # Allow DB user to create a superlibrarian patron
127
    my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
128
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
129
}
127
130
128
my $issues        = $patron->checkouts;
131
my $issues        = $patron->checkouts;
129
my $balance       = $patron->account->balance;
132
my $balance       = $patron->account->balance;
Lines 202-208 $bor{'borrowernumber'} = $borrowernumber; Link Here
202
# Converts the branchcode to the branch name
205
# Converts the branchcode to the branch name
203
my $samebranch;
206
my $samebranch;
204
if ( C4::Context->preference("IndependentBranches") ) {
207
if ( C4::Context->preference("IndependentBranches") ) {
205
    my $userenv = C4::Context->userenv;
206
    if ( C4::Context->IsSuperLibrarian() ) {
208
    if ( C4::Context->IsSuperLibrarian() ) {
207
        $samebranch = 1;
209
        $samebranch = 1;
208
    }
210
    }
209
- 

Return to bug 18403