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 1c5633b0ea1e6393d9f31e990d97c6c75f65899a (commit) via 15b46699d5de79cddfcef6a5199355f95d4a6fb3 (commit) via 25c5f3968fde4559898a8f7c6733afa534d3e08a (commit) via c15abaeda937fde619c79e7b437902994e2d7f9b (commit) via 75c0481466f0b3887847e24a2069cd396d8f712c (commit) via a1686054ac3467bc1770de8f0f5485b208a49e6d (commit) via 5373bbaf5d1bdfcf997e0f9b2e67962c40374220 (commit) via ffd7fa3a068ff60976b1cf6f94fd2a48ae2d619c (commit) via 5a43228c547200e4b6d9f03fe25e98d124889226 (commit) via 55af5cdc0052a7cbc10f12b1fffeec26f1e886d4 (commit) via d83f0c1d8aa0da95c77d6d083f5bf2a702a56f66 (commit) via ca161474f3f01e9b1b444a2bc21566de6e17afdb (commit) via e9f096fec335b9a1b453e4c56f30f8d9aa22652b (commit) via bd4992749b75f2d8e57fe3ddce1eb9ff4b004fe1 (commit) via 8070357a4070cbcfb6f854fa421b48482b1c0ab4 (commit) via 09a72046f4c6abc4826db3df5170be72cbb66c4e (commit) via 3f0652056c55b49b712861adffee59ee6fd56119 (commit) via 9fb4aa36c6dda1e206b0c28a4da554c225357305 (commit) via 88735fd8fef786ac10d167e1b027fa7ad9c75a9e (commit) via 4dea9b80f9b2bc38af42ed532297f2554dd10a0a (commit) via 38e8b47e262cfe1c53770d91a6c700594b438e11 (commit) via c2bfe53eea6c4e549f47ad060ff6b5f3aa04ea5d (commit) from 90fea78bc15642798d9f7e9540c6f7f09258ff47 (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 1c5633b0ea1e6393d9f31e990d97c6c75f65899a Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Mon Feb 12 17:55:00 2018 -0300 Bug 19790: DBRev 17.12.00.014 Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 15b46699d5de79cddfcef6a5199355f95d4a6fb3 Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Date: Mon Dec 11 10:09:00 2017 +0100 Bug 19790: Add a db revision for existing installs Since many installs may still have the additionalauthors kohafield, this patch adds a dbrev in atomicupdate to clear it. Test plan: [1] Run updatedatabase. Check that you see no additionalauthors anymore in marc_subfield_structure.kohafield. Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Signed-off-by: Charles Farmer <charles.far...@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 25c5f3968fde4559898a8f7c6733afa534d3e08a Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Date: Mon Dec 11 09:39:37 2017 +0100 Bug 19790: Remove additionalauthors.author from installer files In the upgrade from 2.2 to 3.0 (some time ago already) the table additionalauthors has been dropped. Unfortunately, a reference to this table has not been removed from the MARC framework installer files. This patch clears kohafield for 700$a or 200$g in 32 installer files. Note: The reference to additionalauthors in field kohafield is silently ignored in AddBiblio/ModBiblio since the routines _koha_add_biblio, _koha_add_biblioitem, _koha_modify_biblio and _koha_modify_biblioitem_nonmarc simply do not use it. You can define a Koha to MARC mapping for a biblio/biblioitem field but if the field is not referenced in one of those routines, nothing happens.. Also note that C4::Items::_koha_modify_item does not hardcode all fields and will respond to a new item mapping. Test plan: [1] Run a new install or verify somehow that the change to these sql files is correct. The change is a result of: sed -i -e "s/'additionalauthors.author'/''/g" Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Run a new install with MARC21 and English. This includes the mandatory file marc21_framework_DEFAULT.sql. Verified that 700$a was inserted correctly (without additionalauthors). Signed-off-by: Charles Farmer <charles.far...@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit c15abaeda937fde619c79e7b437902994e2d7f9b Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Mon Feb 12 17:43:55 2018 -0300 Bug 18403: Fix POD for C4::Output::output_and_exit_if_error xt/author/podcorrectness.t C4/Output.pm (310): Expected text after =item, not a bullet Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 75c0481466f0b3887847e24a2069cd396d8f712c Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Mon Feb 12 17:35:53 2018 -0300 Bug 18403: Fix perlcritic on Koha::Patron Perl::Critic found these violations in "Koha/Patron.pm": "return" statement followed by "sort" at line 798, column 5. Behavior is undefined if called in scalar context. (Severity: 5) Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit a1686054ac3467bc1770de8f0f5485b208a49e6d Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Mon Feb 12 17:33:18 2018 -0300 Bug 18403: rename Koha::Patron->can to has_permission I do not exactly why but there is a conflict in the name of the method prove t/db_dependent/api/v1/patrons.t failed with [Mon Feb 12 17:13:16 2018] [error] Can't use string ("TO_JSON") as a HASH ref while "strict refs" in use at /home/vagrant/kohaclone/C4/Auth.pm line 2053. Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 5373bbaf5d1bdfcf997e0f9b2e67962c40374220 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Mon Feb 12 17:52:49 2018 -0300 Bug 20175: DBRev 17.12.00.013 Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit ffd7fa3a068ff60976b1cf6f94fd2a48ae2d619c Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Wed Feb 7 11:58:02 2018 -0300 Bug 20175: [sql_modes] (follow-up) Set a correct default value for club_enrollments.date_created From comment 6: """ Can't recreate database, when creating table structure, I got: there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause I am on mysql 5.5.59, which is still default in jessie, more timestamp columns are possible from mysql 5.6.5: https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-5.html """ Signed-off-by: Josef Moravec <josef.mora...@gmail.com> Signed-off-by: Julian Maurice <julian.maur...@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 5a43228c547200e4b6d9f03fe25e98d124889226 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Mon Feb 5 14:22:59 2018 -0300 Bug 20175: [sql_modes] Set a correct default value for club_enrollments.date_created 0000-00-00 00:00:00 is not a valid timestamp. It will fix the installer and upgrade process Signed-off-by: Josef Moravec <josef.mora...@gmail.com> Signed-off-by: Julian Maurice <julian.maur...@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 55af5cdc0052a7cbc10f12b1fffeec26f1e886d4 Author: Owen Leonard <oleon...@myacpl.org> Date: Wed Feb 7 17:23:56 2018 +0000 Bug 20155: (follow-up) Compiled CSS This patch contains the compiled opac.css file. Signed-off-by: Jon Knight <j.p.kni...@lboro.ac.uk> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit d83f0c1d8aa0da95c77d6d083f5bf2a702a56f66 Author: Owen Leonard <oleon...@myacpl.org> Date: Wed Feb 7 17:17:34 2018 +0000 Bug 20155: Improve readability of OPAC header language menu This patch makes some minor HTML and CSS changes in order to make the header's language-chooser menu more readable and consistent with the Lists menu. To test, apply this patch and the patch with the compiled CSS. - Install and enable more than one translation. - Set the OpacLangSelectorMode to either "top" or "both top and footer." - View the OPAC's header menu and confirm that the links and menus look correct whether or not a user is logged in. Signed-off-by: Jon Knight <j.p.kni...@lboro.ac.uk> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit ca161474f3f01e9b1b444a2bc21566de6e17afdb Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Date: Fri Feb 9 11:47:52 2018 +0100 Bug 19451: (QA follow-up) Replace weird subquery As requested, we add a JOIN and make the SELECT distinct. Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Tested that no-overwrite still works as expected. Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit e9f096fec335b9a1b453e4c56f30f8d9aa22652b Author: Josef Moravec <josef.mora...@gmail.com> Date: Wed Feb 7 21:06:10 2018 +0000 Bug 19451: (QA follow-up) Change parameter name no_overwrite to no-overwrite for consistency Signed-off-by: Josef Moravec <josef.mora...@gmail.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit bd4992749b75f2d8e57fe3ddce1eb9ff4b004fe1 Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Date: Thu Oct 12 12:19:11 2017 +0200 Bug 19451: Add no_overwrite option to borrowers-force-messaging-defaults.pl This option allows you to add preferences only when they are not yet present. In other words: skip patrons that already set their prefs. Test plan: [1] Delete all borrower messaging prefs for a patron. [2] Run borrowers-force-messaging-defaults.pl -no-overwrite -doit Verify that the patron now has default msg preferences. [3] Change his settings and make them non-default. For instance, increase days in advance. [4] Run borrowers-force-messaging-defaults.pl -no-overwrite -doit Verify that the patron still has the non-default settings. [5] Run borrowers-force-messaging-defaults.pl -doit Verify that the patron msg prefs have been overwritten. Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleon...@myacpl.org> Signed-off-by: Josef Moravec <josef.mora...@gmail.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 8070357a4070cbcfb6f854fa421b48482b1c0ab4 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Mon Feb 12 17:50:33 2018 -0300 Bug 15752: DBRev 17.12.00.012 Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 09a72046f4c6abc4826db3df5170be72cbb66c4e Author: Josef Moravec <josef.mora...@gmail.com> Date: Thu Dec 21 19:17:20 2017 +0000 Bug 15752: (QA follow-up) Remove unecessary redirect If the borrowernumber is defined in query, it starts to get information about previous borrower and the new one is taken into account fully on second page reload Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 3f0652056c55b49b712861adffee59ee6fd56119 Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> Date: Thu Dec 21 15:14:22 2017 -0300 Bug 15752: (QA follow-up) Remove unecessary redirect We are on circulation.pl, no need to redirect. Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 9fb4aa36c6dda1e206b0c28a4da554c225357305 Author: Josef Moravec <josef.mora...@gmail.com> Date: Fri Aug 18 10:58:51 2017 +0000 Bug 15752: (QA follow-up) Inform user that patron was automatically switched Test plan: 1) Start checking out to some patron - there should be no message about auto switching 2) read the another patrons card - note the patron is switched and there is a message about it at top of the main page content Followed test plan, patch worked as described. Passed QA test tool Signed-off-by: Alex Buckley <alexbuck...@catalyst.net.nz> Signed-off-by: Kyle M Hall <k...@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 88735fd8fef786ac10d167e1b027fa7ad9c75a9e Author: Josef Moravec <josef.mora...@gmail.com> Date: Fri Aug 18 12:20:40 2017 +0200 Bug 15752: (follow-up) Search for patrons only if param barcode is defined Signed-off-by: Alex Buckley <alexbuck...@catalyst.net.nz> Signed-off-by: Kyle M Hall <k...@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 4dea9b80f9b2bc38af42ed532297f2554dd10a0a Author: Chad Billman <c...@pennmanor.net> Date: Thu Jan 21 10:59:01 2016 -0500 Bug 15752: Automatically switch to patron when cardnumber is read during circulation With this syspref enabled scanning a patron barcode into the item barcode field during circulation will redirect you to the patron's circulation page. This allows circulation with only a barcode scanner. Testing: - Enable the AutoSwitchPatron syspref - Navigate to a patron's check out screen - Enter a patron barcode into the "Enter item barcode" field Result - Browser should be redirected to the entered patron Signed-off-by: Joel <alo...@live.fr> Followed test plan, patch works as described Signed-off-by: Alex Buckley <alexbuck...@catalyst.net.nz> Signed-off-by: Kyle M Hall <k...@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer...@web.de> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit 38e8b47e262cfe1c53770d91a6c700594b438e11 Author: Pasi Kallinen <pasi.kalli...@joensuu.fi> Date: Fri Feb 9 08:35:18 2018 +0200 Bug 20166: Untranslatable course reserves delete prompt Having a Template Toolkit statements inside the javascript translation function _() prevents it from being picked for translation. The only example of such is the course reserve delete prompt. Move the TT statement outside the string. Test plan: 1) Update and install language xx-YY. Check that the msgids "Are you sure you want to delete this course? There is %s attached item." and "Are you sure you want to delete this course? There are %s attached items." do not exist in the xx-YY-staff-prog.po 2) Check the translated file intranet-tmpl/prog/fi-FI/modules/course_reserves/course-details.tt It should have two prompt texts above in English 3) Install patch 4) Update the language. Check that the msgids show up in xx-YY-staff-prog.po, translate them, and install the language. 5) Repeat 2, the prompts should now show up in the correct language. 6) Enable UsecourseReserves 7) Go to Home -> Course reserves 8) Create a new course, and add reserves to it 9) See the course details. Click on Delete course, the prompt should be correctly translated 10) Remove all but one of the reserves from the course 11) Repeat 9 To see if there are other such TT statements: rgrep -E '\b_\("[^"]*\[%' koha-tmpl/ Signed-off-by: Pasi Kallinen <pasi.kalli...@joensuu.fi> Signed-off-by: Roch D'Amour <roch.dam...@inlibro.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> commit c2bfe53eea6c4e549f47ad060ff6b5f3aa04ea5d Author: Indranil Das Gupta (L2C2 Technologies) <indr...@l2c2.co.in> Date: Sun Jan 21 23:59:35 2018 +0530 Bug 20054: Remove attribute "text/css" for <style> element in OPAC Conformance rules for HTML5 is generating warnings for <style> element with type="text/css" attribute when the OPAC page is checked with W3C Validator. Test plan ========= 1/ Click the "Tag cloud" link on the OPAC. Paste the URL to your OPAC page (if it is hosted) to W3C Validator and watch the warning about type attribute "text/css". 2/ Apply patch and re-submit the page to the Validator. The warning will be gone. Signed-off-by: Owen Leonard <oleon...@myacpl.org> Signed-off-by: maksim <mak...@inlibro.com> Signed-off-by: Julian Maurice <julian.maur...@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/Output.pm | 2 +- Koha.pm | 2 +- Koha/Patron.pm | 9 +++--- Koha/Schema/Result/ClubEnrollment.pm | 10 +++--- circ/circulation.pl | 20 +++++++++--- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../Obligatoire/marc21_framework_DEFAULT.sql | 2 +- .../Optionnel/marc21_simple_bib_frameworks.sql | 16 +++++----- .../Obligatoire/framework_DEFAULT.sql | 10 +++--- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- installer/data/mysql/kohastructure.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +++++----- .../marcflavour/normarc/Obligatorisk/normarc.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +++++----- .../marc21_bibliographic_DEFAULT_general.sql | 2 +- .../optional/marc21_bibliographic_AR_general.sql | 2 +- .../optional/marc21_bibliographic_BKS_general.sql | 2 +- .../optional/marc21_bibliographic_CF_general.sql | 2 +- .../optional/marc21_bibliographic_IR_general.sql | 2 +- .../optional/marc21_bibliographic_KT_general.sql | 2 +- .../optional/marc21_bibliographic_SER_general.sql | 2 +- .../optional/marc21_bibliographic_SR_general.sql | 2 +- .../optional/marc21_bibliographic_VR_general.sql | 2 +- installer/data/mysql/sysprefs.sql | 1 + .../marc21_bibliographic_DEFAULT_general.sql | 2 +- .../optional/marc21_bibliographic_AR_general.sql | 2 +- .../optional/marc21_bibliographic_BKS_general.sql | 2 +- .../optional/marc21_bibliographic_CF_general.sql | 2 +- .../optional/marc21_bibliographic_IR_general.sql | 2 +- .../optional/marc21_bibliographic_KT_general.sql | 2 +- .../optional/marc21_bibliographic_SER_general.sql | 2 +- .../optional/marc21_bibliographic_SR_general.sql | 2 +- .../optional/marc21_bibliographic_VR_general.sql | 2 +- .../unimarc_bibliographic_DEFAULT_general.sql | 2 +- .../unimarc_bibliographic_BOOK_general.sql | 2 +- installer/data/mysql/updatedatabase.pl | 32 +++++++++++++++++++- .../en/modules/admin/preferences/circulation.pref | 7 +++++ .../prog/en/modules/circ/circulation.tt | 4 +++ .../en/modules/course_reserves/course-details.tt | 4 +-- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- .../bootstrap/en/includes/doc-head-close.inc | 4 +-- .../bootstrap/en/includes/masthead-langmenu.inc | 6 ++-- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 10 +++--- .../opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +- .../en/modules/opac-full-serial-issues.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-idref.tt | 2 +- .../bootstrap/en/modules/opac-imageviewer.tt | 2 +- .../bootstrap/en/modules/opac-readingrecord.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-review.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 2 +- .../bootstrap/en/modules/opac-topissues.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/sco/help.tt | 4 +-- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 +-- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 8 +++-- .../borrowers-force-messaging-defaults.pl | 27 ++++++++++++----- t/db_dependent/api/v1/patrons.t | 2 +- 61 files changed, 181 insertions(+), 111 deletions(-) hooks/post-receive -- main Koha release repository _______________________________________________ koha-commits mailing list koha-commits@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits