[koha-commits] main Koha release repository branch master updated. v18.05.00-1454-gc28ad65
Git repo owner
gitmaster at git.koha-community.org
Tue Nov 13 17:51:11 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, master has been updated
via c28ad651a6b57ed1f39bd91800c55e71e9b9935d (commit)
via f1e5e3670fe7de2fcaeb8ddcd6866c1e12b7f6d9 (commit)
via 2874dfb1f1dbac7f0f560c3d3b5abb1ca44494bd (commit)
via fb5dd4c942f7162808a97cf37f51bd41d38b0d8b (commit)
via fcc5d6e7e49fc37c17240ccab0d7ed9d808b2303 (commit)
via e2114557e2241fb05d837610c92000df1c8cb4b8 (commit)
via 00b837367eb7cd47fa5f90bf28a172a17bb7b66b (commit)
via 7614a5f2eb5b03a1f70d050536310d21232dffcc (commit)
via 369c2339176764937eb7a820988a6d070dbf3204 (commit)
via 2682ecb435d0e1e56935402b43447f2274edf83f (commit)
via bde9fb59f28fb13fe00250b7b540e51ee9d076cc (commit)
via 328046e59cbf7c858b9218ac2adf27bb42784776 (commit)
via b09c471137a9510ff63ca5d20a7730a3c4547487 (commit)
via 02a942767f0f03eb3ba8101399bad34bc9b09390 (commit)
via 65c4d8019e00571a7804aaee4a5952480e6afd16 (commit)
via 94a4aaca1e844737f80e628a50eaa236918d7de4 (commit)
via df22811f7b1a2150ca1d170031f2c1f3912ec7ed (commit)
via 3a0cba67f1387595f570ab9d9efdeabc856345b4 (commit)
via d659649a132f8df2f6c294127f3c39d42bbbcaf8 (commit)
from 7f78d4a1485c0cf68021ed426192d3f1e5cbd80f (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 c28ad651a6b57ed1f39bd91800c55e71e9b9935d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Nov 8 09:47:48 2018 +0100
Bug 21782: Release team 18.11 in About
[1] Moved the (usual) 18.05 positions to the Dev section.
[2] Added the 18.11 positions to the Release team section.
Test plan:
[1] Look at About/Koha team.
[2] Compare with roles 18.05 and roles 18.11.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f1e5e3670fe7de2fcaeb8ddcd6866c1e12b7f6d9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Oct 29 13:40:20 2018 +0000
Bug 20966: (follow-up) Add template variable filter; Fix table export
This patch makes to corrections:
1. The "$raw" filter has been added to the column configuration
2. The columns configuration now specifies which columns are exported in
Copy, Excel, etc. operations.
To test, apply the patch and test the various table export buttons on a
both a closed and open basket. Confirm that the 'Modify' and 'Cancel'
columns are not exported.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
https://bugs.koha-community.org/show_bug.cgi?id=20996
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2874dfb1f1dbac7f0f560c3d3b5abb1ca44494bd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jun 19 17:02:14 2018 +0000
Bug 20966: Add column configuration to table of orders in a basket
This patch adds column configuration to the table of orders in a basket.
It replaces the "Show all details" checkbox which previously was used to
show the hidden "tax included" columns. Now those columns are hidden by
default in the columns configuration file.
To test, apply the patch and view a basket with multiple orders. Test
all DataTables functionality (paging, sorting, filtering) including
showing and hiding columns.
Test with both an open and a closed basket.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
https://bugs.koha-community.org/show_bug.cgi?id=20996
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fb5dd4c942f7162808a97cf37f51bd41d38b0d8b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Nov 13 16:21:22 2018 +0000
Bug 15836: DBRev 18.06.00.060
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fcc5d6e7e49fc37c17240ccab0d7ed9d808b2303
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 13 12:04:22 2018 -0300
Bug 15836: (follow-up) Fix display input in any situations
Koha::ClassSplitRule->regexs returns an array
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e2114557e2241fb05d837610c92000df1c8cb4b8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 13 11:51:44 2018 -0300
Bug 15836: Remove debug statement
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 00b837367eb7cd47fa5f90bf28a172a17bb7b66b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 13 11:51:04 2018 -0300
Bug 15836: Fix deletion of class sources
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7614a5f2eb5b03a1f70d050536310d21232dffcc
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Nov 1 11:58:33 2018 +0000
Bug 15836: (follow-up) Fix filters
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 369c2339176764937eb7a820988a6d070dbf3204
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 8 16:22:32 2018 -0300
Bug 15836: Fix DB structure
That was a leftover from the first approach, this table must not be
modified!
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2682ecb435d0e1e56935402b43447f2274edf83f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Sep 16 16:25:24 2018 -0700
Bug 15836: Fix display input in any situations
Fix when switching an existing rule to RegEx
Sponsored-by: Goethe-Institut
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bde9fb59f28fb13fe00250b7b540e51ee9d076cc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 27 09:59:02 2018 -0300
Bug 15836: Handle non-existent regexs
For other types of split rules
Sponsored-by: Goethe-Institut
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 328046e59cbf7c858b9218ac2adf27bb42784776
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 18 12:48:08 2018 -0300
Bug 15836: Add missing svc script
Sponsored-by: Goethe-Institut
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b09c471137a9510ff63ca5d20a7730a3c4547487
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 17 15:55:16 2018 -0300
Bug 15836: Add tests
Sponsored-by: Goethe-Institut
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 02a942767f0f03eb3ba8101399bad34bc9b09390
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 22 12:21:01 2018 -0300
Bug 15836: Mark C4::ClassSource subs DEPRECATED
These subs are no longer used from scripts and should be removed. It
should be done on a separate bug report given that additional work is
needed
Sponsored-by: Goethe-Institut
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 65c4d8019e00571a7804aaee4a5952480e6afd16
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 21 18:19:36 2018 -0300
Bug 15836: Add the ability to defined custom methods to split call number in labels
Currently the call number splitting seems to be mostly implemented for
DDC and LC classifications.
Those are both not very common in some countries.
A lot of libraries use their own custom classification schemes so the call number
plitting is something that should be individually configurable.
This enhancement adds the ability to define custom splitting rules based
on regular expressions.
How does it work so far?
From C4/Labels/Label.pm there are 3 differents splitting methods defined, depending on items.cn_source.
if cn_source is "lcc' or 'nlm' we split using Library::CallNumber::LC
if cn_source is 'ddc' we split using a in-house method
Finally there is a fallback method to split on space
And nothing else is done for other cn_source
The idea of this patch is to mimick what was done for the "filing rules" and add
the ability to define "splitting rules" that will be used by the "Classification sources".
A classification source will then have:
* a filing rule used to sort items by callnumbers
* a splitting rule used to print labels
To acchieve this goal this enhancement will do the following
modifications at DB level:
* New table class_split_rules
* New column class_sources.class_split_rule
Test plan:
* Execute the update database entry to create the new table and
column.
I. UI Changes
a) Create/modify/delete a filing rule
b) Create/modify/delete a splitting rule
c) Create/modify/delete a classification source
=> A filing rule or splitting rule cannot be removed if used by a
classification source
II. Splitting rule using regular expressions
a) Create a splitting rule using the "Splitting routine" "RegEx"
b) Define several regular expressions, they will be applied one after
the other in the same order you define them.
Something like:
s/\s/\n/g # Break on spaces
s/(\s?=)/\n=/g # Break on = (unless it's done already)
s/^(J|K)\n/$1 / # Remove the first break if callnumber starts with J or K
c) You can test the regular expressions using filling the textarea with
a list of callnumbers. Then click "Test" and confirm the callnumbers are
split how you expected.
d) Finally create a new classification source that will use this new
splitting rule.
III. Print the label!
a) Create a layout. It should have the "Split call numbers" checkbox
ticked, and display itemcallnumber
b) Use this layout to export labels, use items with different
classification source ('lcc', 'ddc', but also the new one you have
create)
=> The callnumbers should have been split according to the regex you
defined earlier!
Notes:
* The update database entry fill the class_sources.class_split_rule
with the value of class_sources.class_sort_rule
If default rules exist it will not work, we should add a note in the
release notes (would be enough?)
* C4::ClassSplitRoutine::* should be moved to Koha::ClassSplitRule,
but it sounded better to keep the same pattern as ClassSortRoutines
* Should not we use a LONGTEXT for class_split_rules.split_regex instead
of VARCHAR(255)?
* class_sources.sql should be filled for other languages before pushed
to master!
IMPORTANT NOTES: The regular expressions are stored as it, and eval is
used to evaluate it (perlcritic raises a warning about it (Expression
form of "eval"). It can lead to serious security issues (execution of
arbitrary code on the server), especially if the modifier 'e' is used.
We could then remedy the situation with one of these following points:
- Assume that this DB data is safe (We can add a new permission?)
- Assume that the data is not safe and deal with possible attack
Cons: how be sure we are exhaustive? Making sure it matches ^s///[^e/]*$
would be enough?
- Use Template Toolkit syntax instead (Really safer?)
[% callnumber.replace('\s', '\n').replace ... %]
- Cut the regex parts: find, replace, modifiers
like we already do for Marc modification template. Cons: we are going to
have escape problems, the "find" and "replace" parts should not be
handle the same way (think "\n", "\\n", "\1", "\s", etc.)
I did not manage to implement this one easily.
Sponsored-by: Goethe-Institut
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 94a4aaca1e844737f80e628a50eaa236918d7de4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 21 13:43:55 2018 -0300
Bug 15836: UI changes
The script admin/classsources.pl has been adjusted to follow usual
patterns used in other Koha scripts.
$op can be add_source, add_source_validate, etc.
Deletion steps have been removed (there is a JS confirmation box) to
simplify both script and template.
Sponsored-by: Goethe-Institut
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit df22811f7b1a2150ca1d170031f2c1f3912ec7ed
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 21 12:57:09 2018 -0300
Bug 15836: DB changes
Sponsored-by: Goethe-Institut
Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3a0cba67f1387595f570ab9d9efdeabc856345b4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Nov 13 14:42:43 2018 +0000
Bug 20356: DBRev 18.06.00.059
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d659649a132f8df2f6c294127f3c39d42bbbcaf8
Author: David Gustafsson <david.gustafsson at ub.gu.se>
Date: Wed Mar 7 16:40:07 2018 +0100
Bug 20356: Add EmailSMSSendDriverFromAddress system preference
Add EmailSMSSendDriverFromAddress system preference for overriding Email
SMS send driver from address.
How to test:
1) Run tests in t/db_dependent/Letters.t
2) All tests should pass
Sponsored-by: Gothenburg University Library
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/ClassSource.pm | 20 +-
.../Plugin/raw.pm => C4/ClassSplitRoutine.pm | 45 +-
C4/ClassSplitRoutine/Dewey.pm | 79 ++++
C4/ClassSplitRoutine/Generic.pm | 72 ++++
C4/ClassSplitRoutine/LCC.pm | 63 +++
.../Plugin/raw.pm => C4/ClassSplitRoutine/RegEx.pm | 45 +-
C4/Labels/Label.pm | 100 ++---
C4/Letters.pm | 16 +-
Koha.pm | 2 +-
Koha/{Suggestion.pm => ClassSplitRule.pm} | 50 ++-
Koha/{ClassSources.pm => ClassSplitRules.pm} | 12 +-
Koha/Schema/Result/ClassSource.pm | 35 +-
.../Result/{ClassSortRule.pm => ClassSplitRule.pm} | 37 +-
Koha/Schema/Result/SocialData.pm | 7 +-
admin/classsources.pl | 444 ++++++++++----------
admin/columns_settings.yml | 41 ++
.../data/mysql/en/mandatory/class_sources.sql | 19 +-
installer/data/mysql/kohastructure.sql | 19 +-
installer/data/mysql/updatedatabase.pl | 52 +++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 71 ++--
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 104 +++--
.../prog/en/modules/admin/admin-home.tt | 2 +-
.../prog/en/modules/admin/classsources.tt | 435 +++++++++++++------
.../prog/en/modules/admin/preferences/patrons.pref | 3 +
svc/{localization => split_callnumbers} | 33 +-
t/Labels.t | 3 +-
.../marc21_field_005.pl => t/Labels_split_Regex.t | 41 +-
t/Labels_split_ddcn.t | 5 +-
t/Labels_split_lccn.t | 3 +-
.../Koha/{Patron/Consents.t => ClassSplitRules.t} | 38 +-
t/db_dependent/Letters.t | 39 +-
31 files changed, 1236 insertions(+), 699 deletions(-)
copy Koha/Template/Plugin/raw.pm => C4/ClassSplitRoutine.pm (53%)
create mode 100644 C4/ClassSplitRoutine/Dewey.pm
create mode 100644 C4/ClassSplitRoutine/Generic.pm
create mode 100644 C4/ClassSplitRoutine/LCC.pm
copy Koha/Template/Plugin/raw.pm => C4/ClassSplitRoutine/RegEx.pm (53%)
copy Koha/{Suggestion.pm => ClassSplitRule.pm} (53%)
copy Koha/{ClassSources.pm => ClassSplitRules.pm} (83%)
copy Koha/Schema/Result/{ClassSortRule.pm => ClassSplitRule.pm} (54%)
copy svc/{localization => split_callnumbers} (75%)
mode change 100755 => 100644
copy cataloguing/value_builder/marc21_field_005.pl => t/Labels_split_Regex.t (50%)
copy t/db_dependent/Koha/{Patron/Consents.t => ClassSplitRules.t} (51%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list