Bugzilla – Attachment 79512 Details for
Bug 21377
Variable declarations erroneously filtered
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21377: Remove erroneous "html" filter use
Bug-21377-Remove-erroneous-html-filter-use.patch (text/plain), 3.16 KB, created by
Julian Maurice
on 2018-09-27 13:55:08 UTC
(
hide
)
Description:
Bug 21377: Remove erroneous "html" filter use
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2018-09-27 13:55:08 UTC
Size:
3.16 KB
patch
obsolete
>From 20c8d0b4b6ccc0f3eecd3dc1d59dfe0648c3af32 Mon Sep 17 00:00:00 2001 >From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> >Date: Wed, 19 Sep 2018 09:34:21 +0100 >Subject: [PATCH] Bug 21377: Remove erroneous "html" filter use > >The "html" filter that is being applied to these variable declarations >is inappropriate and has been removed. >I've also simplified things by removing two of the extraneous variable >declarations. > >To test: > >- Before applying the patch, on master, view the "Manage request" page >for an ILL request >- TEST: Observe that, apart from the "Edit request" button, the various >available action buttons do not display correctly >- Apply the patch >- TEST: Refresh the page and observe that the buttons now display >correctly > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> >--- > .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index 6d435255d7..b188945d12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -480,16 +480,14 @@ > </div> > > [% ELSIF query_type == 'illview' %] >- [% actions = request.available_actions | html %] >- [% capabilities = request.capabilities | html %] >- [% req_status = request.status | html %] >+ [% req_status = request.status %] > <h1>Manage ILL request</h1> > <div id="toolbar" class="btn-toolbar"> > <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&illrequest_id=[% request.illrequest_id | html %]"> > <span class="fa fa-pencil"></span> > Edit request > </a> >- [% FOREACH action IN actions %] >+ [% FOREACH action IN request.available_actions %] > [% IF action.method != 0 %] > <a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | html %]&illrequest_id=[% request.illrequest_id | html %]"> > <span class="fa [% action.ui_method_icon | html %]"></span> >@@ -531,7 +529,7 @@ > </div> > <div class="status"> > <span class="label status">Status:</span> >- [% capabilities.$req_status.name | html %] >+ [% request.capabilities.$req_status.name | html %] > </div> > <div class="updated"> > <span class="label updated">Last updated:</span> >-- >2.17.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 21377
:
79079
|
79401
|
79402
|
79437
|
79438
|
79439
| 79512