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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-20 / +24 lines)
Lines 605-611 Link Here
605
                                [% END %]
605
                                [% END %]
606
                            </select>
606
                            </select>
607
                            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
607
                            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
608
                            <input type="checkbox" id="showallfunds" />
608
                            <input type="checkbox" class="showallfunds" />
609
                        </li>
609
                        </li>
610
                        <li>
610
                        <li>
611
                            <label for="quantity">Copies:</label>
611
                            <label for="quantity">Copies:</label>
Lines 1219-1240 Link Here
1219
                                    <fieldset class="brief acquisition_information">
1219
                                    <fieldset class="brief acquisition_information">
1220
                                        <ol>
1220
                                        <ol>
1221
                                            <li>
1221
                                            <li>
1222
                                                <label for="budgetid"> Book fund:</label>
1222
                                                <label for="budgetid">Fund:</label>
1223
                                                <select name="budgetid" id="budgetid">
1223
                                                <select name="budgetid" id="budgetid">
1224
                                                    <option value="__ANY__">Any</option>
1225
                                                    [% IF budgetid == '__NONE__' %]
1224
                                                    [% IF budgetid == '__NONE__' %]
1226
                                                        <option value="__NONE__" selected="selected">None</option>
1225
                                                        <option value="__NONE__" selected="selected">None</option>
1227
                                                    [% ELSE %]
1226
                                                    [% ELSE %]
1228
                                                        <option value="__NONE__">None</option>
1227
                                                        <option value="__NONE__">None</option>
1229
                                                    [% END %]
1228
                                                    [% END %]
1230
                                                    [% FOREACH budgetsloo IN budgetsloop %]
1229
                                                    [% FOREACH budget IN sugg_budgets %]
1231
                                                        [% IF ( budgetsloo.selected ) %]
1230
                                                        [% IF ( budget.selected ) %]
1232
                                                            <option value="[% budgetsloo.budget_id | html %]" selected="selected">[% budgetsloo.budget_name | html %]</option>
1231
                                                            <option value="[% budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( !budget.b_active ) %](inactive)[% END %]</option>
1232
                                                        [% ELSIF ( budget.b_active ) %]
1233
                                                            <option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option>
1233
                                                        [% ELSE %]
1234
                                                        [% ELSE %]
1234
                                                            <option value="[% budgetsloo.budget_id | html %]">[% budgetsloo.budget_name | html %]</option>
1235
                                                            <option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option>
1235
                                                        [% END %]
1236
                                                        [% END %]
1236
                                                    [% END %]
1237
                                                    [% END %]
1237
                                                </select>
1238
                                                </select>
1239
                                                <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
1240
                                                <input type="checkbox" class="showallfunds" />
1238
                                            </li>
1241
                                            </li>
1239
                                        </ol>
1242
                                        </ol>
1240
                                    </fieldset> <!-- /#acquisition_information -->
1243
                                    </fieldset> <!-- /#acquisition_information -->
Lines 1325-1330 Link Here
1325
            });
1328
            });
1326
            return 0;
1329
            return 0;
1327
        }
1330
        }
1331
1332
        //keep a copy of all budgets before removing the inactives
1333
        var budgetId = $("#budgetid");
1334
        var disabledBudgetsCopy = budgetId.html();
1335
        $('.b_inactive').remove();
1336
1337
        $('.showallfunds').click(function() {
1338
            if ($(this).is(":checked")) {
1339
                budgetId.html(disabledBudgetsCopy); //Puts back all the funds
1340
            }
1341
            else {
1342
                $('.b_inactive').remove();
1343
            }
1344
        });
1328
    </script>
1345
    </script>
1329
1346
1330
    [% IF ( op == 'show' || op == 'else' ) %]
1347
    [% IF ( op == 'show' || op == 'else' ) %]
Lines 1483-1501 Link Here
1483
                    $('#notify').prop('checked', false).prop('disabled', true);
1500
                    $('#notify').prop('checked', false).prop('disabled', true);
1484
                });
1501
                });
1485
1502
1486
                //keep a copy of all budgets before removing the inactives
1487
                var budgetId = $("form#add_edit #budgetid");
1488
                var disabledBudgetsCopy = budgetId.html();
1489
                $('.b_inactive').remove();
1490
1491
                $('#showallfunds').click(function() {
1492
                    if ($(this).is(":checked")) {
1493
                        budgetId.html(disabledBudgetsCopy); //Puts back all the funds
1494
                    }
1495
                    else {
1496
                        $('.b_inactive').remove();
1497
                    }
1498
                });
1499
1503
1500
            });
1504
            });
1501
        </script>
1505
        </script>
(-)a/suggestion/suggestion.pl (-16 lines)
Lines 470-490 $template->param( returnsuggestedby => $returnsuggestedby ); Link Here
470
my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
470
my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
471
$template->param(patron_reason_loop=>$patron_reason_loop);
471
$template->param(patron_reason_loop=>$patron_reason_loop);
472
472
473
# Budgets for filtering
474
my $budgets = GetBudgets;
475
my @budgets_loop;
476
foreach my $budget ( @{$budgets} ) {
477
    next unless (CanUserUseBudget($borrowernumber, $budget, $userflags));
478
479
    ## Please see file perltidy.ERR
480
    $budget->{'selected'} = 1
481
        if ($$suggestion_ref{'budgetid'}
482
        && $budget->{'budget_id'} eq $$suggestion_ref{'budgetid'});
483
484
    push @budgets_loop, $budget;
485
}
486
$template->param( budgetsloop => \@budgets_loop);
487
488
# Budgets for suggestion add or edition
473
# Budgets for suggestion add or edition
489
my $sugg_budget_loop = [];
474
my $sugg_budget_loop = [];
490
my $sugg_budgets     = GetBudgetHierarchy();
475
my $sugg_budgets     = GetBudgetHierarchy();
491
- 

Return to bug 37246