Bugzilla – Attachment 81337 Details for
Bug 21526
TT variables used to build a link should be uri filtered
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PUSHED] Bug 21526: (RM follow-up) Fix merge markers and a few extra filters
Bug-21526-RM-follow-up-Fix-merge-markers-and-a-few.patch (text/plain), 6.78 KB, created by
Nick Clemens (kidclamp)
on 2018-10-26 19:45:45 UTC
(
hide
)
Description:
[PUSHED] Bug 21526: (RM follow-up) Fix merge markers and a few extra filters
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2018-10-26 19:45:45 UTC
Size:
6.78 KB
patch
obsolete
>From a05c1cb9a60ea40a6b2716a16136ca92488a979f Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 26 Oct 2018 19:43:20 +0000 >Subject: [PATCH] Bug 21526: (RM follow-up) Fix merge markers and a few extra > filters > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 8 +------- > .../intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 6 +++--- > 4 files changed, 8 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index b203534..49ee8c8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -586,15 +586,9 @@ > [% bookseller = order.transferred_to.bookseller %] > [% timestamp = order.transferred_to.timestamp %] > <p>Transferred to basket: >-<<<<<<< HEAD >- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"> [% basket.basketname | html %]</a> >- (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | html %]">[% bookseller.name | html %]</a>) >- on <span title="[% timestamp | $KohaDates with_hours = 1 %]"> >-======= > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a> > (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) >- on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]"> >->>>>>>> Bug 21526: uri escape TT variables when used in 'a href' >+ on <span title="[% timestamp | $KohaDates with_hours = 1 %]"> > [% timestamp | $KohaDates %] > </span> > </p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index adf1879..e2bdbeb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -17,9 +17,9 @@ > <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> › > <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a> › > [% IF description %] >- Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | html %]">[% description | html %]</a> >+ Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">[% description | html %]</a> > [% ELSIF batch_id %] >- Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | html %]">([% batch_id | html %])</a> >+ Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">([% batch_id | html %])</a> > [% ELSE %] > New > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index 99616a8..ff26bef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -16,9 +16,9 @@ > <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> › > <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Batches</a> › > [% IF description %] >- Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | html %]">[% description | html %]</a> >+ Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">[% description | html %]</a> > [% ELSIF batch_id %] >- Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | html %]">([% batch_id | html %])</a> >+ Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">([% batch_id | html %])</a> > [% ELSE %] > New > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index 8cabc05..d36a481 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >@@ -441,15 +441,15 @@ $(document).ready(function() { > [% INCLUDE 'serials-menu.inc' %] > <ul> > [% FOREACH subscription IN subscriptions %] >- <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="serial collection for [% subscription.bibliotitle | html %]">Serial collection #[% subscription.subscriptionid | html %]</a></li> >- <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li> >+ <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="serial collection for [% subscription.bibliotitle | uri %]">Serial collection #[% subscription.subscriptionid | html %]</a></li> >+ <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li> > [% IF ( subscription.abouttoexpire ) %] > [% UNLESS subscription.closed %] > <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li> > [% END %] > [% END %] > [% END %] >- <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | html %].pl?biblionumber=[% biblionumber | html %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul> >+ <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% biblionumber | uri %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >-- >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 21526
:
80337
|
80641
|
80649
|
80661
|
80725
|
80755
|
80756
|
81058
|
81059
|
81300
|
81301
|
81302
| 81337 |
81530
|
81763
|
81764
|
82011
|
82012
|
82013
|
82140
|
82141
|
82142
|
82600