Bugzilla – Attachment 107374 Details for
Bug 25940
Two separate print dialogs when checking in/transferring an item
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25940: Check for reserve_id before Dopop
Bug-25940-Check-for-reserveid-before-Dopop.patch (text/plain), 2.48 KB, created by
Katrin Fischer
on 2020-07-26 16:04:53 UTC
(
hide
)
Description:
Bug 25940: Check for reserve_id before Dopop
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2020-07-26 16:04:53 UTC
Size:
2.48 KB
patch
obsolete
>From 902a2af4f5decfa249e11a5345afb6e04feb6a2f Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Mon, 6 Jul 2020 20:38:42 +0000 >Subject: [PATCH] Bug 25940: Check for reserve_id before Dopop > >TEST PLAN: >1. Have an item belonging to a different branch and check it in. >2. When the modal pops up hit 'Yes, print slip' or 'Print slip' if AutomaticItemReturn is set to 'don't' >3. The first print dialog should appear with a URL like '/cgi-bin/koha/circ/transfer-slip.pl?transferitem=18&&branchcode=CPL&op=slip' >4. Close that print dialog and you will immediately see another one that says 'No slip template found'. >5. Notice the URL of the second pop-up is: /cgi-bin/koha/circ/hold-transfer-slip.pl?reserve_id= >6. There is no reserve id so the template is not found. >7. Apply patch >8. Repeat 1-6 >9. You should no longer have two print dialogs > >Signed-off-by: Lisette Scheer <lisetteslatah@gmail.com> >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 84efebe53d..1293dafe17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -924,16 +924,15 @@ > e.preventDefault(); > $(".modal").modal("show"); > }); >- >- $(".print-slip").on('click', function(e) { >- e.preventDefault(); >- Dopop('hold-transfer-slip.pl?reserve_id=[% reserve_id | uri %]'); >- }); >- >- [% IF print_slip %] >- Dopop('hold-transfer-slip.pl?reserve_id=[% reserve_id | uri %]'); >+ [% IF reserve_id %] >+ $(".print-slip").on('click', function(e) { >+ e.preventDefault(); >+ Dopop('hold-transfer-slip.pl?reserve_id=[% reserve_id | uri %]'); >+ }); >+ [% IF print_slip %] >+ Dopop('hold-transfer-slip.pl?reserve_id=[% reserve_id | uri %]'); >+ [% END %] > [% END %] >- > var columns_settings = [% TablesSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) | $raw %] > var returns_table = KohaTable("checkedintable", { > "bFilter":false, >-- >2.11.0
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 25940
:
106605
|
106611
|
106766
| 107374