Bugzilla – Attachment 112158 Details for
Bug 26779
Make desk selection consistent in auth.tt and set-library.tt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26779: Make desk selection consistent in auth.tt and set-library.tt
Bug-26779-Make-desk-selection-consistent-in-authtt.patch (text/plain), 3.14 KB, created by
Nicolas Legrand
on 2020-10-22 10:09:14 UTC
(
hide
)
Description:
Bug 26779: Make desk selection consistent in auth.tt and set-library.tt
Filename:
MIME Type:
Creator:
Nicolas Legrand
Created:
2020-10-22 10:09:14 UTC
Size:
3.14 KB
patch
obsolete
>From 9002ae3946f434426a573cf20d23339e06ec2f93 Mon Sep 17 00:00:00 2001 >From: Nicolas Legrand <nicolas.legrand@bulac.fr> >Date: Thu, 22 Oct 2020 12:01:55 +0200 >Subject: [PATCH] Bug 26779: Make desk selection consistent in auth.tt and > set-library.tt >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >When changing libraries in set-library.tt, the desks selection list >prints only one desk. The desk list is printed with a different code >from auth.pp but modified by the same javascript. Make the template >code consistent and work for both pages. > >Test plan: > > 1. have at least two libraries with multiple desks and one without > any desk. > 2. go to set-library.pl, select the library without desks, you > should see only a â---â entry. > 3. select a library you're not logged in and you should see only > one desk entry. > 4. apply patch. > 5. recheck 2. should still be ok. > 6. recheck 3. this time you should see all desks. > 7. check you can log and set desks as expected from auth.pp. >--- > koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 10 +--------- > koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 5 +---- > 2 files changed, 2 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc >index 3538612..9201b1e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc >@@ -11,15 +11,7 @@ > [% BLOCK options_for_desks %] > <option id="nodesk" value="">---</option> > [% FOREACH d IN desks %] >- [% IF d.branchcode == branch %] >- [% IF selected == d.desk_id %] >- <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" selected="selected">[% d.desk_name | html %]</option> >- [% ELSE %] >- <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" >[% d.desk_name | html %]</option> >- [% END %] >- [% ELSE %] >- <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" disabled hidden>[% d.desk_name | html %]</option> >- [% END%] >+ <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" disabled >[% d.desk_name | html %]</option> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >index ba3b266..773c552 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >@@ -88,10 +88,7 @@ > <p> > <label for="desk">Desk:</label> > <select name="desk_id" id="desk_id" class="input" tabindex="3"> >- <option id="nodesk" value="">---</option> >- [% FOREACH d IN Desks.all %] >- <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" disabled >[% d.desk_name | html %]</option> >- [% END %] >+ [% PROCESS options_for_desks desks => Desks.all(), selected => desk_id %] > </select> > </p> > [% END %] >-- >2.1.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 26779
: 112158