Bugzilla – Attachment 27583 Details for
Bug 10875
addorderiso2709: the link "show all funds" is missing.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10875: Preselect the fund located in the record
Bug-10875-Preselect-the-fund-located-in-the-record.patch (text/plain), 5.21 KB, created by
Jonathan Druart
on 2014-04-25 09:35:09 UTC
(
hide
)
Description:
Bug 10875: Preselect the fund located in the record
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-04-25 09:35:09 UTC
Size:
5.21 KB
patch
obsolete
>From 3626e7d0b8ef60cf81f6f9312baa3f1b75f86267 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 25 Apr 2014 11:14:00 +0200 >Subject: [PATCH] Bug 10875: 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. >--- > .../prog/en/modules/acqui/addorderiso2709.tt | 22 +++++++++++--------- > 1 file changed, 12 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index b725e0e..2f500a2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -31,26 +31,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(); > } > }); > >@@ -240,10 +238,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 %] >@@ -332,7 +334,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> >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10875
:
20980
|
21640
|
27425
|
27521
|
27533
|
27583
|
27655
|
27656