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

(-)a/C4/Suggestions.pm (-1 / +1 lines)
Lines 138-144 sub SearchSuggestion { Link Here
138
    if ( C4::Context->preference('IndependentBranches') ) {
138
    if ( C4::Context->preference('IndependentBranches') ) {
139
        my $userenv = C4::Context->userenv;
139
        my $userenv = C4::Context->userenv;
140
        if ($userenv) {
140
        if ($userenv) {
141
            if ( !C4::Context->IsSuperLibrarian() && !$suggestion->{branchcode} )
141
            if ( !C4::Context->IsSuperLibrarian() || !$suggestion->{branchcode} )
142
            {
142
            {
143
                push @sql_params, $$userenv{branch};
143
                push @sql_params, $$userenv{branch};
144
                push @query,      q{
144
                push @query,      q{
(-)a/suggestion/suggestion.pl (-5 / +7 lines)
Lines 117-122 my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user( Link Here
117
117
118
$borrowernumber = $input->param('borrowernumber') if ( $input->param('borrowernumber') );
118
$borrowernumber = $input->param('borrowernumber') if ( $input->param('borrowernumber') );
119
$template->param('borrowernumber' => $borrowernumber);
119
$template->param('borrowernumber' => $borrowernumber);
120
my $branchfilter = $input->param('branchcode') || C4::Context->userenv->{'branch'};
120
121
121
#########################################
122
#########################################
122
##  Operations
123
##  Operations
Lines 255-261 if ($op=~/else/) { Link Here
255
    $op='else';
256
    $op='else';
256
    
257
    
257
    $displayby||="STATUS";
258
    $displayby||="STATUS";
258
    delete $$suggestion_ref{'branchcode'} if($displayby eq "branchcode");
259
    # distinct values of display by
259
    # distinct values of display by
260
    my $criteria_list=GetDistinctValues("suggestions.".$displayby);
260
    my $criteria_list=GetDistinctValues("suggestions.".$displayby);
261
    my (@criteria_dv, $criteria_has_empty);
261
    my (@criteria_dv, $criteria_has_empty);
Lines 269-274 if ($op=~/else/) { Link Here
269
    # aggregate null and empty values under empty value
269
    # aggregate null and empty values under empty value
270
    push @criteria_dv, '' if $criteria_has_empty;
270
    push @criteria_dv, '' if $criteria_has_empty;
271
271
272
    # Hack to not modify GetDistinctValues for this specific case
273
    if ( $displayby eq 'branchcode' && C4::Context->preference('IndependentBranches') ) {
274
        @criteria_dv = [ C4::Context->userenv->{'branch'} ];
275
    }
276
272
    my @allsuggestions;
277
    my @allsuggestions;
273
    foreach my $criteriumvalue ( @criteria_dv ) {
278
    foreach my $criteriumvalue ( @criteria_dv ) {
274
        # By default, display suggestions from current working branch
279
        # By default, display suggestions from current working branch
Lines 277-283 if ($op=~/else/) { Link Here
277
        }
282
        }
278
        my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne "";
283
        my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne "";
279
284
280
        next if ( $definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue );
285
        next if ( $definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue ) and ($displayby ne 'branchcode' or $branchfilter ne '__ANY__' );
281
        $$suggestion_ref{$displayby} = $criteriumvalue;
286
        $$suggestion_ref{$displayby} = $criteriumvalue;
282
287
283
        my $suggestions = &SearchSuggestion($suggestion_ref);
288
        my $suggestions = &SearchSuggestion($suggestion_ref);
Lines 332-339 if(defined($returnsuggested) and $returnsuggested ne "noone") Link Here
332
    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
337
    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
333
}
338
}
334
339
335
my $branchfilter = ($displayby ne "branchcode") ? $input->param('branchcode') : C4::Context->userenv->{'branch'};
336
337
$template->param(
340
$template->param(
338
    branchfilter => $branchfilter,
341
    branchfilter => $branchfilter,
339
);
342
);
340
- 

Return to bug 18743