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

(-)a/C4/Suggestions.pm (-1 / +12 lines)
Lines 143-153 sub SearchSuggestion { Link Here
143
                };
143
                };
144
            }
144
            }
145
        }
145
        }
146
    } else {
147
        if ( defined $suggestion->{branchcode} && $suggestion->{branchcode} ) {
148
            unless ( $suggestion->{branchcode} eq '__ANY__' ) {
149
                push @sql_params, $suggestion->{branchcode};
150
                push @query,      qq{ AND suggestions.branchcode=? };
151
            }
152
        } else {
153
            push @query, qq{
154
                AND (suggestions.branchcode='' OR suggestions.branchcode IS NULL)
155
            };
156
        }
146
    }
157
    }
147
158
148
    # filter on nillable fields
159
    # filter on nillable fields
149
    foreach my $field (
160
    foreach my $field (
150
        qw( STATUS branchcode itemtype suggestedby managedby acceptedby budgetid biblionumber )
161
        qw( STATUS itemtype suggestedby managedby acceptedby budgetid biblionumber )
151
      )
162
      )
152
    {
163
    {
153
        if ( exists $suggestion->{$field} ) {
164
        if ( exists $suggestion->{$field} ) {
(-)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 555-561 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
555
                    </select></li>
555
                    </select></li>
556
                    <li><label for="branchcode"> For:</label>
556
                    <li><label for="branchcode"> For:</label>
557
                    <select name="branchcode" id="branchcode">
557
                    <select name="branchcode" id="branchcode">
558
                        <option value="">Any</option>[% FOREACH branchloo IN branchloop %]
558
                        <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %]
559
                            [% IF ( branchloo.selected ) %] <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %] <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
559
                            [% IF ( branchloo.selected ) %] <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %] <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
560
                            [% END %]
560
                            [% END %]
561
                    </select></li><li><input type="submit" value="Go" /></li></ol>
561
                    </select></li><li><input type="submit" value="Go" /></li></ol>
562
- 

Return to bug 9928