Bugzilla – Attachment 27710 Details for
Bug 11578
Improvement of the funds list view
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11578: Hide filters if a budget (budgetperiod) is chosen
Bug-11578-Hide-filters-if-a-budget-budgetperiod-is.patch (text/plain), 2.24 KB, created by
Jonathan Druart
on 2014-04-28 09:03:28 UTC
(
hide
)
Description:
Bug 11578: Hide filters if a budget (budgetperiod) is chosen
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-04-28 09:03:28 UTC
Size:
2.24 KB
patch
obsolete
>From 5eed442f26222b138f0c47b2f1c20b1afd797679 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 22 Apr 2014 16:03:33 +0200 >Subject: [PATCH] Bug 11578: Hide filters if a budget (budgetperiod) is chosen > >If a budget_period_id is given, the filters should not be displayed. >Moreover, it does not make sense to display the links for >displaying/hiding inactive budgets in this case. >--- > .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index 9f96af5..880ce2e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -202,19 +202,21 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > $(oTable).treetable('collapseAll'); > }); > >- $("#hide_inactive").click(function(e){ >+ [% UNLESS budget_period_id %] >+ $("#hide_inactive").click(function(e){ > e.preventDefault(); > oTable.fnFilter( 0, 0 ); // Hide active=0 >- }); >- $("#show_inactive").click(function(e){ >+ }); >+ $("#show_inactive").click(function(e){ > e.preventDefault(); > oTable.fnFilter( '', 0 ); >- }); >+ }); >+ $("#hide_inactive").click(); >+ [% END %] > > $("#filterbutton").click(function() { > $("#fundfilters").slideToggle(0); > }); >- $("#hide_inactive").click(); > }); > //]]> > </script> >@@ -264,12 +266,14 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > [% IF budgets %] > > <table id="budgeth"> >- <caption> >+ [% UNLESS budget_period_id %] >+ <caption> > <span class="actions"><a href="#" id="expand_all">Expand all</a> > | <a href="#" id="collapse_all">Collapse all</a> > | <a href="#" id="hide_inactive">Hide inactive budgets</a> > | <a href="#" id="show_inactive">Show inactive budgets</a></span> >- </caption> >+ </caption> >+ [% END %] > <thead> > <tr> > <th>Active</th> >-- >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 11578
:
24505
|
24506
|
24507
|
24508
|
25175
|
25245
|
25246
|
26243
|
26244
|
26245
|
26246
|
26247
|
27404
|
27706
|
27707
|
27708
|
27709
|
27710
|
27736
|
27754
|
27755
|
27763
|
27764
|
27765
|
27766
|
27767
|
27768
|
27769
|
27813
|
27814
|
27815
|
27816