[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.04-83-g2244ed8072
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 3 20:47:23 CEST 2020
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, 19.11.x has been updated
via 2244ed80725a91d101d1796ab118d4fccc5ff61e (commit)
via e513e32d0e3c004236048b6673f55eb45bbd82ae (commit)
via 3b06b06cf3f41afbd7af136e250783e0f97acfc5 (commit)
via ab2a1b82052c00c2230c162763975ec0ac8dc989 (commit)
via f7729a02547ec1b4e71b13c70757bb48ad622b51 (commit)
via 66742f6e705d5841c6559f346883bdc2f6ee1053 (commit)
via b58bb48b0b7401d010bb89bdaf7edbee1c6163ce (commit)
from c35acfaebeb4c1e4bd378a8af64175706cfa3e4c (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 2244ed80725a91d101d1796ab118d4fccc5ff61e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 16 12:39:39 2020 +0100
Bug 24851: Translate the .txt in French
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit e513e32d0e3c004236048b6673f55eb45bbd82ae
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Mar 4 19:06:03 2020 +0100
Bug 24851: Insert libraries sample data for "UNIMARC"
I am trying to make koha-testing-docker UNIMARC compabible.
In order to have koha-misc4dev insert all the data correctly (users, etc.) we need at least 1 library.
I am suggesting to reuse the usual library list for UNIMARC.
misc4dev will use fr-FR sample data for "UNIMARC"
This is related to https://gitlab.com/koha-community/koha-misc4dev/issues/29
Test plan:
outside your box, in koha-testing-docker (up-to-date), edit .env and set
KOHA_MARC_FLAVOUR=unimarc
DEBUG_GIT_REPO_MISC4DEV_URL=https://gitlab.com/joubu/koha-misc4dev.git
DEBUG_GIT_REPO_MISC4DEV_BRANCH=unimarc
Then start the koha container
When the misc4dev will start its job, the scripts will have the expected
data to continue.
Without this patch you will get
koha_1 | Not enough data in the database, library and/or patron category does not exist at /kohadevbox/misc4dev/create_superlibrarian.pl line 31.
And plenty of errors will follow.
Also, the sample data used in misc4dev will use CPL
(/kohadevbox/misc4dev/data/sql/unimarc/1812/after_22155/items.sql)
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 3b06b06cf3f41afbd7af136e250783e0f97acfc5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 16 13:01:04 2020 +0100
Bug 24827: Add a test
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit ab2a1b82052c00c2230c162763975ec0ac8dc989
Author: Andreas Roussos <a.roussos at dataly.gr>
Date: Sun Mar 15 08:43:25 2020 +0100
Bug 24827: Specify UTF-8 as encoding in new_from_xml()
The MARC preview of staged records fails when a staged record contains
items with UTF-8 characters (see attached screenshots). That's because
in EmbedItemsInImportBiblio() the call to MARC::Record->new_from_xml()
does not explicitly specify 'UTF-8' as the optional encoding to use.
This patch fixes that.
Test plan (in a MARC21 instance):
0) Stage for import the test record attached to this bug report (make
sure that 'Check for embedded item record data?' is set to 'Yes'),
then go to Home > Tools > Manage staged MARC records and click on
the filename you've just staged.
1) In the 'Citation' column, click on the hyperlink to launch the MARC
preview -- notice how it fails to produce any output apart from the
modal heading.
2) Apply the patch, and restart Plack if necessary.
3) Re-launch the MARC preview: this time the output should include the
whole record, including the embedded item data in field 952.
4) Run the unit tests to ensure nothing was broken inadvertently:
$ prove t
$ prove xt
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit f7729a02547ec1b4e71b13c70757bb48ad622b51
Author: Andreas Roussos <a.roussos at dataly.gr>
Date: Sun Mar 15 08:34:52 2020 +0100
Bug 24827: Standardise on 'UTF-8' as the encoding name
This patch standardises the encoding name used in direct calls
to new_from_xml() to 'UTF-8' instead of 'utf8' or 'utf-8'.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit 66742f6e705d5841c6559f346883bdc2f6ee1053
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Mar 16 14:55:31 2020 +0000
Bug 24789: [follow-up] Fix saving of macros
Saving was accidentally commented out in patches, this restores that
To test:
1 - Create a new macro
2 - Add some content
3 - Reload the macro, no content
4 - Apply patch
5 - Repeat
6 - Macro saves/loads correctly
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
commit b58bb48b0b7401d010bb89bdaf7edbee1c6163ce
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Mar 3 13:26:02 2020 +0000
Bug 24789: Remove ITS macro format
To test:
1 - Apply patches
2 - Confirm you can save, load, and run macros
3 - Confirm you have no choice of format
Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 2 +-
C4/ImportBatch.pm | 2 +-
Koha/Biblio/Metadata.pm | 2 +-
Koha/BiblioUtils/Iterator.pm | 2 +-
.../2-Optionel}/sample_libraries.sql | 0
.../mysql/fr-FR/2-Optionel/sample_libraries.txt | 1 +
.../intranet-tmpl/lib/koha/cateditor/macros.js | 6 +-
.../intranet-tmpl/lib/koha/cateditor/macros/its.js | 208 ---------------------
.../prog/en/includes/cateditor-ui.inc | 15 +-
.../prog/en/modules/cataloguing/editor.tt | 1 -
misc/batchRebuildBiblioTables.pl | 2 +-
misc/migration_tools/build_oai_sets.pl | 2 +-
opac/opac-readingrecord.pl | 2 +-
svc/bib | 2 +-
svc/import_bib | 2 +-
svc/new_bib | 2 +-
t/db_dependent/ImportBatch.t | 7 +-
.../Koha/Z3950Responder/GenericSession.t | 8 +-
t/db_dependent/Koha/Z3950Responder/ZebraSession.t | 4 +-
19 files changed, 25 insertions(+), 245 deletions(-)
copy installer/data/mysql/{de-DE/optional => fr-FR/2-Optionel}/sample_libraries.sql (100%)
create mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_libraries.txt
delete mode 100644 koha-tmpl/intranet-tmpl/lib/koha/cateditor/macros/its.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list