]> git.koha-community.org Git - koha.git/commit
Bug 14957: (QA follow-up) Rename 'merge' => 'overlay'
authorTomas Cohen Arazi <tomascohen@theke.io>
Fri, 26 Mar 2021 16:12:11 +0000 (13:12 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Tue, 26 Oct 2021 14:46:02 +0000 (16:46 +0200)
commit02720d423cb591cc854c6ec3d06a1fe51bd5c128
tree75a3a6e93576c8ef9f14ecdb3def4a348e33122a
parentf4725b64270c13e9824f9a9bd669d88515d1853d
Bug 14957: (QA follow-up) Rename 'merge' => 'overlay'

This patch acknowledges the fact that 'merging' has a different meaning
in Koha than the behavior this great patchset introduces. The more
idiomatic way of describing the behavior is to talk about 'overlay rules'.

This patch also:
- Fixes kohastructure.sql missing table encoding a collation
- Fixes the atomic update completely missing a table
- Moves the syspref entry to 'Importing', probably a rebase issue

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: (QA follow-up) Fix syntax error in atomicupdate

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: Fix imports in tests

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: Fix imports in marc-overlay-rules.pl

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: Fix syspref's values

It didn't switch off when set to "don't use"

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
JD amended patch: Fix license statement

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
21 files changed:
C4/Biblio.pm
Koha/Exceptions/MarcMergeRule.pm [deleted file]
Koha/Exceptions/MarcOverlayRule.pm [new file with mode: 0644]
Koha/MarcMergeRule.pm [deleted file]
Koha/MarcMergeRules.pm [deleted file]
Koha/MarcOverlayRule.pm [new file with mode: 0644]
Koha/MarcOverlayRules.pm [new file with mode: 0644]
admin/marc-merge-rules.pl [deleted file]
admin/marc-overlay-rules.pl [new file with mode: 0755]
installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl
installer/data/mysql/kohastructure.sql
installer/data/mysql/mandatory/sysprefs.sql
installer/data/mysql/mandatory/userpermissions.sql
koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
t/db_dependent/Biblio/MarcMergeRules.t [deleted file]
t/db_dependent/Biblio/MarcOverlayRules.t [new file with mode: 0755]