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

(-)a/C4/Suggestions.pm (-6 / +8 lines)
Lines 135-146 sub SearchSuggestion { Link Here
135
    if ( C4::Context->preference('IndependentBranches') ) {
135
    if ( C4::Context->preference('IndependentBranches') ) {
136
        my $userenv = C4::Context->userenv;
136
        my $userenv = C4::Context->userenv;
137
        if ($userenv) {
137
        if ($userenv) {
138
            if ( !C4::Context->IsSuperLibrarian() && !$suggestion->{branchcode} )
138
            if ( !C4::Context->IsSuperLibrarian())
139
            {
139
            {
140
                push @sql_params, $$userenv{branch};
140
                if( !$suggestion->{branchcode} ||  $suggestion->{branchcode} eq $userenv->{branch}){ 
141
                push @query,      q{
141
                    push @sql_params, $$userenv{branch};
142
                    AND (suggestions.branchcode=? OR suggestions.branchcode='')
142
                    push @query,      q{
143
                };
143
                        AND (suggestions.branchcode=? OR suggestions.branchcode='')
144
                    };
145
                }
144
            }
146
            }
145
        }
147
        }
146
    } else {
148
    } else {
Lines 405-411 sub CountSuggestion { Link Here
405
            FROM suggestions
407
            FROM suggestions
406
                LEFT JOIN borrowers ON borrowers.borrowernumber=suggestions.suggestedby
408
                LEFT JOIN borrowers ON borrowers.borrowernumber=suggestions.suggestedby
407
            WHERE STATUS=?
409
            WHERE STATUS=?
408
                AND (borrowers.branchcode='' OR borrowers.branchcode=?)
410
                AND (suggestions.branchcode='' OR suggestions.branchcode=?)
409
        };
411
        };
410
        $sth = $dbh->prepare($query);
412
        $sth = $dbh->prepare($query);
411
        $sth->execute( $status, $userenv->{branch} );
413
        $sth->execute( $status, $userenv->{branch} );
(-)a/suggestion/suggestion.pl (-3 / +4 lines)
Lines 261-268 if ($op=~/else/) { Link Here
261
    my @allsuggestions;
261
    my @allsuggestions;
262
    foreach my $criteriumvalue ( @criteria_dv ) {
262
    foreach my $criteriumvalue ( @criteria_dv ) {
263
        # By default, display suggestions from current working branch
263
        # By default, display suggestions from current working branch
264
        unless ( exists $$suggestion_ref{'branchcode'} ) {
264
        if (C4::Context->preference('IndependentBranches') && !C4::Context->IsSuperLibrarian()) {
265
            $$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'};
265
            unless ( exists $$suggestion_ref{'branchcode'} ) {
266
                $$suggestion_ref{'branchcode'} = C4::Context->userenv->{'branch'};
267
            }
266
        }
268
        }
267
        my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne "";
269
        my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne "";
268
270
269
- 

Return to bug 18743