[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-48-g6ba72fb
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 26 04:09:30 CEST 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 18.05.x has been updated
via 6ba72fb43b585ae2b2888dc3c50ada09014e86af (commit)
via 3aa1a5d9edfc4f5692730da1a864214d31df079c (commit)
via 237abf0a523a9b9aa278d85686f0a4a503fd5586 (commit)
via 6aba59f6a18b9d01d7e1461a9df9eeb6719896e6 (commit)
from a6804721711904f1a95c18d6274d6d2c495431b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6ba72fb43b585ae2b2888dc3c50ada09014e86af
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Wed Dec 5 20:33:25 2018 +0000
Bug 21346: Remove inline onclicks per comment 42
To test:
1) Apply patch.
2) Check that there is no changed behavior with buttons or checkboxes.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d5d4501290704b9b3a0893a4a3df0a356abe445b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit a1f80ad2950ea100e34260be7ae7d6e7f6f3bea7)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 3aa1a5d9edfc4f5692730da1a864214d31df079c
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Sun Nov 4 03:47:30 2018 +0000
Bug 21346: Convert dialogs to modals.
This addresses most of the transfer dialogs. There are some dialogs
that I have not converted because I don't know what triggers them,
therefore I cannot test them.
The following scenarios have been addresses, and should be tested:
FOR TRANSFERS
1) Checkin with no issue, hold or transfer; not at home (AutomaticItemReturn set to Don't)
* Should give 3 options - Yes, Yes with print, or No.
* Yes and Yes with print should trigger a transfer back home.
* No should do nothing.
* Print should open a window for printing, with correct
information.
* All three options should close the modal.
TO TEST:
1) Set AutomaticItemREturn to Don't.
2) Check in an item with no issues, holds or transfers set, at a
location other than the owning library.
3) Test conditions above.
2) Checkin with no issue, hold or transfer; not at home (AutomaticItemReturn set to Do)
* Should give 2 options - Print or OK.
* Should automatically set transfer.
* Print should open a window for printing, with correct information.
* Both buttons should close modal.
TO TEST:
1) Set AutomaticItemReturn to Do.
2) Check in an item with no issues, holds or transfers set, at a
location other than the owning library.
3) Test conditions above.
3) Checkin with no issues or holds, but transfer already set
* Should give 3 options - OK, Print or Cancel.
* OK and print should not touch existing transfer.
* Cancel should remove the exisiting transfer.
* Print should open a window for printing, with correct information.
* All three options should close the modal.
TO TEST:
1) Check in an item following step 2 of either test above.
2) Check in item again, while a transfer exists.
3) Test conditions above.
WRONG BRANCH
4) If AllowReturnToBranch is not set "to any library", and the item is not checked in at the appropriate branch, the wrong-branch-modal pops up:
* Should give 1 option - OK.
* Should not check anything in or initiate a transfer.
* OK should close the modal.
TO TEST:
1) Set AllowReturnToBranch to "only the library the item is from".
You can test the other settings, as long as you pay attention to
where you are checking the item in at.
2) Check in an item at a branch other than the owning library.
3) Test conditions above.
Signed-off-by: Lisette <lisetteslatah at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5ed171a45c46f63b18266ad3a3d0a978719ca285)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit f3b362120f0b8a75a89ad6846e7bdad93b2e37ca)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 237abf0a523a9b9aa278d85686f0a4a503fd5586
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Thu Nov 1 21:08:19 2018 +0000
Bug 21346: Remove double dialog
To Test:
1) Place a hold on an item for pickup at another branch.
2) Check in item to trigger hold and transfer.
3) Check in item again without changing location. Note modal AND old
dialog behind modal.
4) Apply patch.
5) Check in item again without changing location. Note modal without
the old dialog.
Signed-off-by: Lisette <lisetteslatah at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 230905e1d56a11cf5619f95c95920eb09803900c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 6055a519c4474ab3b9004ed99b9b2e76c9735076)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 6aba59f6a18b9d01d7e1461a9df9eeb6719896e6
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Thu Nov 1 20:21:08 2018 +0000
Bug 21346: Streamline logic in holds and transfers
1) Replaced comparison with string to make testing branch easier.
2) Replaced useless 0 values with undef.
Does not change any behavior, only simplifies code.
Signed-off-by: Lisette <lisetteslatah at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 48787acc6f725686583bb05f45888acf3e1231d0)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit a1ff52bef45884b9a292cc5f84fdc49fce1c2c36)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
circ/returns.pl | 37 +++-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 217 +++++++++++++-------
2 files changed, 173 insertions(+), 81 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list