[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.06-36-gad75968
Git repo owner
gitmaster at git.koha-community.org
Fri Dec 14 19:07:26 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 ad759687347874ce4f17ad1704a2bbc60cc4dfc5 (commit)
via 1280bace7d797e49a3bc947f264733625247b25d (commit)
via 4baf83a09a2c1ae8c9def18c967eb256564ef719 (commit)
from 653dc4f67581ee8f0080ebe517c78684b672bfa7 (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 ad759687347874ce4f17ad1704a2bbc60cc4dfc5
Merge: 1280bac 653dc4f
Author: Lucas Gass <lucasgass at Lucass-MacBook-Pro.local>
Date: Fri Dec 14 10:51:41 2018 -0700
Merge branch '18.05.x' of git://git.koha-community.org/koha into rmain1805
commit 1280bace7d797e49a3bc947f264733625247b25d
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Thu Nov 22 15:55:25 2018 +0200
Bug 21861: (follow-up) replace onchange() with jQuery equivalent
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 f44a4f1d2a13735c52948df29e773728d04ab991)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit cc0833fec6ac0e4f5008c855d8c0034c56870fa4)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 4baf83a09a2c1ae8c9def18c967eb256564ef719
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Sat Nov 17 20:03:36 2018 +0200
Bug 21861: The MARC modification template actions editor does not always validate user input
The MARC modification template actions editor does not validate
user input when adding a conditional clause, making it possible
to save a modification action without filling in all necessary
fields.
This patch fixes that.
Test plan:
1) Create a MARC modification template and add a new action,
e.g. "Copy All field(s) 200$a to field 600$a".
Add a condition ("if" or "unless") but leave the relevant
field and subfield textboxes empty.
Add "matches" or "doesn't match" as a comparison operator.
Check the "RegEx" checkbox, leave the regex textbox empty.
2) Click on "Add action" and notice how it accepts your input.
Also notice the extra space in the Action column RegEx.
3) Edit your modification action and notice the missing "m/"
before the conditional RegEx.
4) Apply the patch and hit CTRL-F5 to reload the relevant JS.
5) Edit the modification action you added previously (or add
a new one). Try leaving the textboxes mentioned above empty
and then submit your changes. You should get pop-up windows
informing you about missing fields.
6) Now try typing a value in the conditional regex textbox and
Update your action. In the Action column, there should be
no spaces between the delimiters of the matching operator
and the value you just entered.
7) Edit your action: notice how the "m/" before the regular
expression and the "/" after it are now showing correctly.
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 3e1e1448e9132dce81571a4c3f31eb67816f14f9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit a616b9fc0266fdc9a5d299d5927f8b4a2236c559)
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
.../modules/tools/marc_modification_templates.tt | 8 +++++---
.../prog/js/marc_modification_templates.js | 21 ++++++++++++++++++++
2 files changed, 26 insertions(+), 3 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list