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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-3 / +28 lines)
Lines 447-456 Link Here
447
        </li>
447
        </li>
448
        <li><label for="budgetid">Fund:</label>
448
        <li><label for="budgetid">Fund:</label>
449
            <select name="budgetid" id="budgetid">
449
            <select name="budgetid" id="budgetid">
450
                <option value="">Any</option>[% FOREACH budgetsloo IN budgetsloop %]
450
                <option value="">Any</option>
451
                [% IF ( budgetsloo.selected ) %]<option value="[% budgetsloo.budget_id | html %]" selected="selected">[% budgetsloo.budget_name | html %]</option>[% ELSE %]<option value="[% budgetsloo.budget_id | html %]">[% budgetsloo.budget_name | html %]</option>[% END %][% END %]
451
                [% FOREACH budget IN sugg_budgets %]
452
                    [% IF ( budget.selected ) %]
453
                        <option value="[% budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( !budget.b_active ) %](inactive)[% END %]</option>
454
                    [% ELSIF ( budget.b_active ) %]
455
                        <option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option>
456
                    [% ELSE %]
457
                        <option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option>
458
                    [% END %]
459
                [% END %]
452
            </select>
460
            </select>
453
		</li><li><label for="quantity">Copies:</label>
461
            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
462
            <input type="checkbox" id="showallfunds" />
463
        </li>
464
        <li><label for="quantity">Copies:</label>
454
            <input type="text" size="10" id="quantity" name="quantity" value="[% quantity | html %]" />
465
            <input type="text" size="10" id="quantity" name="quantity" value="[% quantity | html %]" />
455
                </li>
466
                </li>
456
                <li>
467
                <li>
Lines 1186-1191 Link Here
1186
                    $('#notify').prop('checked', false).prop('disabled', true);
1197
                    $('#notify').prop('checked', false).prop('disabled', true);
1187
                });
1198
                });
1188
1199
1200
                //keep a copy of all budgets before removing the inactives
1201
                var budgetId = $("form#add_edit #budgetid");
1202
                var disabledBudgetsCopy = budgetId.html();
1203
                $('.b_inactive').remove();
1204
1205
                $('#showallfunds').click(function() {
1206
                    if ($(this).is(":checked")) {
1207
                        budgetId.html(disabledBudgetsCopy); //Puts back all the funds
1208
                    }
1209
                    else {
1210
                        $('.b_inactive').remove();
1211
                    }
1212
                });
1213
1189
            });
1214
            });
1190
        </script>
1215
        </script>
1191
    [% END %]
1216
    [% END %]
(-)a/suggestion/suggestion.pl (-3 / +19 lines)
Lines 407-413 $template->param( returnsuggestedby => $returnsuggestedby ); Link Here
407
my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
407
my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
408
$template->param(patron_reason_loop=>$patron_reason_loop);
408
$template->param(patron_reason_loop=>$patron_reason_loop);
409
409
410
#Budgets management
410
# Budgets for filtering
411
my $budgets = GetBudgets;
411
my $budgets = GetBudgets;
412
my @budgets_loop;
412
my @budgets_loop;
413
foreach my $budget ( @{$budgets} ) {
413
foreach my $budget ( @{$budgets} ) {
Lines 420-427 foreach my $budget ( @{$budgets} ) { Link Here
420
420
421
    push @budgets_loop, $budget;
421
    push @budgets_loop, $budget;
422
}
422
}
423
424
$template->param( budgetsloop => \@budgets_loop);
423
$template->param( budgetsloop => \@budgets_loop);
424
425
# Budgets for suggestion add or edition
426
my $sugg_budget_loop = [];
427
my $sugg_budgets     = GetBudgetHierarchy();
428
foreach my $r ( @{$sugg_budgets} ) {
429
    next unless ( CanUserUseBudget( $borrowernumber, $r, $userflags ) );
430
    my $selected = ( $$suggestion_ref{budgetid} && $r->{budget_id} eq $$suggestion_ref{budgetid} ) ? 1 : 0;
431
    push @{$sugg_budget_loop},
432
      {
433
        b_id     => $r->{budget_id},
434
        b_txt    => $r->{budget_name},
435
        b_active => $r->{budget_period_active},
436
        selected => $selected,
437
      };
438
}
439
@{$sugg_budget_loop} = sort { uc( $a->{b_txt} ) cmp uc( $b->{b_txt} ) } @{$sugg_budget_loop};
440
$template->param( sugg_budgets => $sugg_budget_loop);
441
425
if( $suggestion_ref->{STATUS} ) {
442
if( $suggestion_ref->{STATUS} ) {
426
    $template->param(
443
    $template->param(
427
        "statusselected_".$suggestion_ref->{STATUS} => 1,
444
        "statusselected_".$suggestion_ref->{STATUS} => 1,
428
- 

Return to bug 11176