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

(-)a/C4/Suggestions.pm (-1 / +12 lines)
Lines 132-142 sub SearchSuggestion { Link Here
132
                push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')};
132
                push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')};
133
                }
133
                }
134
            }
134
            }
135
    } else {
136
        if ( defined $suggestion->{branchcode} && $suggestion->{branchcode} ) {
137
            unless ( $suggestion->{branchcode} eq '__ANY__' ) {
138
                push @sql_params, $suggestion->{branchcode};
139
                push @query,      qq{ AND suggestions.branchcode=? };
140
            }
141
        } else {
142
            push @query, qq{
143
                AND (suggestions.branchcode='' OR suggestions.branchcode IS NULL)
144
            };
145
        }
135
    }
146
    }
136
147
137
    foreach my $field (grep { my $fieldname=$_;
148
    foreach my $field (grep { my $fieldname=$_;
138
        any {$fieldname eq $_ } qw<
149
        any {$fieldname eq $_ } qw<
139
    STATUS branchcode itemtype suggestedby managedby acceptedby
150
    STATUS itemtype suggestedby managedby acceptedby
140
    bookfundid biblionumber
151
    bookfundid biblionumber
141
    >} keys %$suggestion
152
    >} keys %$suggestion
142
    ) {
153
    ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-3 / +2 lines)
Lines 325-331 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
325
    <fieldset class="rows"> <legend>Acquisition information</legend><ol>
325
    <fieldset class="rows"> <legend>Acquisition information</legend><ol>
326
        <li><label for="branchcode">Library:</label>
326
        <li><label for="branchcode">Library:</label>
327
            <select name="branchcode" id="branchcode">
327
            <select name="branchcode" id="branchcode">
328
                <option value="">Any</option>[% FOREACH branchloo IN branchloop %]
328
                <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %]
329
                [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %][% END %]
329
                [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %][% END %]
330
            </select>
330
            </select>
331
        </li>
331
        </li>
Lines 558-564 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
558
                    </select></li>
558
                    </select></li>
559
                    <li><label for="branchcode"> For:</label>
559
                    <li><label for="branchcode"> For:</label>
560
                    <select name="branchcode" id="branchcode">
560
                    <select name="branchcode" id="branchcode">
561
                        <option value="">Any</option>[% FOREACH branchloo IN branchloop %]
561
                        <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %]
562
                            [% IF ( branchloo.selected ) %] <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %] <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
562
                            [% IF ( branchloo.selected ) %] <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %] <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
563
                            [% END %]
563
                            [% END %]
564
                    </select></li><li><input type="submit" value="Go" /></li></ol>
564
                    </select></li><li><input type="submit" value="Go" /></li></ol>
565
- 

Return to bug 9928