[koha-commits] main Koha release repository branch master updated. v17.11.00-84-gad2bd6a
Git repo owner
gitmaster at git.koha-community.org
Mon Dec 11 15:40:56 CET 2017
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 ad2bd6a36dd48626bf64834fee6a800f85d7665c (commit)
via e6a4978f19e9e6694aed1d9fe120d15cc60774e0 (commit)
via c46e2fe7ac9677216543b848f4f20838e5e25d17 (commit)
via 76d9c74ffaea455bdb8b1756b69ee2af1f40d090 (commit)
via 44e7d5e84b2e4020011500ccf0f0f53f974af73d (commit)
via 9b541824fddcdbf483c80fedc4d25bd25cce9d28 (commit)
via 571c236264d5bac4441eb3c20bcf67dd24160fce (commit)
via 3c2628616914b3fd7ff7bc6911fc5be9c6a754ea (commit)
via 2a8338fb87dd9a3e5fd1466ad63c5e1d8bffc0ba (commit)
via 1a9b8a00ae9c98545b8247c91b3c8b406c2ccf06 (commit)
via 03e01e670d14b21abc6d16d4a423e396ad3645ae (commit)
via cff82b59622adab8307a72d4a1b523f349e84b3c (commit)
via 1e746becc277883281923900891fdb3f5ae755c9 (commit)
via 0d6dff2b39ad94cd196940c1ed752cb2132e1a5d (commit)
via a6abaca8d0d36835e4a5fd4fb9b906cc9e573953 (commit)
via cf79a2694eab08613b409bec2b14c8f6949cd8c2 (commit)
via 1e40274411a667e2bdbfc5417638c8a75d6e390b (commit)
via 634c55aacb752467c6623478a8abdc108ced8e98 (commit)
via eaa3287705d607bb9b8e22d3903f5f3a457098e2 (commit)
via 9a2002465338a53f8ceb69041a9bb699f8065344 (commit)
via 7c5c516844625592ed68ca91be5a76852b4bfdb6 (commit)
via 02f46e0a27db0f72bc19e6e7fe99c78090b5f1a0 (commit)
via 53594885286620afd8b96bf1b77fa8c54a5ac4c3 (commit)
via 76f277930f017b601d30c817b4df796fbf9a2556 (commit)
via e110f90c342841dfb57a88b27e4ef882f7ecc39e (commit)
via 1e9b7301022f3737f028246d11e9a32883280d53 (commit)
via c8ff1254c92374b888aca8b96121ce6294ae7d3d (commit)
via 528f647ae81977b017b2cf7d1da983b22d1e2f0b (commit)
via 4247994e4636f0747811571371d62626a1427389 (commit)
via 4b2aa64950ee387e81a5589e6cd0e00d145efe42 (commit)
via c1465eeb737fd4502891daf0616af1e892eb24c4 (commit)
via fcbffbbc6153197bed3fcf555c7f09cfa709a462 (commit)
via f54693ac86799cb556fffed412968d688877b585 (commit)
via 32fcf995a314094e092f4925e58a007a6fa1b57d (commit)
via f8537d1aad029f0c0f21bac894b53d1b3f6542ce (commit)
via 9adfd29fc1a25f9da95a55e0fd39b1973db11912 (commit)
via 93bd78951d64218b711e4ecf472f3d2f12455182 (commit)
via 407e58488875b2499c5f2ad72618a2ff2eb5a50c (commit)
via 18f4a89ce6108bcabf042e74bfa582f14184e463 (commit)
via 5a63523f593736e282d4b8dc590f250f0339c2eb (commit)
via 590cae04fd4cb0fc6fa309d6006fd14f48ea4a03 (commit)
via 2164fce41fe2835a909cc952a346ac3e145a5390 (commit)
via 2a74db9e6b862a67dc9b90131e3784d6a5a6b51e (commit)
via 24c0c49ab357531e4ffc2ee6d6fc034bcfbb5393 (commit)
via 9dfff3ab1993aac03873c5f87543df05c778c353 (commit)
via 54467a76d73e4ee9f82b039b6db0295ffa7e50ef (commit)
via e9a4e52077cee5d150dac0c39db49930b8cff994 (commit)
via db32f394a636848488de4d1637d9efc5b7fcf004 (commit)
via 01fbe2be9925f8586b9a2cb4dc908fc856b672a8 (commit)
from d203cbbe8e8c38cfb15437fc3d583bfcaa15d834 (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 ad2bd6a36dd48626bf64834fee6a800f85d7665c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Oct 10 15:50:24 2017 +0200
Bug 19439: (follow-up) Remove four spaces from lines 133-149
Speaks for itself. No test plan.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e6a4978f19e9e6694aed1d9fe120d15cc60774e0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Oct 9 15:12:05 2017 +0200
Bug 19439: Remove eval with exit statements from opac/unapi
The script contains some error responses that get lost when using them
in an eval statement. (Since exit should not be used within an eval
construction.) The eval is removed now.
Test plan:
[1] Before applying this patch, you could look at the current responses
from unapi for the calls in the next steps. Apply the patch now.
[2] Call http(s)://[your-server]/cgi-bin/koha/unapi with only a format
parameter.
Check if you have a 400 status response. (In Firefox, look at Network
tab of Developer Tools.)
Note: Have to admit (reluctantly) that MS Edge shows the status code in
the browser rightaway in contrast with Firefox.
[3] Call unapi with a format=marcxml&id=999
The wrong id parameter should trigger a 404 response.
[4] Call unapi with format=marcxml&id=koha:biblionumber:[notexist]
where notexist is a biblionumber that not exists.
This should trigger again a 404 response.
[5] Call unapi with format=marcxmlx&id=koha:biblionumber:[exist]
where exist should be a good biblionumber.
The wrong format should trigger a 406 response.
[6] Bonus: The 500 response can be tested by manipulating a XSLT file.
Create invalid xml in the file for marcxml (identity.xsl in intranet
xslt folder).
Call unapi with format=marcxml&id=koha:biblionumber:[exist].
You should get a 500 response and have warnings in your logfile.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c46e2fe7ac9677216543b848f4f20838e5e25d17
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Dec 1 13:53:16 2017 +0000
Bug 19726: Move admin templates JavaScript to the footer: Preferences
This patch modifies the staff client's system preferences templates so
that JavaScript is included in the footer instead of the
header.
To test, apply the patch and test the JavaScript-driven features of
both the standard and local use system preferences:
- WYSIWYG editor
- Confirmation messages
- Table sorting
- Multiple selects (CoceProviders for example)
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 76d9c74ffaea455bdb8b1756b69ee2af1f40d090
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 28 19:04:43 2017 +0000
Bug 19710: Move plugins templates javascript to the footer
This patch modifies the staff client plugins template so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of
the modified template:
- The plugins link should be bold in the sidebar menu.
- Choosing "Uninstall" for an installed plugin should trigger a
confirmation alert.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 44e7d5e84b2e4020011500ccf0f0f53f974af73d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 27 15:15:06 2017 +0000
Bug 19700: Move template JavaScript to the footer: Some circulation pages
This patch modifies some staff client circulation templates so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of the
modified templates: All button controls, DataTables functionality, tabs,
etc.
- Article requests (enable ArticleRequests system preference, have at
least one outstanding article request)
- Request article (Bibliographic detail page -> Request article).
- Item circulation statistics (Bibliographic detail page -> Items ->
View item's checkout history).
- On-site checkouts (enable OnSiteCheckouts system preference; Check out
some items as on-site checkouts; Go to Circulation ->
Pending on-site checkouts
- Overdues report (Circulation -> Overdues).
- Holds to pull (Circulation -> Holds to pull).
- Renew
- Holds ratios (Circulation -> Holds ratios).
- Check in
- Transfers to receive (Circulation -> Transfers to receive).
- Holds queue (Circulation -> Holds queue).
- Holds awaiting pickup (Circulation -> Holds awaiting pickup).
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9b541824fddcdbf483c80fedc4d25bd25cce9d28
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 27 12:51:16 2017 +0000
Bug 19697: Move template JavaScript to the footer: Search results
This patch modifies the staff client catalog search results template so
that JavaScript is included in the footer instead of the header.
To test, apply the patch and test the various JavaScript-driven features
of the results page: Floating toolbar, cart, lists, cover images, search
to hold, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 571c236264d5bac4441eb3c20bcf67dd24160fce
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 22 19:03:15 2017 +0000
Bug 19680: Move JS to the footer: Patron and circulation tools
This patch modifies more staff client patrons and circulation tools
templates so that JavaScript is included in the footer instead of the
header.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
- Batch patron deletion/anonymization
- Overdue notice/status triggers
- Batch patron modification
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3c2628616914b3fd7ff7bc6911fc5be9c6a754ea
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 22 15:53:42 2017 +0000
Bug 19679: Move templates JavaScript to the footer: More tools templates
This patch modifies more staff client tools templates so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
Export data
Inventory
Notices & slips
Upload local cover image
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2a8338fb87dd9a3e5fd1466ad63c5e1d8bffc0ba
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 21 15:14:58 2017 +0000
Bug 19672: Move tools templates JavaScript to the footer: More MARC tools
This patch modifies some staff client templates from the "Tools"
section so that JavaScript is included in the footer instead of the
header.
- Automatic item modifications by age
- MARC modification templates
- Stage MARC records for import
- Staged MARC record management
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1a9b8a00ae9c98545b8247c91b3c8b406c2ccf06
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 20 18:05:14 2017 +0000
Bug 19659: Move JS to the footer: Suggestions and tags
This patch modifies the staff client's suggestions and tags templates so
that JavaScript is included in the footer instead of the header.
This patch adds a new JS file, acquisitions-menu.js, which will be added
to each template which has the Acquisitions sidebar menu (in this case,
suggestions). Highlighting of the current page in the sidebar menu will
be broken for pages which have not been modified to use this file.
To test, apply the patch and test the JavaScript-driven features of
suggestions and tags pages: All button controls, DataTables
functionality, form validation, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 03e01e670d14b21abc6d16d4a423e396ad3645ae
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 20 17:05:10 2017 +0000
Bug 19657: Move lists templates JS to the footer
This patch modifies the staff client's lists templates so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of the
lists page: All button controls, DataTables functionality, form
validation, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cff82b59622adab8307a72d4a1b523f349e84b3c
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Dec 6 16:14:51 2017 +0000
Bug 19656: (QA follow-up) Add bold style to rotating colections menu item
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1e746becc277883281923900891fdb3f5ae755c9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 20 16:41:33 2017 +0000
Bug 19656: Move rotating collections templates JS to the footer
This patch modifies the staff client's rotating collections templates so
that JavaScript is included in the footer instead of the header.
The patch moves JavaScript from each template and the rotating
collections toolbar into a single external JavaScript file.
To test, apply the patch and test the JavaScript-driven features of
each page: All button controls, DataTables functionality, form
validation, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0d6dff2b39ad94cd196940c1ed752cb2132e1a5d
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Dec 6 15:19:46 2017 +0000
Bug 19653: (QA follow-up) Add bold style to quotes menu item on quotes-upload page
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a6abaca8d0d36835e4a5fd4fb9b906cc9e573953
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 28 15:41:54 2017 +0000
Bug 19653: Move tools templates JavaScript to the footer: Additional tools
This patch modifies the staff client "Additional tools" templates so
that JavaScript is included in the footer instead of the header:
- Calendar
- CSV profiles
- Log viewer
- News
- Task scheduler
- Edit quotes for QOTD feature
- Upload
Note that the log viewer template has been modified so that the
"interface" variable (passed to the template to provide the correct path
to staff client assets) isn't overwritten by an "interface" variable
required by the log viewer.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cf79a2694eab08613b409bec2b14c8f6949cd8c2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 15 16:08:57 2017 +0000
Bug 19628: Move course reserves templates JS to the footer
This patch modifies the staff client course reserves templates so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of
each page: All button controls, DataTables, autocomplete, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1e40274411a667e2bdbfc5417638c8a75d6e390b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Nov 9 13:53:19 2017 +0000
Bug 19601: Move admin templates JavaScript to the footer: Additional parameters
This patch modifies the staff client "additional parameters"
administration templates so that JavaScript is included in the footer
instead of the header.
To test, apply the patch and test the JavaScript-driven features of
each page: All button controls, DataTables functionality, tabs, etc.
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 634c55aacb752467c6623478a8abdc108ced8e98
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Dec 5 10:58:11 2017 +0000
Bug 19600: (QA follow-up) Apply css to menu item for item_search_field page
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eaa3287705d607bb9b8e22d3903f5f3a457098e2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Nov 9 13:24:04 2017 +0000
Bug 19600: Move admin templates JavaScript to the footer: Other catalog pages
This patch modifies the staff client catalog-related administration
templates so that JavaScript is included in the footer instead of the
header.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
tabs, etc.
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9a2002465338a53f8ceb69041a9bb699f8065344
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 17 16:32:56 2017 +0000
Bug 19647: Move patron lists templates JS to the footer
This patch modifies the staff client patron lists templates so that
JavaScript is included in the footer instead of the header.
This patch adds a new JS file, tools-menu.js, which will be added to
each template which has the Tools sidebar menu. Highlighting of the
current page in the sidebar menu will be broken for pages which have not
been modified to use this file.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
resolved the issue, sorry about that, everything is working fine!Signed-off-by: Dominic Pichette <dominic at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7c5c516844625592ed68ca91be5a76852b4bfdb6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 8 17:40:55 2017 +0000
Bug 19594: Move admin templates JavaScript to the footer: MARC-related
This patch modifies the staff client MARC-related administration
templates so that JavaScript is included in the footer instead of the
header.
To test, apply the patch and test the JavaScript-driven features of the
cart: All button controls, DataTables functionality, tabs, etc.
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 02f46e0a27db0f72bc19e6e7fe99c78090b5f1a0
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 8 15:55:23 2017 +0000
Bug 19592: Move admin templates JavaScript to the footer: Acquisitions
This patch modifies the staff client acquisitions-related adminisration
templates so that JavaScript is included in the footer instead of the
header.
To test, apply the patch and test the JavaScript-driven features of the
cart: All button controls, DataTables functionality, tabs, etc.
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 53594885286620afd8b96bf1b77fa8c54a5ac4c3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 27 14:30:20 2017 -0300
Bug 12227: Remove the demo functionality
This is a legacy mode that did not really work.
Test plan:
Play with frameworks and sysprefs and confirm the changes
(add/del/update) are taken into account.
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 76f277930f017b601d30c817b4df796fbf9a2556
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Oct 6 07:26:31 2017 +0000
Bug 19292: Add MARC code column on libraries list
Test plan:
0) Apply the patch
1) Go to admin/branches.pl
2) In the list of libraries, you should see new column "MARC Organization Code"
3) Insert some codes to some libraries
4) Confirm they are shown in new column
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Fixed capitalization.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e110f90c342841dfb57a88b27e4ef882f7ecc39e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 11 12:49:33 2017 -0300
Bug 19299: Replace C4::Reserves::GetReservesForBranch with Koha::Holds->waiting
GetReservesForBranch simply returns the waiting holds, for a specific
branch of not. This can easily be replaced with a call to
Koha::Holds->waiting
To avoid any regressions, I reuse the exact conditions (priority = 0),
but I do not think it is useful.
Test plan:
Make sure the holds information are correctly displayed on the waiting
holds screen.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1e9b7301022f3737f028246d11e9a32883280d53
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 5 15:26:58 2017 +0000
Bug 19751: Holds awaiting pickup report should not be fixed-width
This patch changes the grid used for the holds awaiting pickup report so
that the results are full page and fluid instead of fixed-width.
To test, apply this patch and the patch for Bug 19700 if necessary.
View the holds awaiting pickup report. The report should fluidly fill
the page width.
Test with the CircSidebar system preference enabled and disabled.
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: BWS Sandboxes <ByWaterSandboxes at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c8ff1254c92374b888aca8b96121ce6294ae7d3d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 29 15:18:31 2017 -0300
Bug 10021: DBRev 17.12.00.003
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 528f647ae81977b017b2cf7d1da983b22d1e2f0b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 3 13:40:38 2017 -0300
Bug 10021: (QA follow-up) Rename variables
To avoid $account, $accounts and @accounts variables in the same scope
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4247994e4636f0747811571371d62626a1427389
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 24 18:45:31 2017 -0300
Bug 10021: Restore "Pay fines" list
Previous changes were wrong, the notify_id was always equal to 1 and
GetBorNotifyAcctRecord was used to retrieved the account lines to pay
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4b2aa64950ee387e81a5589e6cd0e00d145efe42
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 24 18:25:38 2017 -0300
Bug 10021: Remove notify columns in circ/branchoverdues.tt
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c1465eeb737fd4502891daf0616af1e892eb24c4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 23 12:27:58 2017 -0300
Bug 10021: Remove accountlines columns - DBIC Schema changes
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fcbffbbc6153197bed3fcf555c7f09cfa709a462
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 23 12:27:33 2017 -0300
Bug 10021: Update DB changes
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f54693ac86799cb556fffed412968d688877b585
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 18 10:43:17 2017 -0300
Bug 10021: Drop columns notify_id and notify_level from accountlines
It appears that has never worked.
Could someone confirm?
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 32fcf995a314094e092f4925e58a007a6fa1b57d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 8 16:24:21 2016 +0100
Bug 10021: Drop table notifys and related code
This patch drops the notifys table and its related code in C4::Overdues.
A second patch should remove the 2 columns notify_id and notify_level
from the accountlines table.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f8537d1aad029f0c0f21bac894b53d1b3f6542ce
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Dec 11 11:22:41 2017 -0300
Bug 19096: DBRev 17.12.00.002
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9adfd29fc1a25f9da95a55e0fd39b1973db11912
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 17 10:57:28 2017 +0200
Bug 19096: Add update DB entry to sync kohafield in all frameworks
Squashed the last four follow-ups into one patch. Instead of adding
two routines to Koha::MarcSubfieldStructures, and instead of moving
them to Koha::Util::Dbrev, we finally ended up with converting the
code to raw SQL queries (thx Jonathan). No need to 'pollute' the git
history with all this moving around.
As Jonathan pointed out, there is a risk in using DBIx calls (with Koha
objects) while running database revisions. See also bug 17292 and
bug 19789.
I tested the resulting db revision by adding a few fields to the Default
framework and adding deviating kohafields in other frameworks. And confirm
that it works as expected.
Please read the remainder of this commit message in the light of the above:
===
The dbrev will use two new routines in MarcSubfieldStructures:
[1] get_kohafield_exceptions is used to report deviating kohafields in
the additional frameworks,
[2] sync_kohafield is used to reset kohafield in the other frameworks to
the mapping in Default.
Test plan:
Unit test and database revision:
[1] Run t/db_dependent/Koha/MarcSubfieldStructures.t
[2] Verify that your Default 100a is mapped to biblio.author. Go to another
framework and clear the mapping via mysql command line:
UPDATE marc_subfield_structure SET kohafield=NULL WHERE frameworkcode=[your_framework] AND tagfield='100' AND tagsubfield='a';
[3] Run the db revision. It should report that 100a was adjusted.
[4] Check in admin/marc_subfield_structure that your 100a is mapped to
biblio.author again in that framework.
Additional interface testing (ensuring that the changes on this report do
not interfere with multiple mappings):
[5] Make two mappings for copyrightdate: 260c and 264a. And make two
mappings for biblioitems.pages: 300a and say 300g. Toggle with some
field values in those fields in the cataloging editor and verify the
contents of biblio.copyrightdate and biblioitems.pages. The former
should contain one year (due to additional logic) and the latter should
contain A | B if both fields are filled.
Remove the mapping for 300g.
[6] Set AcqCreateItem to ordering or placing. Verify that you can still
add or receive an order as usual.
[7] Add a mapping for itemcallnumber to 952f (this should remove the one
for coded_location_qualifier). This is very unusual but serves well in
testing multiple mappings for items.
Add or receive an order (fill 952f and 952o) with same and/or different
values. Verify the contents of items.callnumber. (Check with regular
item editor; see note.)
Do a similar edit in the regular item editor.
Note: You should expect to see A | B in both 952f and 925o if both
fields are filled with a different value.
Set items.coded_location_qualifier back to 952f in koha2marclinks.
Note: When AcqCreateItem==ordering, you will not see A|B in the callno
field when adding an item on neworderempty.pl. But when you submit
the main form, addorder.pl is called. At that time an item is created
and you will see that A|B is in both fields (952f and 952o).
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 19096: (QA follow-up) Move two routines out of Koha::MSS
As requested by RM, this patch moves sync_kohafield and
get_kohafield_exceptions from Koha/MarcSubfieldStructures.pm.
At this moment they are only used in a database revision; it is not clear
if they may be of use later on.
In order to keep them in a module and not remove the unit tests, this
patch adds a Koha::Util module Dbrev.pm. It is now required in the atomic
update, but could be added in a use statement in updatedatabase.pl.
Test plan:
[1] Run updatedatabase.pl
[2] Run t/db_dependent/Koha/MarcSubfieldStructures.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 19096: Use raw SQL queries instead for the update DB entry
I strongly thing we must not use C4 or Koha subroutine in the update DB
process, only sql queries.
Especially not DBIC Schema files as they will change.
For instance the update DB 17.12.00.00X is using a specific Koha::Schema::RS::MSS
representing the current schema, but in X months/years, this schema will change
and the ->search we used may failed.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 19096: Move the sql queries to the update DB entry
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: Print "Field 700$a" instead of "Field 700.a" in the dbrev.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 93bd78951d64218b711e4ecf472f3d2f12455182
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 17 11:44:18 2017 +0200
Bug 19096: Restructure MarcSubfieldStructures.t first
Before adding more tests, move all current tests in one subtest.
Test plan:
Run t/db_dependent/Koha/MarcSubfieldStructures.t
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 407e58488875b2499c5f2ad72618a2ff2eb5a50c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Aug 16 14:37:06 2017 +0200
Bug 19096: Online help changes
On the page admin/marc_subfields_structure we now tell that Koha link
has been disabled and refer to the help for koha2marclinks.
On the page admin/koha2marclinks we mention that the Default mapping is
considered authoritative now.
Test plan:
Read these online help pages and verify that the changes make sense.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 18f4a89ce6108bcabf042e74bfa582f14184e463
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 7 15:02:10 2017 +0200
Bug 19096: Do not allow changes to kohafield within MARC frameworks
This patch makes two changes in the script for managing the MARC
frameworks in order to support making the Default authoritative
as for Koha to MARC mappings:
[1] Disable the kohafield select combo. Add a hidden input to save value.
[2] When a new subfield is added, the kohafield is still empty and should
be overwritten with its Default counterpart.
Note: Although we could leave the field empty, since Koha looks at the
Default framework only, it does not cost much to keep these fields in
sync with Default and perhaps catch a bug when someone somewhere looks
in the wrong framework.
Note: The description of Koha to MARC mapping on admin-home has been
adjusted accordingly (removing last two lines).
Test plan:
[1] Add a new tag and subfield in Default.
[2] Map it to a kohafield in koha2marclinks.pl
[3] Add the same tag and subfield in another framework.
Verify that the kohafield is updated after you saved the subfield.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5a63523f593736e282d4b8dc590f250f0339c2eb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 10 10:59:07 2017 +0200
Bug 19096: Adjusts unit tests
The subroutines listed in the former patch are extensively tested in
Biblio.t, TransformKohaToMarc.t and TransformMarcToKoha.t.
These tests do no longer use new frameworks to add mappings.
In Biblio.t and TransformMarcToKoha.t we also test passing an individual
framework code (for an empty framework) to see if Default is still used.
Note that this parameter will be removed later on.
In Items.t the cache keys MarcStructure-0- and MarcStructure-1- are not
touched, so they do not need to be cleared. The cache key
default_value_for_mod_marc- should be used without framework now.
Similar adjustments in Items/AutomaticItemModificationByAge.t and
Reserves.t.
Furthermore the subtest for _build_default_values_for_mod_marc in Items.t
is adjusted since framework is no longer relevant. The biblio record with
items is created in a new framework, but the mappings from Default are
consulted.
Test plan:
Run all adjusted unit tests.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 590cae04fd4cb0fc6fa309d6006fd14f48ea4a03
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 10 10:59:07 2017 +0200
Bug 19096: Make Default authoritative in core modules
After feedback from the dev mailing list, it seems appropriate here to
propose making the Default framework authoritative for Koha to MARC
mappings. This implies checking only the Default framework in the
routines:
[1] GetMarcFromKohaField: The parameter frameworkcode is removed. A
follow-up report (19097) will update the calls not adjusted here.
This is safe since the parameter is silently ignored.
[2] GetMarcSubfieldStructureFromKohaField: Framework parameter is removed
and calls are adjusted. Includes acquisitions_stats.pl.
[3] TransformKohaToMarc: The parameter is removed; all calls are verified
or adjusted.
[4] TransformMarcToKoha: The parameter is no longer used and will be
removed in a follow-up report (19097). It always goes to Default now.
[5] TransformMarcToKohaOneField: The parameter is removed and all calls
are adjusted. Including: Breeding, XISBN and MetadataRecord modules.
[6] C4::Koha::IsKohaFieldLinked: This routine was called only once (in
C4::Items::_build_default_values_for_mod_marc. It can be replaced by
calling GetMarcFromKohaField. If there is no kohafield linked, undef
is returned. (Corresponding unit test is removed here.)
[7] C4::Items::ModItemFromMarc: The helper routine
_build_default_values_for_mod_marc does no longer have a framework
parameter. The cache key default_value_for_mod_marc- is no longer
combined with a frameworkcode. Three admin scripts are adjusted
accordingly; some tests will be corrected in the next patch.
Test plan:
See next patch. That patch adjusts all tests involved.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2164fce41fe2835a909cc952a346ac3e145a5390
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Oct 23 12:07:04 2017 +0200
Bug 10306: (QA follow-up) More feedback for admins in koha2marclinks
As requested by Tomas, this patch does:
[1] Add a js alert when you did not type field,subfield
[2] Print a yellow alert div when the field,subfield is not found.
[3] Bonus: Make it little bit more secure by demanding a POST. (Leaving
CSRF etc. for another report.)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2a74db9e6b862a67dc9b90131e3784d6a5a6b51e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 24 12:23:29 2017 +0200
Bug 10306: (QA follow-up) Correct a TestBuilder call
In order to create a new framework, MarcSubfieldStructure was used as
source. This works since that table contains a FK for frameworkcode.
But obviously, we should use BiblioFramework as source.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 24c0c49ab357531e4ffc2ee6d6fc034bcfbb5393
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jul 27 13:18:39 2017 +0200
Bug 10306: Adjusted online help text for koha2marclinks
Test plan:
Click on Help. Read the text.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9dfff3ab1993aac03873c5f87543df05c778c353
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 24 19:09:17 2017 +0200
Bug 10306: Support for multiple mappings in koha2marclinks
This actually refactors koha2marclinks.pl in order to support multiple
mappings per kohafield.
Instead of three separate mapping pages for biblio, biblioitems and items,
the script now lists them together. This gives a complete overview of all
mappings rightaway. Changes are applied immediately across all frameworks.
Note: This report handles the Default mappings just like it did before.
In this script Koha already considered them as authoritative, although
other parts of Koha did not. Follow-up report 19096 makes Default
mappings authoritative throughout all Koha.
On each line two buttons are provided, Add and Remove, in order to add or
remove an individual mapping. We do no longer provide a separate form with
the names of MARC tags. Since this form is targeted for administrators,
it should be enough to ask for a field tag and subfield code.
Note: The mappings for biblionumber, biblioitemnumber and itemnumber are
so vital that this form marks them as readonly. It is not recommended to
change them.
Test plan:
[1] Add a mapping. Verify via Frameworks or mysql command line that the
kohafield is saved to the other frameworks too.
[2] Remove the mapping again. Check Frameworks or mysql cl again.
[3] Test adding a second mapping. Map copyrightdate to 260c and 264c.
And map biblioitems.place to 260a and 264a.
[4] Edit biblio record 1: Put 1980 in 260c. Do not include 264c.
Edit biblio record 2: Put 1990 in 264c. Do not include 260c.
Edit biblio record 3: Put 2000 in both 260c and 264c. Put CityA in 260a
and in 264a.
Edit biblio record 4: Put 2010 in 260c, and 2015 in 264c (which you
should refuse normally). Put CityA in 260a, and CityB in 264a.
[5] Create a report that shows biblioitems.place and biblio.copyrightdate
for those biblio records.
Record 4 should have 2010 in copyrightdate (since TransformMarcToKoha
picks the first year for copyrightdate).
Record 3 should have place CityA; record 4 should have CityA | CityB.
Note: The CityA | CityB example illustrates that we should add some
additional handling in TransformMarcToKoha for multiple 264s.
[6] Add these four biblio records to a new list. Sort by Year.
With OPACXSLTListsDisplay==default, check if the order = 1,2,3,4.
(The order is based on biblio.copyrightdate.)
Note that (RDA) record 2 would be on top without this patch set, since
copyrightdate would have been null.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 54467a76d73e4ee9f82b039b6db0295ffa7e50ef
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 3 12:56:08 2017 +0200
Bug 10306: Restructure TransformMarcToKoha and update some POD lines
This patch makes the following changes:
[1] Added POD for CountItemsIssued, GetBiblioItemData
[2] Moved TransformMarcToKohaOneField closer to TransformMarcToKoha (before
sub CountItemsIssued)
[3] Restructured TransformMarcToKoha by extracting individual kohafields via
TransformMarcToKohaOneField. The latter does no longer call the former.
This small optimization avoids traversing the whole MARC record again
and again.
[4] Moved adjusting copyrightdate/publicationyear to separate helper routine
_adjust_pubyear
[5] Removed obsolete sub _get_inverted_marc_field_map.
Test plan:
Run t/db_dependent/Biblio/TransformMarcToKoha.t
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e9a4e52077cee5d150dac0c39db49930b8cff994
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 19 16:54:40 2017 +0200
Bug 10306: Add tests for module changes
GetMarcSubfieldStructure: In Biblio.t we are adding a subtest that checks
the structure returned by this routine. Is it a hashref pointing to
arrayrefs of hashrefs? ;)
In Search.t this routine was mocked. The change in the returned structure
is now applied to this mock too (moving the marc tag hashes into
arrayrefs).
GetMarcFromKohaField: In Biblio.t we add a subtest for it. We are checking
if it returns multiple mappings (per kohafield) and calling it in scalar
context too.
GetMarcSubfieldStructureFromKohaField: The existing subtest in Biblio.t is
expanded to also test the call in list context.
TransformKohaToMarc: This sub has its own test script. We are adding a
subtest in TransformKohaToMarc.t for a test with multiple mappings,
and for mapping to a control field in another framework. This also tests
the additional framework parameter.
Additionally, we add a test for the new no_split option used for items.
TransformMarcToKoha: This implicitly tests its helper sub _get_inverted.
This patch adds a new test script for this routine.
TransformMarcToKohaOneField: A few tests are added to the previous new
test script.
Test plan:
[1] Run t/db_dependent/Biblio.t
[2] Run t/db_dependent/Biblio/TransformKohaToMarc.t
[3] Run t/db_dependent/Biblio/TransformMarcToKoha.t
[4] Run t/db_dependent/Search.t
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit db32f394a636848488de4d1637d9efc5b7fcf004
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jul 20 12:37:56 2017 +0200
Bug 10306: Allow controlfields in TransformKohaToMarc
Since the interface allows you to connect a kohafield to a MARC
controlfield, this routine should be able to handle that. Unfortunately
it did not.
Test plan:
Change will be tested in Biblio/TransformKohaToMarc.t in the next patch.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 01fbe2be9925f8586b9a2cb4dc908fc856b672a8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 19 16:25:04 2017 +0200
Bug 10306: Core module changes for multiple mappings
In order to allow multiple Koha to MARC mappings (for one kohafield), we
need to adjust a few key routines in C4/Biblio.pm. This results in a few
changes in dependent modules too.
Note: Multiple mappings also include 'alternating' mappings. Such as the
case of MARC21 260 and 264: only one of both fields will be used. Sub
TransformMarcToKoha will handle that just fine; the opposite transformation
is harder, since we do no longer know which field was the source. In that
case TransformKohaToMarc will fill both fields. We only use that operation
in Koha for items (in Acquisition and Cataloging).
Sub GetMarcSubfieldStructure
This sub used a selectall_hashref, which is fine as long as we have only
one mapping for each kohafield. But as DBI states it: If a row has the same
key as an earlier row then it replaces the earlier row. In other words,
we lose the first mapping if we have two.
This patch uses selectall_arrayref with Slice and rearranges the output so
that the returned hash returns an arrayref of hashrefs for each kohafield.
In order to improve consistency, we add an order clause to the SQL
statement used too.
Sub GetMarcFromKohaField
This sub just returned one tag and subfield, but in case of multiple
mappings we should return them all now.
Note: Many calls still expect just one result and will work just fine:
my ($tag, $sub) = GetMarcFromKohaField(...)
A possible second mapping would be silently ignored. Often the sub is
called for biblionumber or itemnumber. I would not recommend the use of
multiple mappings for such fields btw.
In case the sub is called in scalar context, it will return only the first
tag (instead of the number of tags and subfields).
Sub GetMarcSubfieldStructureFromKohaField
This sub previously returned the hash for one kohafield.
In scalar context it will behave like before: it returns the first hashref
in the arrayref that comes from GetMarcSubfieldStructure.
In list context, it returns an array of all hashrefs (incl. multiple
mappings).
The sub is not used in C4::Ris. Removed the use statement.
Sub TransformKohaToMarc
This sub got a second parameter: frameworkcode.
Historically, Koha more or less assumes kohafields to be defined across all
frameworks (see Koha to MARC mappings). Therefore it falls back to Default
when it is not passed.
When going thru all mappings in building a MARC record, it also supports
multiple mappings. Note that Koha uses this routine in Acquisition and in
Cataloging for items. Normally the MARC record is leading however and the
Koha fields are derivatives for optimization and reporting.
The added third parameter allows for passing a new option no_split => 1.
We use this option in C4::Items::Item2Marc; if two item fields are mapped to
one kohafield but would have different values (which would be very unusual),
these values are glued together. When transforming to MARC again, we do not
want to duplicate the item subfields, but we keep the glued value in both
subfields. This operation only affects items, since we are not doing this
reverse operation for biblio and biblioitem fields.
Sub _get_inverted_marc_field_map
This sub is a helper routine of TransformMarcToKoha, the opposite
transformation. When saving a MARC record, all kohafields are extracted
including multiple mappings.
Suppose that you had both 260c and 264c in your record (which you won't),
than both values get saved initially into copyrightdate like A | B. The
additional code for copyrightdate will extract the first year from this
string.
A small fix in TransformMarcToKoha makes that it only saves a value in a
kohafield if it is defined and not empty. (Same for concatenation.)
Sub TransformMarcToKohaOneField
This sub now just calls TransformMarcToKoha and extracts the requested
field. Note that since we are caching the structure, this does not result
in additional database access and is therefore performance-wise
insignificant. We simplify code and maintenance.
Instead of modifying the passed hashref, it simply returns a value. A call
in C4::Breeding is adjusted accordingly. The routine getKohaField in
Koha::MetadataRecord is redirected to TransformMarcToKohaOneField.
NOTE: The fourth patch restructures/optimizes TransformMarcToKoha[OneField].
Sub get_koha_field_from_marc
This sub can be removed. A call is replaced by TransformMarcToKohaOneField
in C4::XISBN.
Note: The commented lines for sub ModZebrafiles are removed (directly under
TransformMarcToKohaOneField).
Test plan:
For unit tests and interface tests, please see follow-ups.
Run qa tools in order to verify that the modules still compile well.
Read the code changes and verify that they make sense.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 15 +-
C4/Auth.pm | 14 -
C4/Biblio.pm | 369 +++++-------
C4/Breeding.pm | 4 +-
C4/InstallAuth.pm | 10 -
C4/Items.pm | 22 +-
C4/Koha.pm | 26 -
C4/Members.pm | 46 --
C4/Overdues.pm | 153 +----
C4/Reserves.pm | 36 --
C4/Ris.pm | 1 -
C4/XISBN.pm | 2 +-
Koha.pm | 2 +-
Koha/MetadataRecord.pm | 27 +-
Koha/Schema/Result/Accountline.pm | 20 +-
Koha/Schema/Result/Notify.pm | 94 ---
admin/auth_subfields_structure.pl | 8 +-
admin/auth_tag_structure.pl | 54 +-
admin/biblio_framework.pl | 4 +-
admin/koha2marclinks.pl | 185 +++---
admin/marc_subfields_structure.pl | 111 ++--
admin/marctagstructure.pl | 76 ++-
admin/preferences.pl | 12 +-
admin/systempreferences.pl | 5 +-
circ/branchoverdues.pl | 53 +-
circ/waitingreserves.pl | 47 +-
installer/data/mysql/kohastructure.sql | 17 -
installer/data/mysql/updatedatabase.pl | 105 ++++
.../prog/en/includes/acquisitions-menu.inc | 7 -
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 16 +-
.../en/includes/rotating-collections-toolbar.inc | 46 +-
.../intranet-tmpl/prog/en/includes/tools-menu.inc | 17 -
.../prog/en/includes/virtualshelves-toolbar.inc | 28 -
.../prog/en/modules/admin/admin-home.tt | 3 +-
.../prog/en/modules/admin/aqbudgetperiods.tt | 286 +++++----
.../prog/en/modules/admin/aqbudgets.tt | 516 ++++++++--------
.../prog/en/modules/admin/aqcontract.tt | 86 +--
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 114 ++--
.../prog/en/modules/admin/audio_alerts.tt | 17 +-
.../en/modules/admin/auth_subfields_structure.tt | 18 +-
.../prog/en/modules/admin/auth_tag_structure.tt | 30 +-
.../prog/en/modules/admin/authtypes.tt | 35 +-
.../prog/en/modules/admin/biblio_framework.tt | 27 +-
.../prog/en/modules/admin/branches.tt | 4 +-
.../prog/en/modules/admin/checkmarc.tt | 5 +
.../prog/en/modules/admin/classsources.tt | 5 +
.../prog/en/modules/admin/columns_settings.tt | 36 +-
.../prog/en/modules/admin/didyoumean.tt | 98 +--
.../prog/en/modules/admin/fieldmapping.tt | 25 +-
.../prog/en/modules/admin/items_search_field.tt | 7 +-
.../prog/en/modules/admin/items_search_fields.tt | 16 +-
.../prog/en/modules/admin/koha2marclinks.tt | 141 ++---
.../en/modules/admin/marc_subfields_structure.tt | 13 +-
.../prog/en/modules/admin/marctagstructure.tt | 45 +-
.../prog/en/modules/admin/matching-rules.tt | 295 ++++-----
.../prog/en/modules/admin/oai_set_mappings.tt | 75 +--
.../prog/en/modules/admin/oai_sets.tt | 79 +--
.../prog/en/modules/admin/preferences.tt | 93 ++-
.../prog/en/modules/admin/sms_providers.tt | 21 +-
.../prog/en/modules/admin/systempreferences.tt | 152 ++---
.../prog/en/modules/admin/usage_statistics.tt | 83 ++-
.../prog/en/modules/admin/z3950servers.tt | 147 ++---
.../prog/en/modules/catalogue/results.tt | 517 ++++++++--------
.../prog/en/modules/circ/article-requests.tt | 191 +++---
.../prog/en/modules/circ/bookcount.tt | 16 +-
.../prog/en/modules/circ/branchoverdues.tt | 58 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 48 +-
.../prog/en/modules/circ/on-site_checkouts.tt | 52 +-
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 140 ++---
.../prog/en/modules/circ/pendingreserves.tt | 131 ++--
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 24 +-
.../prog/en/modules/circ/request-article.tt | 171 +++---
.../prog/en/modules/circ/reserveratios.tt | 50 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 252 ++++----
.../prog/en/modules/circ/transferstoreceive.tt | 40 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 71 ++-
.../prog/en/modules/circ/waitingreserves.tt | 40 +-
.../en/modules/course_reserves/course-details.tt | 80 +--
.../en/modules/course_reserves/course-reserves.tt | 21 +-
.../prog/en/modules/course_reserves/course.tt | 105 ++--
.../prog/en/modules/help/admin/koha2marclinks.tt | 12 +-
.../modules/help/admin/marc_subfields_structure.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 13 +-
.../prog/en/modules/members/paycollect.tt | 8 -
.../prog/en/modules/patron_lists/add-modify.tt | 5 +
.../prog/en/modules/patron_lists/list.tt | 122 ++--
.../prog/en/modules/patron_lists/lists.tt | 103 ++--
.../prog/en/modules/plugins/plugins-home.tt | 24 +-
.../en/modules/rotating_collections/addItems.tt | 15 +-
.../rotating_collections/editCollections.tt | 7 +
.../rotating_collections/rotatingCollections.tt | 30 +-
.../rotating_collections/transferCollection.tt | 7 +
.../prog/en/modules/suggestion/suggestion.tt | 356 +++++------
.../intranet-tmpl/prog/en/modules/tags/list.tt | 48 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 47 +-
.../tools/automatic_item_modification_by_age.tt | 40 +-
.../prog/en/modules/tools/cleanborrowers.tt | 82 +--
.../prog/en/modules/tools/csv-profiles.tt | 56 +-
.../intranet-tmpl/prog/en/modules/tools/export.tt | 59 +-
.../prog/en/modules/tools/holidays.tt | 402 ++++++------
.../prog/en/modules/tools/inventory.tt | 251 ++++----
.../prog/en/modules/tools/koha-news.tt | 134 ++--
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 326 +++++-----
.../prog/en/modules/tools/manage-marc-import.tt | 257 ++++----
.../modules/tools/marc_modification_templates.tt | 37 +-
.../prog/en/modules/tools/modborrowers.tt | 252 ++++----
.../prog/en/modules/tools/overduerules.tt | 39 +-
.../prog/en/modules/tools/quotes-upload.tt | 602 +++++++++---------
.../intranet-tmpl/prog/en/modules/tools/quotes.tt | 352 ++++++-----
.../prog/en/modules/tools/scheduler.tt | 21 +-
.../prog/en/modules/tools/showdiffmarc.tt | 25 +-
.../prog/en/modules/tools/stage-marc-import.tt | 164 ++---
.../prog/en/modules/tools/upload-images.tt | 98 +--
.../intranet-tmpl/prog/en/modules/tools/upload.tt | 323 +++++-----
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 19 +-
.../prog/en/modules/virtualshelves/shelves.tt | 637 ++++++++++----------
koha-tmpl/intranet-tmpl/prog/js/acq.js | 5 +
.../intranet-tmpl/prog/js/acquisitions-menu.js | 4 +
koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 14 +
.../intranet-tmpl/prog/js/rotating-collections.js | 27 +
koha-tmpl/intranet-tmpl/prog/js/tools-menu.js | 20 +
members/pay.pl | 28 +-
members/paycollect.pl | 4 -
opac/unapi | 42 +-
reports/acquisitions_stats.pl | 2 +-
t/db_dependent/Biblio.t | 87 ++-
t/db_dependent/Biblio/TransformKohaToMarc.t | 72 ++-
t/db_dependent/Biblio/TransformMarcToKoha.t | 98 +++
t/db_dependent/Items.t | 85 +--
.../Items/AutomaticItemModificationByAge.t | 6 +-
t/db_dependent/Koha/IsKohaFieldLinked.t | 44 --
t/db_dependent/Koha/MarcSubfieldStructures.t | 44 +-
t/db_dependent/Reserves.t | 4 +-
t/db_dependent/Search.t | 76 +--
134 files changed, 5745 insertions(+), 6003 deletions(-)
delete mode 100644 Koha/Schema/Result/Notify.pm
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/admin-menu.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/rotating-collections.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/tools-menu.js
create mode 100644 t/db_dependent/Biblio/TransformMarcToKoha.t
delete mode 100644 t/db_dependent/Koha/IsKohaFieldLinked.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list