Bugzilla – Attachment 168557 Details for
Bug 37246
Suggestions filter by fund displays inactive budgets
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37246: (QA follow-up) DRY Dropdown
Bug-37246-QA-follow-up-DRY-Dropdown.patch (text/plain), 5.86 KB, created by
Pedro Amorim
on 2024-07-05 15:45:21 UTC
(
hide
)
Description:
Bug 37246: (QA follow-up) DRY Dropdown
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2024-07-05 15:45:21 UTC
Size:
5.86 KB
patch
obsolete
>From 7e533143b7c1ad74e31f4231bfe42fe5c0f33f9e Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Fri, 5 Jul 2024 15:38:26 +0000 >Subject: [PATCH] Bug 37246: (QA follow-up) DRY Dropdown > >If we're using the same dropdown it should be defined once. > >Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com> >--- > .../prog/en/modules/suggestion/suggestion.tt | 63 +++++++++---------- > 1 file changed, 29 insertions(+), 34 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 481d9ae046..048990113a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -591,21 +591,7 @@ > </select> > </li> > <li> >- <label for="budgetid">Fund:</label> >- <select name="budgetid" id="budgetid"> >- <option value="">Any</option> >- [% FOREACH budget IN sugg_budgets %] >- [% IF ( budget.selected ) %] >- <option value="[% budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( !budget.b_active ) %](inactive)[% END %]</option> >- [% ELSIF ( budget.b_active ) %] >- <option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option> >- [% ELSE %] >- <option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option> >- [% END %] >- [% END %] >- </select> >- <label for="showallfunds" style="float:none;width:auto;"> Show inactive:</label> >- <input type="checkbox" class="showallfunds" /> >+ [% PROCESS funds_dropdown %] > </li> > <li> > <label for="quantity">Copies:</label> >@@ -1219,25 +1205,7 @@ > <fieldset class="brief acquisition_information"> > <ol> > <li> >- <label for="budgetid">Fund:</label> >- <select name="budgetid" id="budgetid"> >- [% IF budgetid == '__NONE__' %] >- <option value="__NONE__" selected="selected">None</option> >- [% ELSE %] >- <option value="__NONE__">None</option> >- [% END %] >- [% FOREACH budget IN sugg_budgets %] >- [% IF ( budget.selected ) %] >- <option value="[% budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( !budget.b_active ) %](inactive)[% END %]</option> >- [% ELSIF ( budget.b_active ) %] >- <option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option> >- [% ELSE %] >- <option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option> >- [% END %] >- [% END %] >- </select> >- <label for="showallfunds" style="float:none;width:auto;"> Show inactive:</label> >- <input type="checkbox" class="showallfunds" /> >+ [% PROCESS funds_dropdown %] > </li> > </ol> > </fieldset> <!-- /#acquisition_information --> >@@ -1271,6 +1239,33 @@ > > [% END # /IF op == "show" %] > >+[% BLOCK funds_dropdown %] >+ <label for="budgetid">Fund:</label> >+ <select name="budgetid" id="budgetid"> >+ [% IF op == 'save' %] >+ <option value="">Any</option> >+ [% ELSE %] >+ [% IF budgetid == '__NONE__' %] >+ <option value="__NONE__" selected="selected">None</option> >+ [% ELSE %] >+ <option value="__NONE__">None</option> >+ [% END %] >+ [% END %] >+ [% FOREACH budget IN sugg_budgets %] >+ [% IF ( budget.selected ) %] >+ <option value="[% budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( !budget.b_active ) %](inactive)[% END %]</option> >+ [% ELSIF ( budget.b_active ) %] >+ <option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option> >+ [% ELSE %] >+ <option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option> >+ [% END %] >+ [% END %] >+ </select> >+ <!-- this is needed --> >+ <label for="showallfunds" style="float:none;width:auto;"> Show inactive:</label> >+ <input type="checkbox" class="showallfunds" /> >+[% END %] >+ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > >-- >2.34.1
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 37246
:
168459
|
168464
|
168556
| 168557