Bugzilla – Attachment 93714 Details for
Bug 23007
Make dialogs in returns.pl optionally modal
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23007: Retain focus on 'barcode' input if transfers don't block circ
Bug-23007-Retain-focus-on-barcode-input-if-transfe.patch (text/plain), 5.83 KB, created by
Katrin Fischer
on 2019-10-04 08:47:53 UTC
(
hide
)
Description:
Bug 23007: Retain focus on 'barcode' input if transfers don't block circ
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2019-10-04 08:47:53 UTC
Size:
5.83 KB
patch
obsolete
>From 816db7ae01cca0ad8ad408fe89158129e6e670df Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Wed, 12 Jun 2019 19:54:42 +0000 >Subject: [PATCH] Bug 23007: Retain focus on 'barcode' input if transfers don't > block circ > >To test: > 1 - Apply patches > 2 - Update database > 3 - Confirm TransfersBlockCirc defaults to 'Block' > 4 - Check in an item that needs transfer > 5 - Confirm you must deal with the modal to proceed > 6 - Repeat checking to get 'wrong-transfer-modal' > 7 - Confirm you must deal with it to proceed > 8 - Switch the pref to 'Don't block' > 9 - Find a new item or cancel/fulfill the preceeding transfer >10 - Check in the item to generate transfer >11 - Note focus remains on the barcode field and you can continue scanning (or typing if you don't have a scanner) >12 - Note typing and pressing enter continues without requiring you to deal with modal >13 - Repeat for wrong transfer modal >14 - Verify hold and other modals still block continuing circulation > >Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 25 ++++++++++++++++------ > 1 file changed, 19 insertions(+), 6 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 2f5493b6f2..134652e631 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -187,7 +187,7 @@ > [% END %] > > [% IF wrongbranch %] >- <div id="wrong-branch-modal" class="modal fade audio-alert-action"> >+ <div id="wrong-branch-modal" class="modal fade audio-alert-action block"> > <div class="modal-dialog"> > <div class="modal-content"> > <form method="post" action="returns.pl" name="mainform" id="mainform"> >@@ -226,7 +226,11 @@ > <!-- case of a mistake in transfer loop --> > [% UNLESS ( hold_auto_filled && diffbranch ) %] > [% IF WrongTransfer && !transfertodo %] >- <div id="wrong-transfer-modal" class="modal fade audio-alert-action"> >+ [% IF Koha.Preference('TransfersBlockCirc') %] >+ <div id="wrong-transfer-modal" class="modal fade audio-alert-action block"> >+ [% ELSE %] >+ <div id="wrong-transfer-modal" class="modal fade audio-alert-action noblock"> >+ [% END %] > <div class="modal-dialog"> > <div class="modal-content"> > <div class="modal-header"> >@@ -268,7 +272,7 @@ > > [% IF ( found ) %] > [% IF ( waiting ) %] >- <div id="hold-found1" class="modal fade audio-alert-action"> >+ <div id="hold-found1" class="modal fade audio-alert-action block"> > <div class="modal-dialog"> > <div class="modal-content"> > <form method="post" action="returns.pl" class="confirm"> >@@ -360,7 +364,11 @@ > [% END # /IF waiting %] > > [% IF transfer || needstransfer %] >- <div id="item-transfer-modal" class="modal fade audio-alert-action"> >+ [% IF Koha.Preference('TransfersBlockCirc') %] >+ <div id="item-transfer-modal" class="modal fade audio-alert-action block"> >+ [% ELSE %] >+ <div id="item-transfer-modal" class="modal fade audio-alert-action noblock"> >+ [% END %]1 > <div class="modal-dialog"> > <div class="modal-content"> > <form method="post" action="returns.pl" name="mainform" id="mainform"> >@@ -413,7 +421,7 @@ > <!-- case of simple return no issue or transfer but with a reservation --> > [% IF ( reserved ) %] > <!-- reserved --> >- <div id="hold-found2" class="modal fade audio-alert-action"> >+ <div id="hold-found2" class="modal fade audio-alert-action block"> > <div class="modal-dialog"> > <div class="modal-content"> > <form method="post" action="returns.pl" class="confirm"> >@@ -884,11 +892,16 @@ > $("#barcode").focus(); > } > $(document).ready(function () { >- $(".modal").modal({ backdrop: 'static' }).on('shown.bs.modal', function() { >+ $(".modal.block").modal({ backdrop: 'static'}).on('shown.bs.modal', function() { > $("#barcode").prop("disabled", true); > }).on('hidden.bs.modal', function() { > $("#barcode").prop("disabled", false).focus(); > }); >+ $(".modal.noblock").modal({ backdrop: 'static'}).on('shown.bs.modal', function() { >+ $("#barcode").prop("disabled", false).focus(); >+ }).on('hidden.bs.modal', function() { >+ $("#barcode").prop("disabled", false).focus(); >+ }); > > $(".modal").on('hidden.bs.modal', function (e) { $("#barcode").focus(); }); > >-- >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 23007
:
90539
|
91049
|
91050
|
91506
|
91507
|
92506
|
92507
|
93713
| 93714