gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 10875: (follow-up) preselect the fund located in the record 

It is useless to copy the fund list in a new node. It seems easier to
hide/show inactive/active funds.

This patch also adds a "(inactive)" marker in the fund list for
inactive funds. If the fund located in the record is inactive, it is
displayed by default and cannot be hidden.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Jonathan Druart 2014-04-25 11:14:00 +02:00 committed by Galen Charlton
parent 8c1112eb1e
commit 01fb9837d7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
View File

@ -26,26 +26,24 @@
"aaSorting": []
} ) );
//keep a copy of all budgets before removing the inactives
disabledBudgetsCopy = $("select[name='all_budget_id']").html();
$("select[name='all_budget_id'] .b_inactive").remove();
$("select[name='budget_id'] .b_inactive").remove();
$("select[name='all_budget_id'] .b_inactive").hide();
$("select[name='budget_id'] .b_inactive").hide();
$("#showallbudgets").click(function() {
if ($(this).is(":checked")) {
$("select[name='budget_id']").html(disabledBudgetsCopy); //Puts back all the funds
$("select[name='budget_id'] .b_inactive").show();
}
else {
$("select[name='budget_id'] .b_inactive").remove();
$("select[name='budget_id'] .b_inactive").hide();
}
});
$("#all_showallbudgets").click(function() {
if ($(this).is(":checked")) {
$("select[name='all_budget_id']").html(disabledBudgetsCopy); //Puts back all the funds
$("select[name='all_budget_id'] .b_inactive").show();
}
else {
$("select[name='all_budget_id'] .b_inactive").remove();
$("select[name='all_budget_id'] .b_inactive").hide();
}
});
@ -235,10 +233,14 @@
<option value="">Select a fund</option>
[% FOREACH budget IN budget_loop %]
[% IF ( budget.b_id == biblio.budget_id ) %]
[% IF budget.b_active %]
<option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]" selected="selected">[% budget.b_txt %]</option>
[% ELSE %]
<option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]" selected="selected">[% budget.b_txt %] (inactive)</option>
[% END %]
[% ELSE %]
[% IF budget.b_active %]<option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option>
[% ELSE %]<option value="[% budget.b_id %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option>
[% ELSE %]<option value="[% budget.b_id %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %] (inactive)</option>
[% END %]
[% END %]
[% END %]
@ -327,7 +329,7 @@
<option value="">Select a fund</option>
[% FOREACH budget_loo IN budget_loop %]
[% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
[% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
[% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %] (inactive)</option>
[% END %]
[% END %]
</select>