Bugzilla – Attachment 160686 Details for
Bug 35570
Add a generic master form in ILL
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35570: (QA follow-up): Fix action button links. Use url filter instead of uri.
Bug-35570-QA-follow-up-Fix-action-button-links-Use.patch (text/plain), 3.41 KB, created by
Pedro Amorim
on 2024-01-09 09:56:53 UTC
(
hide
)
Description:
Bug 35570: (QA follow-up): Fix action button links. Use url filter instead of uri.
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2024-01-09 09:56:53 UTC
Size:
3.41 KB
patch
obsolete
>From d71aefd0ac9c147694adfef655abd537365dc64b Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Tue, 9 Jan 2024 09:56:35 +0000 >Subject: [PATCH] Bug 35570: (QA follow-up): Fix action button links. Use url > filter instead of uri. > >Before applying this patch: >1) Click 'Manage Request' for a request, then on the top toolbar click 'Confirm request'. >2) Click the 'Confirm request' button on the bottom of the text. Notice it fails with a 404. Use the browser to go back. >3) Click the 'Cancel' button on the bottom of the text. Notice it fails with a 404. Use the browser to go back. > >4) Set all the requests to status to 'REQ' (relevant for next test), ktd kshell, run: > echo 'update illrequests set status = 'REQ';' | koha-mysql kohadev >5) Click 'Manage Request' for a request, then on the top toolbar click 'Revert request'. >6) Click the 'Revert request' button on the bottom of the text. Notice it fails with a 404. Use the browser to go back. >7) Click the 'Cancel' button on the bottom of the text. Notice it fails with a 404. Use the browser to go back. > >8) Apply patch. Repeat test plan. Notice all the action buttons now work. >--- > Koha/ILL/Backend/intra-includes/cancel.inc | 4 ++-- > Koha/ILL/Backend/intra-includes/confirm.inc | 4 ++-- > Koha/ILL/Backend/intra-includes/create.inc | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > >diff --git a/Koha/ILL/Backend/intra-includes/cancel.inc b/Koha/ILL/Backend/intra-includes/cancel.inc >index 51dd40c325..99301ffbf4 100644 >--- a/Koha/ILL/Backend/intra-includes/cancel.inc >+++ b/Koha/ILL/Backend/intra-includes/cancel.inc >@@ -10,7 +10,7 @@ > <p> > [% base_url = "/cgi-bin/koha/ill/ill-requests.pl" %] > [% proceed_url = base_url _ "?method=cancel&stage=confirm" _ "&illrequest_id=" _ request.illrequest_id %] >- <a class="btn btn-sm btn-default" href="[% proceed_url | uri %]">Revert request</a> >- <a class="btn btn-sm btn-default cancel" href="[% base_url | uri %]">Cancel</a> >+ <a class="btn btn-sm btn-default" href="[% proceed_url | url %]">Revert request</a> >+ <a class="btn btn-sm btn-default cancel" href="[% base_url | url %]">Cancel</a> > </p> > [% END %] >diff --git a/Koha/ILL/Backend/intra-includes/confirm.inc b/Koha/ILL/Backend/intra-includes/confirm.inc >index ad9646f305..099c5d6a67 100644 >--- a/Koha/ILL/Backend/intra-includes/confirm.inc >+++ b/Koha/ILL/Backend/intra-includes/confirm.inc >@@ -10,8 +10,8 @@ > <p> > [% base_url = "/cgi-bin/koha/ill/ill-requests.pl" %] > [% proceed_url = base_url _ "?method=confirm&stage=confirm" _ "&illrequest_id=" _ request.illrequest_id %] >- <a class="btn btn-sm btn-default" href="[% proceed_url | uri %]">Confirm request</a> >- <a class="btn btn-sm btn-default cancel" href="[% base_url | uri %]">Cancel</a> >+ <a class="btn btn-sm btn-default" href="[% proceed_url | url %]">Confirm request</a> >+ <a class="btn btn-sm btn-default cancel" href="[% base_url | url %]">Cancel</a> > </p> > [% ELSE %] > <p>Unknown stage. This should not have happened. >diff --git a/Koha/ILL/Backend/intra-includes/create.inc b/Koha/ILL/Backend/intra-includes/create.inc >index dda14a57f8..ef8d95590c 100644 >--- a/Koha/ILL/Backend/intra-includes/create.inc >+++ b/Koha/ILL/Backend/intra-includes/create.inc >@@ -208,7 +208,7 @@ > </fieldset> > <fieldset class="action"> > <input type="submit" value="Select"/> >- <a class="cancel" href=[% parent | uri %]>Cancel</a> >+ <a class="cancel" href=[% parent | url %]>Cancel</a> > </fieldset> > </form> > >-- >2.30.2
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 35570
:
159942
|
159943
|
159944
|
159946
|
159947
|
160452
|
160457
|
160654
|
160655
|
160656
|
160657
|
160658
|
160659
|
160660
|
160686
|
161519
|
161520
|
161521
|
161522
|
161523
|
161524
|
162894
|
162897
|
162898
|
162899
|
162900
|
162901
|
162902
|
162903
|
162904
|
162905
|
164277
|
164278
|
164279
|
164280
|
164281
|
164282
|
164283
|
164284
|
165204
|
165205
|
165206
|
165207
|
165208
|
165209
|
165210
|
165211
|
165286
|
165287
|
165288
|
165289
|
165290
|
165291
|
165292
|
165293
|
167050
|
167051
|
171312
|
171313
|
171314
|
171315
|
171316
|
171317
|
171318
|
171319
|
171320
|
171321
|
171322
|
171323
|
172218
|
172219
|
172722
|
172723
|
172724
|
172725
|
172726
|
172727
|
172728
|
172729
|
172730
|
172731
|
172732
|
172733
|
172734
|
172735
|
172740
|
172741
|
172742
|
172743
|
172744
|
172745
|
172746
|
172747
|
172748
|
172749
|
172750
|
172751
|
172752
|
172753
|
172780
|
172809
|
172811
|
173916
|
173917
|
173918