[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.06-21-gd6fe416
Git repo owner
gitmaster at git.koha-community.org
Fri Dec 7 23:20:01 CET 2018
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 d6fe41657861666320383904b16165cc4820777a (commit)
via 99436fa499e6f08f4575a4135344a46aa0bb6a94 (commit)
via 45b7f1703858a93d563934215326ff97e234abf6 (commit)
via 57e031929df2b061c70341dee5efafb1ebd614f3 (commit)
via 391e7f7188472f3399007c836c0605cfc1277a30 (commit)
via cf8a03db2cf3bdcfbad8566377f54fd84face864 (commit)
from dab7e22c68dd9328bf2768e7e20e444f1311c875 (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 d6fe41657861666320383904b16165cc4820777a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Nov 8 14:49:10 2018 +0100
Bug 21774: Cloned item subfields disappear when editing an item
Bug 10306 changed behavior on cloning item subfields by no longer splitting
constructions like 'A | B' in item fields like ccode.
If it is really recommended to clone item subfields, I am not so sure
about. But this patch at least restores the possibility to do so while
we discuss if we should ;)
Test plan:
[1] Run Items.t
[2] Make an item subfield repeatable in framework. And test edit items.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Works as expected. Also fixes the display of collections on the items
table (on editing items).
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5f34dd06ec66b11a914e49eb611714ea4c72771d)
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
commit 99436fa499e6f08f4575a4135344a46aa0bb6a94
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Nov 20 16:45:17 2018 +0100
Bug 21867: Replace remaining document.element.onchange calls in marc_modification_templates.js
Replace onchange() by jQuery change().
Test plan:
Go to marc mod templates. Add, edit and delete. Check if works and no js
errors.
git grep -l -E "onchange\(" should not have occurrences outside lib.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit be78d3177e8b9bbf90c7071dc6b6e3385674d106)
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
commit 45b7f1703858a93d563934215326ff97e234abf6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Nov 20 16:32:46 2018 +0100
Bug 21819: (QA follow-up) Replace onchange() in touched code
AFAIK we should not call document...onchange() and assume that it works.
Apparently, it does at least in some browsers. But we are not sure.
We could easily replace them here by the documented jQuery counterpart.
Note: If you try git grep -l -E "onchange\(" you will find some
occurrences in two libraries and only in one js file (this one).
We should replace all occurrences here; will open a new report for that.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Verified that the change event was triggered: span should expand/collapse.
Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit aeaf74b7cc6608d7b81aaba10defdca6decdaa1d)
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
commit 57e031929df2b061c70341dee5efafb1ebd614f3
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Sat Nov 17 11:35:00 2018 +0200
Bug 21819: Marc modification templates action always checks Regexp checkbox
When editing a MARC modification template action, the 'RegEx'
checkbox to the right of the 'to field' textboxes will always
appear checked, even if no regular expression has been added.
This patch fixes that.
Test plan (steps 1-5 are copied from the original report -- thanks Pasi!):
1) Go to Tools > Marc modification templates, and create a new template
2) Add a new action to the template
3) Edit the action so it's "Move" field to another field.
Do not check the RegEx checkbox after the "To" field.
4) Save the action.
5) Edit the same action again. The checkbox is now checked.
6) Apply the patch and hit Ctrl-F5 to do a hard refresh in your browser.
7) Edit the action you saved in 4): this time the 'RegEx' checkbox
should be unchecked.
8) For completeness, add a regular expression to the "Move" action
created in 3) and click on 'Update action'. When you re-edit this
action the 'RegEx' checkbox should be checked.
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit a9fc00db03a8210b3edb69a922209a4e8f6df9a1)
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
commit 391e7f7188472f3399007c836c0605cfc1277a30
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Nov 16 17:23:14 2018 +0000
Bug 21854: Use template plugin to display category description
Rather than getting the description in the script and passing, we should
just use the tmeplate plugin to get the description from the category
code.
To test:
1 - Find a patron, note their category
2 - Visit Tools - Batch patron modification
3 - Enter barcode of patron above
4 - Note category does not show in the display of patrons to be modified
5 - Apply patch
6 - Reload the page, note the patron category displays
7 - Modify the patron (anything but category)
8 - Check that category still diplays correctly in results
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit df68391a5ec2eac05a88373dc10c136c8d057e98)
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
commit cf8a03db2cf3bdcfbad8566377f54fd84face864
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 14 19:08:09 2018 +0000
Bug 21837: Don't set holdingbranch filter using selected homebranch filter
To recreate:
1 - Open the overdues report (don't worry if you don't have results)
2 - Choose to filter by homebranch
3 - Note the holdingbranch filter is set to the selected homebranch
4 - Apply patch
5 - Clear filters
6 - repeat
7 - only homebranch is set
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 81ac96abec1226b6635022c0a3f69697d13c7d62)
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 4 +-
circ/overdue.pl | 2 +-
.../prog/en/modules/tools/modborrowers.tt | 27 +++---
.../prog/js/marc_modification_templates.js | 29 +++----
t/db_dependent/Items.t | 87 +++++++++++++++++++-
tools/modborrowers.pl | 3 -
6 files changed, 117 insertions(+), 35 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list