From gitmaster at git.koha-community.org Mon Apr 2 23:21:42 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Apr 2018 21:21:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1018-g92c1eb7 Message-ID: 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 92c1eb7db3d46c1495afd6181514be72bdb703c2 (commit) via a08ad004942a79b7781c2a5cabc21d6cb468006a (commit) via d2d16d6f850adf1e2b528f4ded6de174921b2a03 (commit) via 6ac49d9cdac831f6b72d675aa1436fd9e264be92 (commit) via 52f58f2ec0e9f0270c807cccd95749e853a8d64a (commit) via 2c2e29463a73fa1ece1808378013160347036143 (commit) via 0d255e42241008f028a55fec7eede0a61075c547 (commit) via 97a7420735a8304bc8dbb6e123461837da921870 (commit) via c7bde81dd8444dfe099d66d89731ef281744341f (commit) via 769ae66d5e0b50ba7d806e32ade347737b2a7ebc (commit) via 7b1dc1b6089c88755a66d2e23215a86622a82f0b (commit) via 2fff1c66a73161e9969ed4354e4824c589daf19e (commit) via 9b6e65d3fd28d78a3c0182ee50b6cf3dc6d3a7a2 (commit) via fc033fa03758b4a1a106b295bb0a0cab2fb00738 (commit) via 9a07da768c52c0f79130b465bc46a8578c80c487 (commit) via 2deaead2566a62ce7772cd15a5ffbeb6216a539a (commit) via d5afc40805cc8ede026fcb52629a183388bd25cd (commit) via d55a7eb316e699c32178cbde9d60b6005c4d3e98 (commit) via a251be4b80bda3392cde16826cc6c52ff421174e (commit) via adf1835890f5aba60c587c3e905bbd1e003a417c (commit) via e4cdd58b188e785a6d00cf3b7de0e9021d2489c6 (commit) via 83b364ec56ae94a077542691f790d6153d90c4d1 (commit) via 391bc7623c25c46111719e3988f110e2cc2174a9 (commit) via 9dcdd49b6b383730191334a01794f7b8318a537e (commit) via bba218444e9e475981670f1663d341204d1e67ce (commit) via 6ef1e5d4edff50afd571e7b3d9bfc7ab078e90bd (commit) via d22a1308d52fb55ebe280f545d1f3718aa16cbdf (commit) via 6560a9a706686d4a28d23f15d223bbc88c0b5c50 (commit) from 08039f41c196f9119e5ca82f762e5260d8c81a1a (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 92c1eb7db3d46c1495afd6181514be72bdb703c2 Author: Roch D'Amour Date: Thu Feb 22 16:08:59 2018 -0500 Bug 18820: Main block size now adjust to OpacNavRight like it would for opacuserlogin Test plans : - "beforepatch.png" shows the result you get when OpacNavRight and opacnav are set to false. - "opacuserlogin=f_opacnav=f.png" shows the result with the patch and OpacNavRight and opacnav set to false - "opacuserlogin=t_opacnav=f.png" shows the result with the patch and OpacNavRight set to true and opacnav set to false Applied patch, can confirm it functions as expected. Signed-off-by: Dilan Johnpull? Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit a08ad004942a79b7781c2a5cabc21d6cb468006a Author: Paudet Date: Mon Jun 19 09:27:15 2017 -0400 Bug 18820: Adding lines that check if opacuserlogin is enable and if OpacNav has content. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Dominic Pichette Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit d2d16d6f850adf1e2b528f4ded6de174921b2a03 Author: Tomas Cohen Arazi Date: Thu Mar 29 16:12:28 2018 -0300 Bug 20497: Access LibraryThing assets using HTTPS Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 6ac49d9cdac831f6b72d675aa1436fd9e264be92 Author: Owen Leonard Date: Tue Mar 27 16:46:16 2018 +0000 Bug 19892: (follow-up) Replace one more instance This patch replaces one more instance of [% IF ( numbersphr ) %]. To test, apply the patch and view the source of the OPAC home page. With the OPACNumbersPreferPhrase system preference set to 'use,' you should find this in the HTML source: With the preference set to 'don't use,' you should find this: Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 52f58f2ec0e9f0270c807cccd95749e853a8d64a Author: Charlotte Cordwell Date: Thu Jan 18 01:29:05 2018 +0000 Bug 19892: Replace numbersphr variable with Koha.Preference('OPACNumbersPreferPhrase') in OPAC Test Case 1) Check that the following files have been changed properly. opac/opac-search.pl opac/opac-main.pl koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt 2)Apply bug 3) Check that there are no differences in behaviour as a result of the patch. Signed-off-by: Roch D'Amour Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 2c2e29463a73fa1ece1808378013160347036143 Author: Jonathan Druart Date: Mon Apr 2 18:05:39 2018 -0300 Bug 20291: DBRev 17.12.00.025 Signed-off-by: Jonathan Druart commit 0d255e42241008f028a55fec7eede0a61075c547 Author: Nick Clemens Date: Thu Mar 29 10:14:59 2018 +0000 Bug 20291: (follow-up) Rename NoLoginInstructions to OpacLoginInstructions Signed-off-by: Jonathan Druart commit 97a7420735a8304bc8dbb6e123461837da921870 Author: Nick Clemens Date: Tue Feb 27 10:45:46 2018 +0000 Bug 20291: (follow-up) Add sysprefs.sql changes Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit c7bde81dd8444dfe099d66d89731ef281744341f Author: Nick Clemens Date: Wed Feb 21 04:56:23 2018 +0000 Bug 20291: Add a StaffLoginInstructions preference for adding text to staff client login To test: 1 - Apply patches 2 - Upgrade database 3 - Check the staff client login page, should be no change 4 - Add something to the preferene 5 - It should appear on the login page Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 769ae66d5e0b50ba7d806e32ade347737b2a7ebc Author: Nick Clemens Date: Thu Mar 29 13:00:36 2018 +0000 Bug 20052: (follow-up) Fix QA tool complaints and bad copy Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 7b1dc1b6089c88755a66d2e23215a86622a82f0b Author: Nick Clemens Date: Mon Jan 15 14:38:13 2018 +0000 Bug 20052: Add Koha Reports object class To test: prove -v t/db_dependent/Koha/Reports.t Signed-off-by: Claire Gravely Signed-off-by: Maksim Sen Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 2fff1c66a73161e9969ed4354e4824c589daf19e Author: Kyle M Hall Date: Wed Mar 28 19:58:37 2018 +0000 Bug 18382: (QA follow-up) Make new unit test pass Signed-off-by: Jonathan Druart commit 9b6e65d3fd28d78a3c0182ee50b6cf3dc6d3a7a2 Author: Jonathan Druart Date: Tue Mar 27 14:09:54 2018 -0300 Bug 18382: Add a test This is what I am expecting but I may be wrong. Signed-off-by: Jonathan Druart commit fc033fa03758b4a1a106b295bb0a0cab2fb00738 Author: Kyle M Hall Date: Tue Mar 27 10:45:09 2018 -0400 Bug 18382: (QA follow-up) Don't set suspend_until if dt if undefined Signed-off-by: Jonathan Druart commit 9a07da768c52c0f79130b465bc46a8578c80c487 Author: Marcel de Rooy Date: Thu Mar 22 09:17:46 2018 +0100 Bug 18382: (QA follow-up) Replace ->ymd by ->datetime The first patch makes Hold.t fail on: not ok 8 - Hold is suspended with a date, truncation takes place automatically Failed test 'Hold is suspended with a date, truncation takes place automatically' at Hold.t line 94. got: '2018-03-22' expected: '2018-03-22T00:00:00' We could remove the midnight time there, but we also could replace ymd by datetime. The cpan doc tells us: Same as $dt->ymd('-') . 'T' . $dt->hms(':') Test plan: With this patch, run Hold.t again. It should pass now. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 2deaead2566a62ce7772cd15a5ffbeb6216a539a Author: Kyle M Hall Date: Mon Jun 5 10:46:45 2017 -0400 Bug 18382: action_logs entry for module HOLDS, action SUSPEND is spammy When a hold is suspended, 'suspend_until' is represented as a DateTime object, complete with locale. All told, this is about 800 lines of text. Test Plan: 1) Enable the HoldsLog syspref 2) Add a hold on a record/item 3) Suspend the hold with a date to resume 4) Note the massive amount of date in the suspend_until field 5) Apply this patch 6) Suspend another hold with a date to resume 7) Note the log has an acutal date in the suspend_until field Check the logs using module 'Holds' and Action 'Suspend' Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit d5afc40805cc8ede026fcb52629a183388bd25cd Author: Nick Clemens Date: Thu Mar 29 12:33:56 2018 +0000 Bug 20494: Remove unused code in neworderempty.pl and addbiblio.pl Should be sufficient to read code and see all lines were commented and that this patch removes useless lines To be thorough, ensure that your can add an order to a basket and add a biblio. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit d55a7eb316e699c32178cbde9d60b6005c4d3e98 Author: Jonathan Druart Date: Wed Jul 19 20:29:26 2017 -0300 Bug 18979: Speed up 'valid-templates.t' tests Test plan: Confirm than prove xt/author/valid-templates.t is quicker with this patch. Before I got: Files=1, Tests=840, 21 wallclock secs ( 0.18 usr 0.02 sys + 20.28 cusr 0.32 csys = 20.80 CPU) After: Files=1, Tests=840, 17 wallclock secs ( 0.06 usr 0.01 sys + 21.56 cusr 0.48 csys = 22.11 CPU) Signed-off-by: David Bourgault Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit a251be4b80bda3392cde16826cc6c52ff421174e Author: Nick Clemens Date: Fri Feb 23 10:58:27 2018 +0000 Bug 20282: Match course reserve on holdingbranch To test: 1 - Add a course (Course Reserves) 2 - Add an item to the course 3 - Ensure to change the holding branch for the course reserve 4 - Modify the course item 5 - Note the dropdwn for holding branch is unset 6 - Apply patch 7 - Modify the course item 8 - Dropdown should be correctly populated Signed-off-by: Maksim Sen Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit adf1835890f5aba60c587c3e905bbd1e003a417c Author: Kyle M Hall Date: Mon Mar 12 07:15:12 2018 -0400 Bug 20369: Analytics search is broken with QueryAutoTruncate set to 'only if * is added' Test Plan: 1) Enable EasyAnalytics 2) Disable QueryAutoTruncate 3) Create an analytic record, add some host items to it 4) Browser to the analytics tab for the record 5) Click the link in the 'used in' column of the table 6) No search results 7) Apply this patch 8) Reload the page, now you get the analytic record! Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit e4cdd58b188e785a6d00cf3b7de0e9021d2489c6 Author: Josef Moravec Date: Wed Jan 3 11:20:46 2018 +0000 Bug 19907: Fix email validation in patron edit form Test plan: 0) Confirm that email validation is not working in add/edit patron form 1) Apply the patch 2) Edit/add patron, the e-mail validation should be working now 3) Ensure the password validation is still working (use test plan from bug 19908) Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 83b364ec56ae94a077542691f790d6153d90c4d1 Author: Jonathan Druart Date: Mon Mar 26 12:22:15 2018 -0300 Bug 20462: Ensure batch item deletion will not delete the same item twice This has been done on bug 9509 when barcodes are scaned, but not when using a text file. Test plan (stolen from Barton on the bug report): 1) Create a text file containing duplicate barcodes Here's a quick way to do that, substitute INSTANCE for the instance name of your test server: sudo koha-mysql INSTANCE <<< "select barcode from items where barcode is not null limit 3" | sed '1d;p' > /tmp/dup_barcodes.txt 2) Go to Home ? Tools ? Batch item deletion 3) Click 'Choose File', select the file you created in step 1. 4) Click 'Continue' 5) Note that duplicate items appear in the list of items to batch delete 6) Check 'Delete records if no items remain' 7) This will trigger a software error Note that entering the barcodes via the 'scan items one by one' text box removes duplicates in the list, so this only causes problems when uploading a file. Signed-off-by: Mark Tompsett Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 391bc7623c25c46111719e3988f110e2cc2174a9 Author: Jonathan Druart Date: Mon Apr 2 14:30:23 2018 -0300 Bug 20318: Add class 'required' to the label Signed-off-by: Jonathan Druart commit 9dcdd49b6b383730191334a01794f7b8318a537e Author: Christophe Croullebois Date: Wed Mar 14 14:28:28 2018 +0000 Bug 20318: Merge invoices can lead to an merged invoice without Invoice number When you want to merge invoices you have a page with a non editable field 'Invoice number:' it shows the content of the first invoice to be merged. But if you validate by clicking the 'merge' button you arrive on the next page which says that 'Invoice has been modified' and if you quit this page without saving you have now a merged invoice without Invoice number. This tiny patch just prevents this issue to occur. Test plan : 1? go to the acqui/invoices.pl page and search invoices to merge. You must have at least 2 invoices on the same vendor 2? check boxes to select invoices to merge and click on 'merge selected invoices' button 3? next page you see the non editable field 'Invoice number:' 4? click on the 'merge' button 5? next page you see 'Invoice has been modified' 6? leave this page i.e click on the left link 'Invoices' 7? search invoices you'll see the merged invoice without invoice number. Apply the patch, replay the steps 1 to 3 4? on this page you can enter your invoice number and click on the 'merge' button. If you leave this field empty and click merge, a message informs you that it is required and you can not merge. Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit bba218444e9e475981670f1663d341204d1e67ce Author: Kyle M Hall Date: Fri Mar 30 07:08:30 2018 -0400 Bug 18474: (QA follow-up) Remove useless else in template Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 6ef1e5d4edff50afd571e7b3d9bfc7ab078e90bd Author: Jonathan Druart Date: Thu Dec 21 15:59:24 2017 -0300 Bug 18474: Restore multiple holds when patron is searched for We lost the ability to place multiple holds when we are searching for patrons. The multi_holds parameter is lost and not handled correctly in the template. Test plan: - Make sure you can place multiple holds for a patron you will search for - Same for simple hold TODO the multiple holds view should not be displayed if only 1 record has been selected from the search result. Signed-off-by: claude brayer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit d22a1308d52fb55ebe280f545d1f3718aa16cbdf Author: Nick Clemens Date: Fri Mar 23 17:12:13 2018 +0000 Bug 20385: (follow-up) Assign blank instead of inappropraite value Signed-off-by: Alex Arnaud Signed-off-by: Jonathan Druart commit 6560a9a706686d4a28d23f15d223bbc88c0b5c50 Author: Nick Clemens Date: Tue Mar 13 14:57:47 2018 +0000 Bug 20385: Don't try to get info for bad authtypecodes TO test: 0 - Have a koha with ES enabled and some auth records 1 - backup your db 2 - sudo koha-mysql <> 3 - UPDATE auth_types SET authtypecode="PERSO_NAMB" WHERE authtypecode="PERSO_NAME" (or adjust as necessary) 4 - Search for some authorities where a PERSO_NAME record will be returned 5 - KA_BOOM! 6 - Apply patch 7 - Results are returned, they do not display a code, viewing record you won't see code Signed-off-by: Nicolas Legrand Signed-off-by: Alex Arnaud Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 2 +- Koha.pm | 2 +- Koha/Hold.pm | 5 ++-- Koha/{ClassSource.pm => Report.pm} | 6 ++-- Koha/{ClassSources.pm => Reports.pm} | 12 ++++---- Koha/SearchEngine/Elasticsearch/Search.pm | 8 ++---- acqui/neworderempty.pl | 6 ---- cataloguing/addbiblio.pl | 6 ---- installer/data/mysql/sysprefs.sql | 3 +- installer/data/mysql/updatedatabase.pl | 16 +++++++++++ .../en/includes/circ-patron-search-results.inc | 13 ++++++--- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../prog/en/modules/acqui/invoices.tt | 8 ++++-- .../admin/preferences/enhanced_content.pref | 2 +- .../prog/en/modules/admin/preferences/opac.pref | 2 +- .../en/modules/admin/preferences/staff_client.pref | 5 ++++ koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 1 + .../en/modules/course_reserves/add_items-step2.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 12 -------- .../prog/en/modules/reserve/request.tt | 5 ++++ koha-tmpl/intranet-tmpl/prog/js/members.js | 7 +++++ .../opac-tmpl/bootstrap/en/includes/masthead.inc | 8 +++--- .../bootstrap/en/modules/opac-advsearch.tt | 4 +-- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 6 ++-- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 24 ++++------------ .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 12 +++++--- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +--- opac/opac-main.pl | 4 --- opac/opac-search.pl | 3 -- reserve/request.pl | 11 +++---- t/db_dependent/Hold.t | 5 +++- .../Koha/{Acquisition/Funds.t => Reports.t} | 30 +++++++++++--------- tools/batchMod.pl | 1 + xt/author/valid-templates.t | 17 +++++++++++ 34 files changed, 135 insertions(+), 121 deletions(-) copy Koha/{ClassSource.pm => Report.pm} (89%) copy Koha/{ClassSources.pm => Reports.pm} (81%) copy t/db_dependent/Koha/{Acquisition/Funds.t => Reports.t} (51%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 3 16:55:49 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Apr 2018 14:55:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1039-g8538886 Message-ID: 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 8538886cb91f977d6109bfd035d4d8348ad108dc (commit) via 6e32e62d46d5fae8806a41eadaec701531913764 (commit) via bfdd5150c1e01f7167bb1702cebba218dfeec38e (commit) via bc001c2352fee419a2bbe20c0cf707afd9e5bd78 (commit) via 509892fd00cf6b7a5d65e2aef9d615bf35806cbe (commit) via a53471e8bbf4dcb071fabc956fa41c467c4c8c88 (commit) via 83082242a50c1f33f11080e47e51d0cdcf961939 (commit) via 0161a106e757627d95043401c29c6ab10faa6bdb (commit) via 0b4e3dd343b8757e402a943fdb6c4d349f9b1e10 (commit) via 3c4677efc765979643315c238c405843fe9be654 (commit) via 0265c4ae29f860f36baccc9b09537b3cc0368274 (commit) via 52af054b6091ee3256f3d87f58ab8e2d29134c32 (commit) via 98d0c990bf33bbe8ce76126181f64f078087fa45 (commit) via ac7ea9e10e8db92c91e9e436a7f32af2f8623782 (commit) via d4b680155247ef0289e8728a7416a734410c12f6 (commit) via 0f907342c88e318ee6e774f8c085370681bc1af8 (commit) via 94e3caf32b481e557351eadf1c0657c6b9ad5dd0 (commit) via b5bbda68fa7d73469f625d40ccee346f48db40bd (commit) via 28c39d5c8642d167b66446ab36dedc447dc076c9 (commit) via 6e9ed1a823c6ed9bf9c5f0b57e9c4185b67c0cf3 (commit) via 39c2a696b007097bdc286f166c62902c90b14cf3 (commit) from 92c1eb7db3d46c1495afd6181514be72bdb703c2 (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 8538886cb91f977d6109bfd035d4d8348ad108dc Author: Jonathan Druart Date: Tue Apr 3 09:52:57 2018 -0300 Bug 19935: (follow-up) Replace GetPendingIssues - opac-user.pl Syntax issue, can be squashed on pushing. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 6e32e62d46d5fae8806a41eadaec701531913764 Author: Jonathan Druart Date: Tue Apr 3 09:49:54 2018 -0300 Bug 19935: Use ->checkouts when ->pending_checkouts->count was used Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit bfdd5150c1e01f7167bb1702cebba218dfeec38e Author: Jonathan Druart Date: Mon Jan 8 12:32:55 2018 -0300 Bug 19935: Replace GetPendingIssues - Remove the residue Here we are, no more occurrences of GetPendingIssues, we can remove the tests and subroutine \o/ Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit bc001c2352fee419a2bbe20c0cf707afd9e5bd78 Author: Jonathan Druart Date: Mon Jan 8 12:23:42 2018 -0300 Bug 19935: Replace GetPendingIssues - SIP Sounds like we do not need related fields or 'overdue' flag here. No idea how to confirm there is no regression here. Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 509892fd00cf6b7a5d65e2aef9d615bf35806cbe Author: Jonathan Druart Date: Mon Jan 8 12:06:59 2018 -0300 Bug 19935: Replace GetPendingIssues - sco-main Same as previously, we do not need all the prefetched values here, just a few. Test plan: Use the self checkout module to check some items out Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit a53471e8bbf4dcb071fabc956fa41c467c4c8c88 Author: Jonathan Druart Date: Mon Jan 8 11:59:29 2018 -0300 Bug 19935: Replace GetPendingIssues - opac-user.pl At first glance we just need the biblio title and the subtitle (in addition of the fines info), we should not need the prefetch. Test plan: Loggin at the OPAC, on the summary page you should see your checkouts and overdues with the correct values Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 83082242a50c1f33f11080e47e51d0cdcf961939 Author: Jonathan Druart Date: Mon Jan 8 11:47:46 2018 -0300 Bug 19935: Replace GetPendingIssues - opac-ics.pl We only need the biblio title and the barcode, we should not need the whole prefetch. Test plan: On your OPAC summary page export your checkout list using the "Download as iCal/.ics file" link. Before and after the patchset, the generated files must be the same Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 0161a106e757627d95043401c29c6ab10faa6bdb Author: Jonathan Druart Date: Mon Jan 8 11:40:10 2018 -0300 Bug 19935: Replace GetPendingIssues - summary-print We are in the notices part, so we need to fetch all the data to avoid regressions. Test plan: Print a summary slip before and after this patch. They must be the same Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 0b4e3dd343b8757e402a943fdb6c4d349f9b1e10 Author: Jonathan Druart Date: Mon Jan 8 11:16:09 2018 -0300 Bug 19935: Replace GetPendingIssues - deletemem.pl Same as previously, we just want Koha::Patron->checkouts->count to know if a patron has checkouts. Test plan: Confirm that you cannot delete a patron's card if they have pending checkouts Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 3c4677efc765979643315c238c405843fe9be654 Author: Jonathan Druart Date: Mon Jan 8 11:15:02 2018 -0300 Bug 19935: Replace GetPendingIssues - Discharges We should actually use Koha::Patron->checkouts here to avoid the prefetch. Test plan: A patron with checkouts cannot get a discharge Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 0265c4ae29f860f36baccc9b09537b3cc0368274 Author: Jonathan Druart Date: Mon Jan 8 11:10:50 2018 -0300 Bug 19935: Replace GetPendingIssues - ILSDI Here we should only access to what we want in the template, but let do it as it for now. Test plan: Hit /cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=542&show_contact=0&show_loans=1 With 42 a borrowernumber with checkouts Before and after these patches the XML must be the same Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 52af054b6091ee3256f3d87f58ab8e2d29134c32 Author: Jonathan Druart Date: Mon Jan 8 15:49:18 2018 -0300 Bug 19935: Replace GetPendingIssues - IssueSlip Luckily we have a good test coverage here! Test plan: Print issue slips before and after these patches (with overdues, etc.) They should be the same. Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 98d0c990bf33bbe8ce76126181f64f078087fa45 Author: Jonathan Druart Date: Mon Jan 8 15:49:03 2018 -0300 Bug 19935: Add Koha::Patron->pending_checkouts To move this subroutine out of the C4 namespace we face the same problematic as bug 17553 (with GetOverduesForPatron). We need to provide an equivalent method and so return all the related value for a given checkout. We can acchieve the easily using Koha::Object->unblessed_all_relateds, but we need to keep in mind that it is a temporary move. Indeed we will want to use our API to only access/retrive values we really need. The whole trick could be removed when the current syntax for notices will be deprecated and removed. Note: this method returns the same number of elements than ->checkouts They indeed returns the same things, but it sounds better to me to have a different method to highlight (from the callers) where does it come from (C4::Members::GetPendingIssues). Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit ac7ea9e10e8db92c91e9e436a7f32af2f8623782 Author: Josef Moravec Date: Tue Apr 3 12:28:21 2018 +0000 Bug 17553: (follow-up) Adjust number of tests Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit d4b680155247ef0289e8728a7416a734410c12f6 Author: Jonathan Druart Date: Mon Jan 8 13:19:51 2018 -0300 Bug 17553: Move GetOverduesForPatron to Koha::Patron->get_overdues With the help of Koha::Object->unblessed_all_relateds we are going to replace GetOverduesForPatron without introducing regressions (hopefully) on both template notice syntaxes. Test plan: 0/ Do not apply any patches 1/ Check some items in to a given patron, with and without overdues. 2/ Print the overdues slip (Circulation module > Print > Print overdues) 3/ Apply these patches 4/ Print again and compare the result => The 2 generated slips must be exactly the same Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 0f907342c88e318ee6e774f8c085370681bc1af8 Author: Jonathan Druart Date: Fri Nov 4 10:23:56 2016 +0000 Bug 17553: Move existing tests Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 94e3caf32b481e557351eadf1c0657c6b9ad5dd0 Author: Jonathan Druart Date: Mon Jan 8 13:48:28 2018 -0300 Bug 19926: Add tests for Koha::Object->unblessed_all_relateds Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit b5bbda68fa7d73469f625d40ccee346f48db40bd Author: Jonathan Druart Date: Mon Jan 8 13:19:16 2018 -0300 Bug 19926: Add the Koha::Object->unblessed_all_relateds method In order to refactor our legacy code step-by-step, we will need to provide code with the exact same behaviors and then improve it. The same idea appears for the TT syntax for notices: we will want to deprecate the existing syntax in order to support only one syntax. Currently we fetch all the values from the related tables, without knowing which are actually used. I am suggestion to introduce a Koha::Object->unblessed_all_relateds method which will return a hash containing all the fields from the related tables (with the problems we know: collision in column names). It is the existing behavior of GetOverduesForPatron and GetPendingIssues for instance, they are used to send notices and so we have to provide all the data needed. See dependent bugs to understand the context and test this patch. Signed-off-by: Benjamin Rokseth Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 28c39d5c8642d167b66446ab36dedc447dc076c9 Author: Jonathan Druart Date: Tue Apr 3 11:21:28 2018 -0300 Bug 7143: Update about page for new dev - Roch D'Amour Signed-off-by: Jonathan Druart commit 6e9ed1a823c6ed9bf9c5f0b57e9c4185b67c0cf3 Author: Jonathan Druart Date: Tue Apr 3 11:18:08 2018 -0300 Bug 7143: Update about page for new dev - Philippe Audet-Fortin Signed-off-by: Jonathan Druart commit 39c2a696b007097bdc286f166c62902c90b14cf3 Author: Jonathan Druart Date: Tue Apr 3 11:16:53 2018 -0300 Bug 7143: Update about page for new releases Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/ILSDI/Services.pm | 12 +- C4/Members.pm | 205 ++++++-------------- C4/SIP/ILS/Patron.pm | 2 +- Koha/Object.pm | 45 ++++- Koha/Patron.pm | 31 +++ Koha/Patron/Discharge.pm | 13 +- docs/history.txt | 9 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 + .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 +- members/deletemem.pl | 4 +- members/print_overdues.pl | 5 +- members/summary-print.pl | 31 ++- opac/opac-ics.pl | 8 +- opac/opac-user.pl | 9 +- opac/sco/sco-main.pl | 21 +- t/db_dependent/Koha/Object.t | 58 +++++- t/db_dependent/Koha/Patrons.t | 84 +++++++- t/db_dependent/Members/GetOverdues.t | 80 -------- t/db_dependent/Members/GetPendingIssues.t | 130 ------------- 19 files changed, 337 insertions(+), 418 deletions(-) delete mode 100644 t/db_dependent/Members/GetOverdues.t delete mode 100644 t/db_dependent/Members/GetPendingIssues.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 4 21:16:20 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 04 Apr 2018 19:16:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1055-gc3f9b75 Message-ID: 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 c3f9b750e22b87f6f699bf608cc90fa91cd1ef58 (commit) via 18e02913a0eaf0b94421027dbcfc0965499b15a8 (commit) via 36db911da09f83131f82db6f8ed50ec1ad2f0029 (commit) via 65b71667c0bdef7e4fb04e4a747c99af2bcf2e5d (commit) via 6611ad4f05f8b236842940189ecd5ded88dc3d85 (commit) via e2214f2b256e0a44e0936d3eb8e87ac02b40917e (commit) via 195f5404e4fc665f95e3f686494e7e0f298e27e1 (commit) via 4376db33b5acbc49ebdfe3e98afa9f1126634934 (commit) via d407221be6ec07b8323935370fe07b5ff4dc9d80 (commit) via 32c562bbe0383fe50a65aed7a18f82336e6d53c7 (commit) via c45246053639c216b598385a2f89cf723277a3c5 (commit) via b1f2c84e5078c2aa77e428ca359aef4df952944a (commit) via 9a76781f9ef0ba997fdaf79d78648a6c41827f03 (commit) via f8ce3d88b18ece5c04fbe923a37ce7a9aa715c3c (commit) via 0ab51a509a2a9d0ced3b2ccd9ff154f670f27560 (commit) via 1c4ac7dac8b8dece9afd2330077aeda82dddc1c1 (commit) from 8538886cb91f977d6109bfd035d4d8348ad108dc (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 c3f9b750e22b87f6f699bf608cc90fa91cd1ef58 Author: Victor Grousset Date: Fri Jan 5 15:03:38 2018 +0100 Bug 19953: Record page: acquisition details: add column for invoice Test plan: 1. create a vendor with minimal info 2. create a basket with minimal info 3. add a item to the basket 4. close the basket 5. receive a shipment 6. on the "receipt summary" click on "receive" for the wanted item (it should be the only one) 7. items ? receive? ? tick this checkbox 8. save 9. click on "finish receiving" 10. go to the record ? Acquisition details 11. apply this patch 12. refresh the page 13. you should see the new column Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 18e02913a0eaf0b94421027dbcfc0965499b15a8 Author: Jesse Weaver Date: Mon Jul 18 16:31:20 2016 -0600 Bug 19267: Rancor - Warn before leaving page if record modified To test: 1 - Open the advanced editor 2 - Make some changes to a record 3 - Click on 'Patrons' or leave the page in some way 4 - Note there is no warning and changes are not saved 5 - Apply patch 6 - Open the advanced editor 7 - Make some changes 8 - Leave the page 9 - Note you get a warning of unsaved changes and can stay on the page Signed-off-by: Charles Farmer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 36db911da09f83131f82db6f8ed50ec1ad2f0029 Author: Kyle M Hall Date: Thu Dec 14 07:03:39 2017 -0500 Bug 19812: Fix confusing holds count values in "Already received" table In acqui/parcel.pl both the "Pending orders" and "Already received" tables show how many holds there are for the given record. However, the count of holds in the "Pending orders" table confuses librarians because it only lists holds for the particular items in the orderline. Due to that, the holds column may show 0 holds even if there are a dozen record level holds for that bib! This is not what librarians seem to expect, instead it seems that the same total holds in the "Pending orders" table would be preferred. Test Plan: 1) Find an invoice with an item in the "Already received" table 2) Add one or more record level holds to the record 3) Note the holds column does not count those holds 4) Apply this patch 5) Note the holds column now shows total holds and holds for just those ordered items Signed-off-by: Kyle M Hall Signed-off-by: Nancy Keener Signed-off-by: Marcel de Rooy Bug 19812: (QA follow-up) Swap sides for total and item holds Bug 19812: (QA follow-up) If 0 holds show '0' not '0 / 0' Bug 19812: (QA follow-up) Remove unnecessary line Signed-off-by: Jonathan Druart commit 65b71667c0bdef7e4fb04e4a747c99af2bcf2e5d Author: Jonathan Druart Date: Wed Apr 4 15:54:58 2018 -0300 Bug 19910: Use span to make translators happy Signed-off-by: Jonathan Druart commit 6611ad4f05f8b236842940189ecd5ded88dc3d85 Author: Nick Clemens Date: Wed Jan 3 14:07:17 2018 +0000 Bug 19910: Use the delimiter syspref to name download link To test: 1 - Set delimiter syspref to anything but comma 2 - Download report results as comma separated text 3 - They actually follow the syspref 4 - Apply patch 5 - Download link should now match pref selection 6 - Change pref, note link changes 7 - Verify things still work as expected Signed-off-by: Owen Leonard Signed-off-by: Victor Grousset Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit e2214f2b256e0a44e0936d3eb8e87ac02b40917e Author: Kyle M Hall Date: Wed Jan 17 14:30:06 2018 -0500 Bug 20008: Fix restrictions added from memberentry.pl if TimeFormat is 12hr Test Plan: 1) Set TimeFormat to 12 hour 2) Add a restriction with an expiration date via memberentry.pl 3) Note the restriction exists, but has no expiration date 4) Apply this patch 5) Repeat step 2 6) Note the restriction exists and has an expiration date! Signed-off-by: Roch D'Amour Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 195f5404e4fc665f95e3f686494e7e0f298e27e1 Author: Jonathan Druart Date: Thu Mar 29 12:14:11 2018 -0300 Bug 20115: Add information about this feature in the pref descriptions I guess a native English speaker will have a better wording :) Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 4376db33b5acbc49ebdfe3e98afa9f1126634934 Author: Jonathan Druart Date: Thu Feb 15 11:42:22 2018 -0300 Bug 20115: Remove sort on rfc4646_subtag in OPAC templates Signed-off-by: Jesse Maseto Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit d407221be6ec07b8323935370fe07b5ff4dc9d80 Author: Jonathan Druart Date: Wed Jan 31 14:06:23 2018 -0300 Bug 20115: Trigger "modified" when sort is changed Signed-off-by: Jesse Maseto Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 32c562bbe0383fe50a65aed7a18f82336e6d53c7 Author: Jonathan Druart Date: Wed Jan 31 13:47:46 2018 -0300 Bug 20115: Make the prefs sortable If we depend on the order, we should make it sortable. I let the customization to someone else (we would need an icon to tell the user it's sortable). Something does not work here: If fr-FR and fr-CA is installed, but only 1 is ticked, it will be considered as last. I do not think it's a blocker as it does not make really make sense to have it installed but not used (the interface is also weird, there is a dropdown list with only 1 entry) Signed-off-by: Jesse Maseto Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit c45246053639c216b598385a2f89cf723277a3c5 Author: Jonathan Druart Date: Wed Jan 31 13:47:37 2018 -0300 Bug 20115: Set the languages order with the pref values To avoid the languages to be ordered randomly, it is better to stick on a default order. Let's suppose that the order in the pref is correct. Signed-off-by: Jesse Maseto Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit b1f2c84e5078c2aa77e428ca359aef4df952944a Author: Jonathan Druart Date: Mon Nov 6 15:35:50 2017 -0300 Bug 19578: Remove MARC punctuation in notices (TT syntax) Jenkins fails (run 287) on a test in t/db_dependent/Letters/TemplateToolkit.t: With the historical syntax: # Your request for an article from tQYRS (c3Av58O0P5xkkIGu) has been canceled for the following reason: With the TT syntax: # Your request for an article from tQYRS_ (c3Av58O0P5xkkIGu) has been canceled for the following reason: The last character of the biblio's title has been removed because it's a punctuation character. It comes from: C4::Letters::_parseletter 893 $val =~ s/\p{P}$// if $val && $table=~/biblio/; The same replacement is done for patron's attributes too. Test plan: - Confirm that the new tests pass. That should be enough to confirm this change make sense. Test plan (manual): - Create a biblio with a title ending with a punctuation (like "with_punctuation_"), or any other fields of biblio/biblioitem - Generate a notice which will display this field (CHECKIN for instance) Use the historical syntax and the TT syntax, both should display the title without the punctuation character at the end CHECKIN historical: The following items have been checked in: ---- <> ---- CHECKIN TT syntax: The following items have been checked in: ---- [% biblio.title %] ---- Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 9a76781f9ef0ba997fdaf79d78648a6c41827f03 Author: Mark Tompsett Date: Tue Jan 30 22:35:39 2018 +0000 Bug 20083: (follow-up) use same logic in opac-showmarc It was correctly pointed out that opac-showmarc would leak the same way as catalogue/showmarc.pl, and so this patch moves the authentication step up to the top where it should be so as to prevent inappropriate data leaks. TEST PLAN --------- 1) Set your OpacPublic system preference to Disabled 2) Open your OPAC and login 3) Find a biblio with items 4) Go to the opac details, particularly MARC view. 5) Copy the "view plain" shortcut link. 6) log out. 7) Paste the link into the address bar. -- the information will leak! 8) apply the patch 9) restart_all 10) Refresh the OPAC link -- log in screen will appear. 11) run koha qa test tools Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit f8ce3d88b18ece5c04fbe923a37ce7a9aa715c3c Author: Andreas Roussos Date: Fri Jan 26 14:12:47 2018 +1300 Bug 20083: Information disclosure when (mis)using the MARC Preview feature The MARC Preview feature in the Staff client (catalogue/showmarc.pl) does not check whether a user is logged in or not. As a consequence, it can be used to obtain information that would normally be available to logged-in users only. For example, you can view any bibliographic record by passing a value to the 'id' argument, but you can also view records as they were imported (normally done via the 'Staged MARC management' tool). All three 17.11 installations currently listed at https://wiki.koha-community.org/wiki/Koha_Demo_Installations are affected by this issue, as demonstrated by the URLs below: http://koha.adminkuhn.ch:8080/cgi-bin/koha/catalogue/showmarc.pl?importid=1&viewas=html http://pro.demo1711-koha.test.biblibre.eu/cgi-bin/koha/catalogue/showmarc.pl?id=1000&viewas=html https://staff-kohademo.equinoxinitiative.org/cgi-bin/koha/catalogue/showmarc.pl?id=1&viewas=html It should be noted that this only applies to XSLT-enabled installations. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 0ab51a509a2a9d0ced3b2ccd9ff154f670f27560 Author: Tomas Cohen Arazi Date: Tue Mar 27 15:56:57 2018 -0300 Bug 19223: Add methods to correctly handle plugin-generated output This patch introduces two methods to be used by plugin authors: ->output ->output_html They are basically wrappers for the helper methods from C4::Output (output_html_with_http_headers and output_with_http_headers). Plugin authors can use them, or keep the current flexibility of handling the headers themselves in their code. The KitchenSink plugin should be updated to highlight this. To test: - Run: $ kshell k$ prove t/db_dependent/Plugins.t => FAIL: The methods are not implemented - Apply this patch - Run: k$ prove t/db_dependent/Plugins.t => SUCCESS: Tests pass, and they are meaningful - Sign off :-D Sponsored-by: ByWater Solutions Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 1c4ac7dac8b8dece9afd2330077aeda82dddc1c1 Author: Tomas Cohen Arazi Date: Tue Mar 27 15:56:41 2018 -0300 Bug 19223: Unit tests for output and output_html methods Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Languages.pm | 12 +++++- C4/Letters.pm | 26 +++++++++++- Koha/Plugins/Base.pm | 43 +++++++++++++++++++- .../Template/Plugin/Remove_MARC_punctuation.pm | 22 +++++----- acqui/parcel.pl | 4 +- catalogue/showmarc.pl | 21 +++++----- .../prog/en/includes/cateditor-ui.inc | 7 ++++ .../prog/en/includes/delimiter_text.inc | 8 ++++ .../prog/en/includes/reports-toolbar.inc | 3 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 12 ++++-- .../prog/en/modules/admin/preferences.tt | 4 +- .../en/modules/admin/preferences/i18n_l10n.pref | 2 + .../prog/en/modules/catalogue/detail.tt | 12 ++++++ .../intranet-tmpl/prog/js/pages/preferences.js | 6 +++ .../bootstrap/en/includes/masthead-langmenu.inc | 2 +- .../bootstrap/en/includes/opac-bottom.inc | 2 +- members/memberentry.pl | 3 +- opac/opac-showmarc.pl | 14 +++---- t/Koha/Plugin/Test.pm | 10 +++++ t/db_dependent/Letters/TemplateToolkit.t | 42 ++++++++++++++++++- t/db_dependent/Plugins.t | 30 +++++++++++++- 21 files changed, 242 insertions(+), 43 deletions(-) copy cataloguing/plugin_launcher.pl => Koha/Template/Plugin/Remove_MARC_punctuation.pm (71%) mode change 100755 => 100644 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 5 16:03:45 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 05 Apr 2018 14:03:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1057-gaaea465 Message-ID: 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 aaea46594215c88b4459cd882f1d869faeb2e2d8 (commit) via b76ad51b9d45d67746bddf27a9376e810c1b2d1e (commit) from c3f9b750e22b87f6f699bf608cc90fa91cd1ef58 (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 aaea46594215c88b4459cd882f1d869faeb2e2d8 Author: Tomas Cohen Arazi Date: Thu Apr 5 10:06:37 2018 -0300 Bug 20191: (QA follow-up) Require Jessie's Test::MockTime Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit b76ad51b9d45d67746bddf27a9376e810c1b2d1e Author: Mark Tompsett Date: Thu Apr 5 01:31:38 2018 +0000 Bug 20191: Use Test::MockTime to hold time still The problem is the calls to HTTP::OAI::Header, etc. may reference gmtime which is continually changing by the second. By forcing time to lock for all the tests, except the last one, we can be assured things should not fail. TEST PLAN --------- install libtest-mocktime-perl apply the patch restart_all in kshell, prove t/db_dependent/OAI/Server.t run koha qa test tools Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 5 +++++ t/db_dependent/OAI/Server.t | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 5 20:01:35 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 05 Apr 2018 18:01:35 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1069-g7a10b66 Message-ID: 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 7a10b66205dc93d9b9773703008ebcb412b711bc (commit) via 754994a90b0050539174e83c065080dd10a53bbd (commit) via c2fcaac302fc544ba1c3b64eec9a649e72d3d58b (commit) via 61d51c9b11fb10af24e134201984ea759ac4fa52 (commit) via 4ac8e52f61223d44dfbb5a7ad8933c0ba674ca8a (commit) via 0bfad6106aec007ac4bcf17d00f72b5508c4895d (commit) via 199c2f33d93a33bb56d422a6abdeb334fd988faf (commit) via 6271f6c1374ac2dad573ae6784d1632d626b14be (commit) via f5fd79222dedacd13d9a06aa7ab27f07b585f1a4 (commit) via 328d5e7007a8abedf3f8ba679eee910e8ae41d9a (commit) via 373b2f747bb5d67302ae1aa6567b8b593a39d9e9 (commit) via 27a21083d9878f029f01fcc7256fa116ee15dc28 (commit) from aaea46594215c88b4459cd882f1d869faeb2e2d8 (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 7a10b66205dc93d9b9773703008ebcb412b711bc Author: Jonathan Druart Date: Thu Apr 5 14:13:37 2018 -0300 Bug 20530: Remove trailing ':' in columns_settings.yml Signed-off-by: Jonathan Druart commit 754994a90b0050539174e83c065080dd10a53bbd Author: Owen Leonard Date: Wed Mar 7 15:39:49 2018 +0000 Bug 20350: Add column configuration to table of saved reports This patch makes changes to the saved reports template to enable a columns configuration button. Settings for the table have been added to columns_settings.yml. To test, apply the patch and go to Reports -> Use saved. - Confirm that there is a "Column visibility" button in the table's pagination toolbar. - Confirm that showing and hiding columns via the button is working correctly. - Confirm that the first, second, and last columns cannot be toggled. Go to Administration -> Columns settings. - Expand the "Reports" section. - Find "id=table_reports." - Make some selections to configure default settings of the reports table. - Return to reports and confirm that these defaults are applied. Signed-off-by: Jesse Maseto Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit c2fcaac302fc544ba1c3b64eec9a649e72d3d58b Author: Julian Maurice Date: Wed Apr 4 14:08:37 2018 +0200 Bug 20516: Show patron's library in pending discharges table Test plan: 1. Enable syspref useDischarge 2. Login to OPAC and ask for a discharge (tab on the left) 3. Login to intranet, you should see a message about pending discharges, and a link. Click on the link. 4. Confirm that there is a 'Library' column in the table that is displaying the patron's library Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 61d51c9b11fb10af24e134201984ea759ac4fa52 Author: Josef Moravec Date: Tue Apr 3 08:24:56 2018 +0200 Bug 20510: Remove unused sub TotalPaid from C4::Stats Test plan: 0) Do not apply the patch 1) Run git grep TotalPaid and confirm it is only defined and then used once in a test 2) Apply the patch 3) git grep TotalPaid should return nothing 4) prove t/db_dependent/Stats.t should be green Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 4ac8e52f61223d44dfbb5a7ad8933c0ba674ca8a Author: Nick Clemens Date: Mon Jun 19 19:40:39 2017 +0000 Bug 18825: Elasticsearch - Update heading main-heading and see fields Signed-off-by: Ere Maijala Signed-off-by: Jonathan Druart commit 0bfad6106aec007ac4bcf17d00f72b5508c4895d Author: Alex Arnaud Date: Wed Mar 28 09:03:56 2018 +0000 Bug 20261: Fix pagination of the results in authority search Test plan: - apply this patch, - do a search that return more than 20 results, - click on page 2, - check that you get results, - check other pages if possible Signed-off-by: Nicolas Legrand Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 199c2f33d93a33bb56d422a6abdeb334fd988faf Author: Alex Arnaud Date: Mon Mar 12 16:12:20 2018 +0000 Bug 17373: Add mappings for unimarc authorities - Match index Test plan: 1. apply patches 2. switch SearchEngine syspref to ElasticSearch 3. load new mapping (admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1) 4. load some unimarc authorities like the sample attached to bug 17373 5. reindex authorities (./misc/search_tools/rebuild_elastic_search.pl -d -a -v) 6. search entire notice for shalev or ??? 7. you should find stuff Signed-off-by: Nicolas Legrand Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 6271f6c1374ac2dad573ae6784d1632d626b14be Author: Fridolin Somers Date: Thu Oct 13 09:45:40 2016 +0200 Bug 17373: Elasticsearch - Authority mappings for UNIMARC - patch1 This patch starts the UNIMARC mapping for ES. It is needed to test. More patches will come. Signed-off-by: Nicolas Legrand Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit f5fd79222dedacd13d9a06aa7ab27f07b585f1a4 Author: Kyle M Hall Date: Thu Apr 5 06:12:44 2018 -0400 Bug 20325: Remove warning, it is no longer true Signed-off-by: Jonathan Druart commit 328d5e7007a8abedf3f8ba679eee910e8ae41d9a Author: Jonathan Druart Date: Wed Apr 4 15:36:46 2018 -0300 Bug 20325: Do not remove accountlines between tests This is part of the tests, to make sure they have not been deleted Signed-off-by: Jonathan Druart commit 373b2f747bb5d67302ae1aa6567b8b593a39d9e9 Author: Jonathan Druart Date: Wed Apr 4 15:19:54 2018 -0300 Bug 20325: Move tests to a subtest Signed-off-by: Jonathan Druart commit 27a21083d9878f029f01fcc7256fa116ee15dc28 Author: Kyle M Hall Date: Tue Mar 27 15:16:16 2018 -0400 Bug 20325: C4::Accounts::purge_zero_balance_fees does not check account_offsets purge_zero_balance_fees is used in cleanup_database.pl to determine which fees can be cleaned up. It uses a simple SQL query to determine which rows in accountlines need to be removed: 463 my $sth = $dbh->prepare( 464 q{ 465 DELETE FROM accountlines 466 WHERE date < date_sub(curdate(), INTERVAL ? DAY) 467 AND ( amountoutstanding = 0 or amountoutstanding IS NULL ); 468 } The function comes with the following warning: 451 B Because fines and payments are not linked in accountlines, it is 452 possible for a fine to be deleted without the accompanying payment, 453 or vise versa. This won't affect the account balance, but might be 454 confusing to staff. This was a reasonable solution prior to the addition of account_offsets in 17.11. The problem now is that rows in accountlines which are linked as credits in accountlines will *always* have amountoutstanding marked as 0. These are linked to debits via account_offsets. purge_zero_balance_fees will delete credits and leave rows in account_offsets which link to deleted credits. Sites using the --fees option cleanup_database.pl which upgrade to 17.11 may have all of their credits removed without warning. Test Plan: 1) Apply this patch 2) prove t/db_dependent/Accounts.t Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 15 +- C4/Stats.pm | 46 -- admin/columns_settings.yml | 45 +- admin/searchengine/elasticsearch/mappings.yaml | 625 +++++++++++++++++++- authorities/authorities-home.pl | 15 +- .../prog/en/modules/members/discharges.tt | 2 + .../en/modules/reports/guided_reports_start.tt | 13 +- misc/cronjobs/cleanup_database.pl | 3 - t/db_dependent/Accounts.t | 49 +- t/db_dependent/Stats.t | 11 +- 10 files changed, 738 insertions(+), 86 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 5 21:59:41 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 05 Apr 2018 19:59:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1070-g45b1dee Message-ID: 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 45b1dee67e5fd771adbb30e9cac352b8a0c6ab40 (commit) from 7a10b66205dc93d9b9773703008ebcb412b711bc (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 45b1dee67e5fd771adbb30e9cac352b8a0c6ab40 Author: Jonathan Druart Date: Thu Apr 5 16:46:38 2018 -0300 Bug 20531: Prevent IssueSlip.t to fail randomly Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Members/IssueSlip.t | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 6 19:48:31 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 06 Apr 2018 17:48:31 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.04-23-g6fe90c2 Message-ID: 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, 17.11.x has been updated via 6fe90c2228ab6116f1d30d811aad2a6eb342153a (commit) via 4aaf30dfd87289a63e27073be90062db04a32dc1 (commit) via 93c5c8e4c85ed3330184de2c6ea06ab73803656b (commit) via 7c55ea5917998bc210d3ee632f0a8ea6beefff5f (commit) via 37750b2f20f63bec2de330533bb4d9a82171e9c1 (commit) via 3db7e1a63a517ad03a5426504ef4010beae0c8bf (commit) via a1940ace4187e5f94bac82830a92481e85e9c6d0 (commit) via 5de7dc040dbb1e6ebae49a64aac8f4a7c19d4091 (commit) via 72de4ddaeed5e12a86414e6b965cb6f5a4a76ce1 (commit) via 362c0e0cd1035222ee43febae88cab73c410f41e (commit) via 900f3437622c3d3df4fc8cf782161c9b9eea844f (commit) via 46cb6e98ba88843422274f475711356ff4b13866 (commit) via 6dff4fc2bd1b4d4758a0950f52636ea6aca7a525 (commit) via 9ebf5074b696fa532234393187fd071785ec298d (commit) via a7ac0b817d9a1f180e5aa93b5fb7c0284d169e45 (commit) via 81c1f80f11316e337c512b12a6b66cfba9a3b54d (commit) via a3f8f90804f7989e27d180c76fe65cd86ad4adde (commit) via 8f5446e389249383281ee57aaa6a46ca80cdfac2 (commit) via b569804b7ff8d987a05302b565843307edc9f5c9 (commit) via db9f768ea4f312466f6d05e485350bf47002a0b4 (commit) via 71aeda12a86ab16b7212766e083c159387991d37 (commit) via 00e64a0cb16a6bbff764c9e4dd99129f9a4a9c0e (commit) via 4dfdf061badfa40954022653326c3166448ae5bf (commit) from d0a0390b9d5739d582dd98165f321c49e08a02a4 (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 6fe90c2228ab6116f1d30d811aad2a6eb342153a Author: Victor Grousset Date: Fri Jan 5 15:03:38 2018 +0100 Bug 19953: Record page: acquisition details: add column for invoice Test plan: 1. create a vendor with minimal info 2. create a basket with minimal info 3. add a item to the basket 4. close the basket 5. receive a shipment 6. on the "receipt summary" click on "receive" for the wanted item (it should be the only one) 7. items ? receive? ? tick this checkbox 8. save 9. click on "finish receiving" 10. go to the record ? Acquisition details 11. apply this patch 12. refresh the page 13. you should see the new column Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 4aaf30dfd87289a63e27073be90062db04a32dc1 Author: Josef Moravec Date: Fri Mar 9 06:58:34 2018 +0000 Bug 12812: (Follow-up) Fix use of C4::Circulation Fixes this error: Undefined subroutine &main::MarkIssueReturned called at misc/cronjobs/longoverdue.pl line 316. Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens commit 93c5c8e4c85ed3330184de2c6ea06ab73803656b Author: Kyle M Hall Date: Thu Feb 8 06:39:39 2018 -0500 Bug 12812: Longoverdue.pl --mark-returned doesn't return items The longoverdue.pl option --mark-returned doesn't work unless the --charge option is used as well. Test Plan: 1) Run long overdue with --mark-returned and not --charge, note your items are marked lost but not returned 2) Apply this patch 3) Repeat step 1, the items should now get returned! Tested with (for example): misc/cronjobs/longoverdue.pl --lost 10=1 --mark-returned --verbose --confirm Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens commit 7c55ea5917998bc210d3ee632f0a8ea6beefff5f Author: Marcel de Rooy Date: Mon Mar 5 11:30:15 2018 +0100 Bug 17717: (QA follow-up) Fix typo chdir This test does obviously not achieve the desired result: [ "chdir" != "no" ] Trivial fix. Adding the same quotes around starting_dir (just as for Bug 19546). Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 37750b2f20f63bec2de330533bb4d9a82171e9c1 Author: Tomas Cohen Arazi Date: Fri Mar 2 11:51:20 2018 -0300 Bug 17717: Make cronjobs using koha-foreach use --chdir In order to patch production sites we need to adjust the shipped cronjobs so they are called with the --chdir option switch. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 3db7e1a63a517ad03a5426504ef4010beae0c8bf Author: Tomas Cohen Arazi Date: Fri Mar 2 11:17:40 2018 -0300 Bug 17717: Add a --chdir option switch for koha-foreach Until Perl 5.26, the current directory is added to @INC when running a Perl script [1]. Having the current directory in @INC means it can be tried to be traversed when performing a lib lookup. Since version 5.18, Perl dies when it finds an unreadable directory (permissions) in @INC that needs to be traversed. This behaviour won't change because Perl devs consider it an enhancement to security. [2] Because of this, we need to make sure our scripts are ran **from** a directory in which they have read permissions. Ths patch adds a --chdir option switch to the **koha-foreach** wrapper script, that makes the inner shells/scripts to be ran within the Koha instance's user home directory. The change is trivial and should be QAed easily. I tested this on a prod server: - Create a /tmp/test.pl file containing: use Modern::Perl; use Cwd; my $dir = getcwd; warn $dir; 1; A) then create a cronjob entry to run it using koha-foreach: (in /etc/cron.d/test): 1/* * * * * root koha-foreach perl /tmp/test.pl - Once I noticed the cronjob ran, I used mutt to read the emails in the root user. => FAIL: ... Subject: Cron koha-foreach --enabled perl /tmp/test.pl "/root" "/root" "/root" "/root" "/root" ... B) I then used the patched koha-foreach with different results: => SUCCESS: ... Subject: Cron /root/koha-foreach --chdir --enabled perl /tmp/test.pl "/var/lib/koha/acaderc" "/var/lib/koha/agro" "/var/lib/koha/anc" "/var/lib/koha/arico" "/var/lib/koha/artes" ... So this patch's approach works. But... C) master's koha-foreach seems to work just the same... I think it is because of my previous attempt to fix this by using sudo in koha-shell. So I think environmental conditions affect the behaviour (which shell is configured for cron, sudo configuration, etc). ==== In conclusion, I think we should go ahead with this patch as it will solve peoples issues, and it is a right solution (option #5 on the list) to this Perl behaviour change. It doesn't cover other commands, but followup patches could do. I avoided /tmp as it is writable by any user... so it is an easy path for both exploiting by replacing some lib, and also because the existence of an unreadable dir that the interpreter could try to traverse (unreadable /tmp/Authen or /tmp/Koha will trigger the same error, and I assume people know what they are putting on the instance's dir, at least it will be easier to track). A followup patch takes care of making the cronjobs use --chdir when calling koha-foreach [1] https://lists.debian.org/debian-devel-announce/2016/08/msg00013.html [2] https://rt.perl.org/Public/Bug/Display.html?id=123795 Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit a1940ace4187e5f94bac82830a92481e85e9c6d0 Author: Jonathan Druart Date: Tue Feb 27 15:30:18 2018 -0300 Bug 20286: Fix filter for BakerTaylor* prefs Signed-off-by: Brendan Gallagher Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens commit 5de7dc040dbb1e6ebae49a64aac8f4a7c19d4091 Author: Jonathan Druart Date: Mon Feb 26 10:48:18 2018 -0300 Bug 20286: Correctly escape URI characters in OPAC RSS template Bug 19568 use the TT filter url whereas it must have escaped the URI characters with the uri filter. Test plan: Subscribe to an OPAC search => Without this patch you will get an empty page => With this patch applied you will see result list. Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens commit 72de4ddaeed5e12a86414e6b965cb6f5a4a76ce1 Author: Jonathan Druart Date: Wed Feb 28 13:54:32 2018 -0300 Bug 20311: Prevent get_age tests to fail on Feb 28th Today Feb 28th 2018: If we subtract 18y to this DateTime object 29/02/2000 and so the patron is not major yet use Koha::DateUtils qw( dt_from_string ); say dt_from_string('28/02/2018')->add(years => -18); say dt_from_string('28/02/2018')->add(years => -18, end_of_month => 'limit'); will display: 2000-02-29T00:00:00 2000-02-28T00:00:00 Signed-off-by: Jonathan Druart commit 362c0e0cd1035222ee43febae88cab73c410f41e Author: Tomas Cohen Arazi Date: Sat Feb 17 11:50:16 2018 -0300 Bug 20234: Update service description in koha-common.init The service description is very old and outdated. This patch fixes this. Sponsored-by: Orex Digital Signed-off-by: Hugo Agud hagud at orex.es Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 900f3437622c3d3df4fc8cf782161c9b9eea844f Author: Tomas Cohen Arazi Date: Sat Feb 17 11:34:58 2018 -0300 Bug 20234: Make maintenance scripts use koha-zebra instead of koha-*-zebra This patch makes all maintenance scripts use **koha-zebra** instead of the old **koha-*-zebra** scripts. To test: - Run: $ perl misc4dev/cp_debian_files.pl $ sudo service koha-common stop => SUCCESS: No errors and the Zebra-related sevices are stopped $ sudo service koha-common start => SUCCESS: No errors and the Zebra-related services are started $ sudo service koha-common restart => SUCCESS: No erros and Zebra-related services are running $ sudo koha-create --create-db test => SUCCESS: Instance created and zebra running for it $ sudo koha-disable test => SUCCESS: No errors and Zebra is stopped for instance test $ sudo koha-zebra --start test $ sudo koha-remove test => SUCCESS: No errors, instance removed, no Zebra running for test - Sign off :-D Sponsored-by: Orex Digital Signed-off-by: Hugo Agud hagud at orex.es Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 46cb6e98ba88843422274f475711356ff4b13866 Author: Pasi Kallinen Date: Tue Feb 27 12:59:56 2018 +0200 Bug 20302: Allow translating Delete button in Patron batch mod tool There is an untranslatable Delete-button in the patron batch modification tool. Allow translating it. Test plan: 1) Go to Home -> Tools -> Batch patron modification, put a patron's card number in the box, and click on Continue 2) At the bottom of the screen there is an drop-down entry for Attribute, click on the "New" at the nd of that line 3) There should now be another Attribute -line, with "Delete" -link at the end of that line 4) Apply patch, install a language 5) Repeat 1-3 in that language, the Delete-link should be shown in the correct language, if the msgid "Delete" was translated in xx-YY-staff-prog.po Signed-off-by: Pasi Kallinen Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt commit 6dff4fc2bd1b4d4758a0950f52636ea6aca7a525 Author: Pasi Kallinen Date: Tue Feb 27 09:10:17 2018 +0200 Bug 20301: Allow translating "View" in manage MARC import When looking at the table showing the staged MARC records, the "View" text in the Diff-column is not translatable. Make it so. Test plan: 1) Go to Home -> Tools -> Stage MARC records for import 2) Select eg. t/db_dependent/www/data/marc21record.mrc and upload the file 3) Click on Stage for import -> Manage staged records -> Import this batch into the catalog 4) Wait for zebra to reindex, or trigger it yourself by running rebuild_zebra.pl -a -b -r 5) Go to Home -> Tools -> Stage MARC records for import 6) Select the same file as in part 2 and upload the file 7) Change the Record matching rule to ISBN (020$a) 8) Click on Stage for import -> Manage staged records 9) In the table below, there should now be a line showing the staged MARC record matches biblio 10) Note the "View"-text in the "Diff"-column 11) Apply patch 12) Install a language, view the same batch in the Manage staged MARC records -page in that language 13) The "View" should show up correctly, and if the msgid "View" was translated in the xx-YY-staff-prog.po, should show up in the correct language Signed-off-by: Pasi Kallinen Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt commit 9ebf5074b696fa532234393187fd071785ec298d Author: Pasi Kallinen Date: Tue Feb 6 12:19:17 2018 +0200 Bug 20141: Untranslatable string in transport cost matrix Make the "Disable" checkboxes in transport cost matrix translatable Test plan: 1) Go to Home -> Administration -> Transport cost matrix 2) Click on any cell 3) Note the "Disable" checkbox text 4) Install patch, add a language, translate the text, etc 5) Repeat 1-3, the "Disable" text should now be translated Signed-off-by: Pasi Kallinen Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt commit a7ac0b817d9a1f180e5aa93b5fb7c0284d169e45 Author: Pasi Kallinen Date: Mon Feb 26 12:08:27 2018 +0200 Bug 20296: Untranslatable "All" in patrons table filter There's an untranslatable "All" in the "Show X entries" filter when browsing the patrons. Test plan: 1) Home --> Patrons --> Browse by last name. 2) In the table filtering toolbar, there's a dropdown with "Show [20] entries" and the last in the dropdown is "All". 3) Update and install a language, check that msgid "All" is translated and isn't fuzzy. 4) Check the "All" in the dropdown, it is not translated. 5) Install patch, repeat 1-3, and check the "All" in the dropdown, it should now be translated. Signed-off-by: Pasi Kallinen Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt commit 81c1f80f11316e337c512b12a6b66cfba9a3b54d Author: Pasi Kallinen Date: Mon Feb 26 11:10:10 2018 +0200 Bug 20295: Allow translating link title in ILL module Allow translating "View borrower details" link title in the ILL module. Signed-off-by: Pasi Kallinen Signed-off-by: Jonathan Druart commit a3f8f90804f7989e27d180c76fe65cd86ad4adde Author: Katrin Fischer Date: Tue Feb 20 21:42:13 2018 +0000 Bug 20290: Fix capitalization of "Routling List" This fixes some strings to be properly capitalized. To test: - Create a new routing list, check title and breadcrumbs - View the routing list tab in the patron account in staff, check title and breadcrumbs Signed-off-by: Jonathan Druart commit 8f5446e389249383281ee57aaa6a46ca80cdfac2 Author: Pasi Kallinen Date: Tue Feb 6 13:01:36 2018 +0200 Bug 20142: Allow translating offline circ message Allow translating the notification saying you cannot change branch or logout while offline. Test plan: 1) Enable AllowOfflineCirculation 2) Go to Home -> Circulation -> Built-in offline circulation interface 3) Try to change your branch. Note the notification message 4) Apply patch, install language, translate the notification 5) Repeat 2 and 3 in that language. The message should be translated Signed-off-by: Pasi Kallinen Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt commit b569804b7ff8d987a05302b565843307edc9f5c9 Author: Pasi Kallinen Date: Tue Feb 6 14:17:45 2018 +0200 Bug 20147: Allow translating prompt in label edit batch Fix one untranslatable prompt in the label batch edit. Test plan: 1) Go to Home -> Tools -> Label creator 2) Click on New -> Label batch 3) Add items to the batch 4) Select any of the items 5) Click on "Remove selected items" 6) Note the popup text 7) Apply patch, update a language, translate the msgid "Are you sure you want to remove label number(s): %s from this batch?" 8) Repeat 1-6. The popup text should now be translated. Signed-off-by: Pasi Kallinen Signed-off-by: Jonathan Druart commit db9f768ea4f312466f6d05e485350bf47002a0b4 Author: Nick Clemens Date: Fri Apr 6 15:40:56 2018 +0000 Bug 20140: Allow translating more of OAI sets Allow translating two strings in the OAI set config: "setDescription" and "Remove" Test plan: 1) Go to Home -> Administrator -> OAI sets config -> Add a new OAI set 2) Click on "New set" 3) Click on "Add description" 4) Note the "setDescription:" and "Remove" -texts 5) Install patch, update language, translate the new strings 6) Redo 1-4, note how the strings in part 4 are now translated Signed-off-by: Pasi Kallinen Signed-off-by: Roch D'Amour Signed-off-by: Katrin Fischer commit 71aeda12a86ab16b7212766e083c159387991d37 Author: Owen Leonard Date: Wed Feb 21 17:40:06 2018 +0000 Bug 20240: Remove space before : when searching for a vendor in serials (Vendor name :) This patch removes the space before the colon in the "vendor" label in the vendor search pop-up window. To test, apply the patch and go to Serials -> New subscription. - Click the "Search for a vendor" link next to the vendor form field. - In the pop-up window, confirm that there is no space before the colon in the "vendor" label. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 00e64a0cb16a6bbff764c9e4dd99129f9a4a9c0e Author: Owen Leonard Date: Wed Feb 21 17:59:49 2018 +0000 Bug 20239: Fix spelling on authority linker plugin This patch corrects the capitalization of the "Choose" link in the pop-up window for selecting an authority record to link to a MARC field. This patch also converts the link, and the "Edit authority" link, to Bootstrap buttons. To test: - Create a new record - Go to the 100 field - Click on plugin link behind $a - Look for an existing authoriy in your system - In the table of search results, confirm that the "Choose" and "Edit authority" links look correct and work correctly. Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 4dfdf061badfa40954022653326c3166448ae5bf Author: Jonathan Druart Date: Fri Feb 16 12:23:26 2018 -0300 Bug 20229: Explicitly list the SQL modes we support In our installation procedure we ask the administrator to edit the MySQL|MariaDB configuration file to specify the SQL modes we support (see bug 17258 comment 6 and 7 for more information). We are on the way to catch and fix all these issues and support these stricter modes (as they highlight problem in our codebase/DB structure) but in the meanwhile it may be good to remove this step and revert the changes when we are ready. TODO: - Remove that for dev installations (to let developers catch these bugs) - Edit the wiki page to remove this step Test plan: 0. Do not apply this patch 1. Edit your MySQL|MariaDB config and add: sql-mode = "ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION" to the [mysqld] section (or edit it) 2. Restart your DBMS 3. Try to make the app explode (watch the logs) (tips: you should get "'koha_kohadev.me.id' isn't in GROUP BY" when editing an order) 4. Apply the patch, restart_all, restart your DBMS 5. Try to recreate the failure => You should no longer see the error in the logs Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: Koha/Database.pm | 4 +++- debian/docs/koha-foreach.xml | 17 ++++++++++++-- debian/koha-common.cron.d | 2 +- debian/koha-common.cron.daily | 24 ++++++++++---------- debian/koha-common.cron.hourly | 2 +- debian/koha-common.cron.monthly | 2 +- debian/koha-common.init | 16 +++++++------ debian/koha-common.logrotate | 4 ++-- debian/scripts/koha-create | 2 +- debian/scripts/koha-disable | 2 +- debian/scripts/koha-foreach | 11 +++++++++ debian/scripts/koha-remove | 2 +- .../prog/en/modules/admin/oai_sets.tt | 4 ++-- .../prog/en/modules/admin/transport-cost-matrix.tt | 2 +- .../modules/authorities/searchresultlist-auth.tt | 12 +++++----- .../prog/en/modules/catalogue/detail.tt | 12 ++++++++++ .../intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +- .../prog/en/modules/ill/ill-requests.tt | 2 +- .../prog/en/modules/labels/label-edit-batch.tt | 2 +- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/routing-lists.tt | 4 ++-- .../prog/en/modules/serials/acqui-search.tt | 2 +- .../prog/en/modules/serials/routing.tt | 4 ++-- .../prog/en/modules/tools/manage-marc-import.tt | 2 +- .../prog/en/modules/tools/modborrowers.tt | 2 +- .../bootstrap/en/modules/opac-opensearch.tt | 8 +++---- misc/cronjobs/longoverdue.pl | 9 ++++++-- t/db_dependent/Koha/Patrons.t | 12 +++++----- 28 files changed, 107 insertions(+), 62 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 6 20:02:04 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 06 Apr 2018 18:02:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1088-ga2cccbd Message-ID: 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 a2cccbd2314ea1832dae4c1c4ba738fa5c3510d2 (commit) via 14c702bee5362654c8779b8b4a33a0d679ee6a6e (commit) via f50a6ece8386058a5778d46458821064412c5f01 (commit) via 9755c34938c42411e4a7e5d897af7335eca6bc13 (commit) via 98164dc43209af9964b84e83f2ee8f0ff7491a35 (commit) via e8fbe51ff33760b0446339b44047229be9e9f1a8 (commit) via 28e980a25d02ea48609d3ec2ab025034a05ecc4b (commit) via cbb62feb036317ff47122b5da60be088330f0136 (commit) via db348f67f36c0849b2057a598bbbcc30deebd8bc (commit) via 0a71e1df9858d55dddbeff6b31f60426e086570c (commit) via b711ea638afc21ed93c6b7350e0d58d11f7e962b (commit) via a71836f07db418e5c82b5cd55882a1e4d34c732d (commit) via aa2cb3ffbb277fbbe6c7b8f17aa04a67c1996ac2 (commit) via 509ab2c0ee5852824d2db8aa9c44a57fde629655 (commit) via 5d1b491a799f4ca42cbe46809811539897647f8f (commit) via f46ead631325dc86e7ff15344095b8b845cff7f3 (commit) via fcf2b798fd985bfb87809dcbe04eadfd409714b3 (commit) via 69f71ca2bf3e3c6a6a07cb97f88681c86c7d11b1 (commit) from 45b1dee67e5fd771adbb30e9cac352b8a0c6ab40 (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 a2cccbd2314ea1832dae4c1c4ba738fa5c3510d2 Author: Jonathan Druart Date: Fri Apr 6 14:08:40 2018 -0300 Bug 20298: (follow-up) fix labels' for attributes Signed-off-by: Jonathan Druart commit 14c702bee5362654c8779b8b4a33a0d679ee6a6e Author: Kyle M Hall Date: Thu Mar 29 07:11:40 2018 -0400 Bug 20181: (QA follow-up) Remove double check Signed-off-by: Jonathan Druart commit f50a6ece8386058a5778d46458821064412c5f01 Author: Kyle M Hall Date: Tue Feb 13 14:08:25 2018 -0500 Bug 20181: Add POD for new plugin Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 9755c34938c42411e4a7e5d897af7335eca6bc13 Author: Mark Tompsett Date: Tue Feb 13 18:50:02 2018 +0000 Bug 20181: (follow-up) Ensure test runs If EnablePlugins was 0, this test before this patch fails. After this patch, it passes. TEST PLAN --------- 1) Apply all but this patch 2) Run the following commands kshell prove t/Koha_Template_Plugin_KohaPlugins.t -- two tests fail, if you have the conf or syspref set to 0. 3) Apply this patch 4) Repeat step 2. -- all tests pass, including the positive and negative case checks. 5) run koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 98164dc43209af9964b84e83f2ee8f0ff7491a35 Author: Kyle M Hall Date: Mon Feb 12 11:15:47 2018 -0500 Bug 20181: Unit tests Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit e8fbe51ff33760b0446339b44047229be9e9f1a8 Author: Kyle M Hall Date: Mon Feb 12 09:09:20 2018 -0500 Bug 20181: Allow plugins to add css and javascript to OPAC A number of Koha plugins have been written that enhance Koha's public catalog. These plugins often make due to adding css and javascript to the various opac system preferences. It would be nice if the plugin system had hooks so plugin developers could add code the the head block and the area where we include javascript in the opac template. Test Plan: 1) Apply this patch 2) Download and install the Kitchen Sink plugin ( v2.1.12 or later ) https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases/download/v2.1.12/koha-plugin-kitchen-sink-v2.1.12.kpz 3) Install the plugin 4) Restart all the things if you can ( restart_all if you are using kohadevbox ) This will ensure the plugin takes effect right away, it should be necessary but it won't hurt anything! 5) Load the opac, notice you get an alert message and the background for your opac is now orange ( assuming you've not customized the opac in any way ) Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 28e980a25d02ea48609d3ec2ab025034a05ecc4b Author: Marcel de Rooy Date: Fri Apr 6 08:05:58 2018 +0200 Bug 18816: (QA follow-up) Fix Circulation.t Resolve: ok 33 - Can renew, item is marked not for loan, hold does not block Can't use string ("1") as a HASH ref while "strict refs" in use at /usr/share/koha/devclone/C4/Items.pm line 557. Trivial fix. Remove fourth parameter. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit cbb62feb036317ff47122b5da60be088330f0136 Author: Marcel de Rooy Date: Fri Apr 6 07:57:32 2018 +0200 Bug 18816: (QA follow-up) Framework parameter is not needed $frameworkcode is not used in ModItem (no need to pass it in ModItemFromMarc). $dbh is not used in ModItem. Test plan: Run t/db_dependent/Items.t Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit db348f67f36c0849b2057a598bbbcc30deebd8bc Author: Kyle M Hall Date: Fri Mar 23 07:04:57 2018 -0400 Bug 18816: (QA follow-up) Add rarely used params to hashref, remove param Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 0a71e1df9858d55dddbeff6b31f60426e086570c Author: Kyle M Hall Date: Thu Mar 22 06:43:44 2018 -0400 Bug 18816: (QA follow-up) Convert param to hashref, fix typo Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit b711ea638afc21ed93c6b7350e0d58d11f7e962b Author: Kyle M Hall Date: Fri Jun 16 08:27:29 2017 -0400 Bug 18816: Make CataloguingLog work in production by preventing circulation from spamming the log The system preference CataloguingLog is not recommended for use in production. This is do to the fact that every checkin and checkout generates one or more log entires. This seems to be not only bad behavior, but unnecessary and outside the needs of CataloguingLog as we have CirculationLog. Test Plan: 1) Log into staff client 2) Home -> Koha administration -> Global system preferences -> Logs 3) Set only CataloguingLog to 'Log', everything else to "Don't log" 4) Click 'Save all Logging preferences' 5) In MySQL, use your instance DB, and then type 'delete from action_logs;' 6) Have a person checkout and checkin anything. 7) In MySQL, 'select * from action_logs;' -- there will be data. This is the floodiness that will be removed. 8) Apply this patch 9) Repeat steps 5-7 -- there should be no data. 10) Edit any biblio or item. 11) In MySQL, 'select * from action_logs;' -- there should be data reflecting the changes made. 12) run koha qa test tools NOTE: Improved clarity of test plan -- Mark Tompsett Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit a71836f07db418e5c82b5cd55882a1e4d34c732d Author: Owen Leonard Date: Thu Apr 5 13:59:18 2018 +0000 Bug 20526: Show and sort by date of request in pending discharges table This patch adds a "date requested" column to the table of pending discharges, and updates the DataTables configuration to sort by this column by default. The patch also makes some other changes: - Table information and filtering have been added. - The "Allow" link has been converted to a Bootstrap-styled buttong with an icon. To test, apply the patch and view the table of pending discharge requests. It should be sorted by default by date requested. - Confirm that date sorting is correct. - Confirm that other columns still sort correctly. - Confirm that buttons look right. - Confirm that the table information is correct. - Confirm that the table search form works. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit aa2cb3ffbb277fbbe6c7b8f17aa04a67c1996ac2 Author: Julian Maurice Date: Thu Apr 5 13:14:39 2018 +0200 Bug 20524: Make columns of pending discharges table sortable Test plan: 1. Enable syspref useDischarge 2. Login to OPAC and ask for a discharge (tab on the left) 3. Login to OPAC with another borrower from another library and ask for a discharge 4. Login to intranet, you should see a message about pending discharges, and a link. Click on the link. 5. Confirm that the Patron column is sortable and the Allow column is not 6. (Optional) You can apply bug 20516 and confirm that the Library column is sortable too Signed-off-by: Axelle Clarisse Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 509ab2c0ee5852824d2db8aa9c44a57fde629655 Author: Kyle M Hall Date: Fri Mar 23 07:28:47 2018 -0400 Bug 11512: Update syspref description Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 5d1b491a799f4ca42cbe46809811539897647f8f Author: Kyle M Hall Date: Thu Oct 26 07:40:04 2017 -0400 Bug 11512: Forced holds that violate issuing rules will never be filled Currently in Koha, if you choose to force a hold from the staff side that would contravened the current issuing rules, that hold will never be filled, as it is always skipped over by CheckReserves. This patch disallows overrideing except for tooManyReserves which are the only overridden holds that will be trapped. Test Plan: 1) Apply this patch 2) Attempt to override hold placement, only placements where the patron has too many holds already should be allowed Signed-off-by: Jesse Maseto Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit f46ead631325dc86e7ff15344095b8b845cff7f3 Author: Mark Tompsett Date: Fri Jan 19 01:56:17 2018 +0000 Bug 19712: (follow-up) Add missing use Pod::Usage pod2usage call failed otherwise. Signed-off-by: Brendan Gallagher Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit fcf2b798fd985bfb87809dcbe04eadfd409714b3 Author: Jonathan Druart Date: Wed Dec 20 19:10:44 2017 -0300 Bug 19712: Fix test mode for delete_records_via_leader.pl Test plan: perl misc/cronjobs/delete_records_via_leader.pl => Should display a warning perl misc/cronjobs/delete_records_via_leader.pl --test => Should not display a warning and script should not apply changes perl misc/cronjobs/delete_records_via_leader.pl --confirm => Should not display a warning and script should apply changes Signed-off-by: Brendan Gallagher Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 69f71ca2bf3e3c6a6a07cb97f88681c86c7d11b1 Author: Jonathan Druart Date: Thu Mar 29 10:39:08 2018 -0300 Bug 20446: Fix Edifact quotes processing Caused by commit 04aea91de0f2fe1103e4021f880d135da1fd11a9 Bug 15685: (QA follow-up) Address QA issues ->find is called on Koha::Object instead of the set class (Koha::Objects) and raises the following error: Can't use string ("Koha::Acquisition::Basket") as a HASH ref while "strict refs" in use at /usr/share/koha/lib/Koha/Object.pm line 275. This patch also makes sure $basketno refers to an existing basket in DB I cannot provide a test plan, I have no idea how this code is used. Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 18 ++-- C4/Items.pm | 42 +++++---- Koha/EDI.pm | 11 +-- Koha/Template/Plugin/KohaPlugins.pm | 96 ++++++++++++++++++++ .../en/modules/admin/preferences/circulation.pref | 2 +- .../prog/en/modules/members/discharges.tt | 22 ++++- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 6 +- .../bootstrap/en/includes/doc-head-close.inc | 2 + .../bootstrap/en/includes/opac-bottom.inc | 2 + misc/cronjobs/delete_records_via_leader.pl | 11 ++- reserve/request.pl | 2 +- t/Koha/Plugin/Test.pm | 10 ++ t/Koha_Template_Plugin_KohaPlugins.t | 47 ++++++++++ t/db_dependent/Circulation.t | 2 +- t/db_dependent/Items.t | 48 +++++++++- t/db_dependent/Plugins.t | 4 +- 16 files changed, 280 insertions(+), 45 deletions(-) create mode 100644 Koha/Template/Plugin/KohaPlugins.pm create mode 100755 t/Koha_Template_Plugin_KohaPlugins.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 9 21:24:54 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 09 Apr 2018 19:24:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1102-gfe4846d Message-ID: 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 fe4846d0017e17fefe3c134d30d4230a3864be4e (commit) via a73aa7c23231a582464f609bdf100ccbec2d714e (commit) via 5ee536c715f90262c344b2afc9a9456382c858b1 (commit) via 2e1fe25748f4454b52170f37d19cdb26a819e517 (commit) via ff3ca4a489ce5ba16c732e477b1829552c4ccbe8 (commit) via e4d39fd00f38aeb05d01d0df84ac1a5b47036347 (commit) via 49c289eb1f747da7530fa93e43760afcfcf016f0 (commit) via 6dfff20145b90a58747d7daccd2bf1abe233da11 (commit) via dc8879ce4332401eae248ccf8998298b6a1ece7c (commit) via ec0ea67a43455b94a9d8bd3cf4ba8f68d1678e4a (commit) via 0798dcb0baef1cb2bd391188b49fee3ff270370a (commit) via ad37e87b0af454086a08adb97060552ccf1aaa9b (commit) via 7e220e0d8f107cce63f32bfaa1919c04b4dea6e2 (commit) via 76eb3a0549efe4c1f1557071a6cb4b33d4bd3e4d (commit) from a2cccbd2314ea1832dae4c1c4ba738fa5c3510d2 (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 fe4846d0017e17fefe3c134d30d4230a3864be4e Author: Jonathan Druart Date: Mon Apr 9 16:14:23 2018 -0300 Bug 19804: DBRev 17.12.00.026 Signed-off-by: Jonathan Druart commit a73aa7c23231a582464f609bdf100ccbec2d714e Author: Jonathan Druart Date: Wed Apr 4 17:36:28 2018 -0300 Bug 19804: (follow-up) Fix wording and columns order Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 5ee536c715f90262c344b2afc9a9456382c858b1 Author: Jonathan Druart Date: Wed Dec 13 18:05:50 2017 -0300 Bug 19804: Add the new column to the circ rules interface Signed-off-by: Hugo Agud Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 2e1fe25748f4454b52170f37d19cdb26a819e517 Author: Jonathan Druart Date: Wed Dec 13 16:57:40 2017 -0300 Bug 19804: Add a 'Fine charging interval' for suspension days We already have a chargeperiod (Fine charging interval) value which is taken into account for fine ($) for not for the suspension period. This patch adds a new column suspension_chargeperiod (Fine day charging interval) to add the same behaviour when a suspension is calculated. Test plan: Add overdue item and play with the circulation rules (and the calendar). The suspension period must be correctly calculated. Please provide the different tests you made. Signed-off-by: Hugo Agud Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit ff3ca4a489ce5ba16c732e477b1829552c4ccbe8 Author: Jonathan Druart Date: Wed Dec 13 16:56:57 2017 -0300 Bug 19804: DBIC Schema changes Signed-off-by: Hugo Agud Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit e4d39fd00f38aeb05d01d0df84ac1a5b47036347 Author: Jonathan Druart Date: Wed Dec 13 16:56:38 2017 -0300 Bug 19804: Add new DB column issuingrules.suspension_chargeperiod Signed-off-by: Hugo Agud Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 49c289eb1f747da7530fa93e43760afcfcf016f0 Author: Nick Clemens Date: Fri Mar 16 09:03:46 2018 +0000 Bug 19581: (follow-up) Fix handling of new and old arrays for auth compat Stolen from bug 20244 Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 6dfff20145b90a58747d7daccd2bf1abe233da11 Author: Nick Clemens Date: Tue Mar 13 09:32:04 2018 +0000 Bug 19581: Remove unused comment and line Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit dc8879ce4332401eae248ccf8998298b6a1ece7c Author: Nick Clemens Date: Sun Nov 5 01:47:49 2017 +0000 Bug 19581: Unit tests This patch makes a few changes to the tests to take into account the change to indexing. To test: prove t/db_dependent/Koha_Elasticsearch_Indexer.t Should return green Signed-off-by: David Bourgault Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit ec0ea67a43455b94a9d8bd3cf4ba8f68d1678e4a Author: Nick Clemens Date: Sun Nov 5 01:51:39 2017 +0000 Bug 19581: Remove 'split' option from Catmandu fixes for marc This option in combination with append seems to add null entries in the indexes for fields that don't exist. These fields then affect sorting. Removing it solves the issue To test: 1 - Have an ES setup 2 - Catalog and index some records 3 - View a record in ES: curl 'localhost:9200/koha_kohadev_biblios/data/4?pretty=yes' 4 - Note there are 'null' entries in the indexes, save this result for comparison 5 - Apply patch 6 - Reindex, amking sure to delete existing indexes perl misc/search_tools/rebuild_elastic_search.pl -d 7 - View the record again 8 - Note the null entries are removed 9 - Note indices are otherwise intact Signed-off-by: David Bourgault Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 0798dcb0baef1cb2bd391188b49fee3ff270370a Author: Mark Tompsett Date: Fri Apr 6 14:59:28 2018 +0000 Bug 20122: Explicitly set path to fix emptying cart functionality This is caused by bib_list not being deleted. The path was not explicitly set. This patch adds path=/ explicitly to ensure it does get deleted. TEST PLAN --------- 1) search for 'the' in OPAC 2) add several items to cart. 3) look at your cart. 4) empty and close the cart, select all->remove -- either way window closes and it looks empty. 5) refresh the page -- cart comes back. -- in chromium inspecting the page, specifically the "Application" area, bib_list is shown as a cookie still. 6) apply patch 7) restart_all and empty cache forcing JS reload 8) repeat steps 1-5 -- this time cart stays empty. -- and the bib_list cookie is gone Signed-off-by: Roch D'Amour using firefox 59.0.2 Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit ad37e87b0af454086a08adb97060552ccf1aaa9b Author: Jonathan Druart Date: Wed Feb 7 12:26:53 2018 -0300 Bug 20180: [sql_modes] Remove GROUP BY clause in manage-marc-import.pl Replaced with a distinct. Fix for: 'koha_kohadev.me.frameworktext' isn't in GROUP BY t/db_dependent/www/search_utf8.t NOTE: I added a [% frameworks.count %] into the template file, and compared master and a branch with this applied when managing a staged marc import. Values were identical. Signed-off-by: Mark Tompsett Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 7e220e0d8f107cce63f32bfaa1919c04b4dea6e2 Author: Jonathan Druart Date: Tue Feb 6 11:04:50 2018 -0300 Bug 20179: [sql_modes] Remove GROUP BY in get_shelves_containing_record Replaced with distinct. Fix for: 'koha_kohadev.me.shelfname' isn't in GROUP BY t/db_dependent/Virtualshelves.t Signed-off-by: Roch D'Amour Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 76eb3a0549efe4c1f1557071a6cb4b33d4bd3e4d Author: Jonathan Druart Date: Mon Apr 9 15:59:32 2018 -0300 Bug 18789: (follow-up) Pass a Koha::Patron object from returns.pl Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 8 ++ Koha.pm | 2 +- Koha/Schema/Result/Issuingrule.pm | 12 ++- Koha/SearchEngine/Elasticsearch.pm | 9 +- Koha/SearchEngine/Elasticsearch/Search.pm | 6 +- Koha/Virtualshelves.pm | 2 +- admin/smart-rules.pl | 2 + circ/returns.pl | 4 +- installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/updatedatabase.pl | 12 +++ .../prog/en/modules/admin/smart-rules.tt | 4 + .../intranet-tmpl/prog/en/modules/circ/returns.tt | 7 +- koha-tmpl/opac-tmpl/bootstrap/js/basket.js | 4 +- t/db_dependent/Circulation.t | 113 +++++++++++++++++++- t/db_dependent/Koha_Elasticsearch_Indexer.t | 23 ++-- tools/manage-marc-import.pl | 2 +- 16 files changed, 178 insertions(+), 33 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 9 22:54:12 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 09 Apr 2018 20:54:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1105-g7e6aca3 Message-ID: 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 7e6aca360f5b88d66745141495b474033b9c5167 (commit) via 9d7391dcf5a4d271d5aec63c299f8cc9236d050d (commit) via f32cf00e132c747a008163e5f40810d4a47bff58 (commit) from fe4846d0017e17fefe3c134d30d4230a3864be4e (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 7e6aca360f5b88d66745141495b474033b9c5167 Author: Jonathan Druart Date: Mon Apr 9 17:43:41 2018 -0300 Bug 19581: Fix Koha_Elasticsearch.t Signed-off-by: Jonathan Druart commit 9d7391dcf5a4d271d5aec63c299f8cc9236d050d Author: Jonathan Druart Date: Mon Apr 9 17:39:35 2018 -0300 Bug 19804: Fix test in maxsuspensiondays.t We do not want a random value of suspension_chargeperiod from TestBuilder Signed-off-by: Jonathan Druart commit f32cf00e132c747a008163e5f40810d4a47bff58 Author: Jonathan Druart Date: Mon Apr 9 17:33:37 2018 -0300 Bug 19804: Fix test in GetHardDueDate.t Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation/GetHardDueDate.t | 1 + .../Circulation/IssuingRules/maxsuspensiondays.t | 1 + t/db_dependent/Koha_Elasticsearch.t | 46 ++++++++++---------- 3 files changed, 25 insertions(+), 23 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 10 09:44:00 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Apr 2018 07:44:00 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.10-12-g38d62ce Message-ID: 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, 17.05.x has been updated via 38d62cec1d25efd6503305019e92a099bbb1d0f5 (commit) via 54a294571ffc2c9fc0edccba448cf67133205658 (commit) via 2253956f6915dbe4d4164a094a437ad9fd89f204 (commit) via c7a31a846a9efd01b7cf18893b2da7669d966e3f (commit) via 67cecb7f752f9a3be3769bbf5bd75a7aa02bd3de (commit) via d6367c4b431091ef90263f0d49d5dc3d8ef7996c (commit) via 6e58877b7d8526228003d4dadb51977d44dbe653 (commit) via 8aad3268b589e7659a6d4a64efa7f0af84927a8a (commit) via 2342acfca77a2352a76ec6cca267e6a056dedf34 (commit) via 48141d57f1d5e124e60b85221926d55fae470a94 (commit) via 443fb91be5805863633439afb4b2eefb7a164112 (commit) via f7b67d01fd98927cf34b9699d1ee998382ba269f (commit) from 2f22ee7576fb76acbae722f41208f52cb1af9ef3 (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 38d62cec1d25efd6503305019e92a099bbb1d0f5 Author: Josef Moravec Date: Fri Mar 9 06:58:34 2018 +0000 Bug 12812: (Follow-up) Fix use of C4::Circulation Fixes this error: Undefined subroutine &main::MarkIssueReturned called at misc/cronjobs/longoverdue.pl line 316. Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit 4aaf30dfd87289a63e27073be90062db04a32dc1) Signed-off-by: Fridolin Somers commit 54a294571ffc2c9fc0edccba448cf67133205658 Author: Kyle M Hall Date: Thu Feb 8 06:39:39 2018 -0500 Bug 12812: Longoverdue.pl --mark-returned doesn't return items The longoverdue.pl option --mark-returned doesn't work unless the --charge option is used as well. Test Plan: 1) Run long overdue with --mark-returned and not --charge, note your items are marked lost but not returned 2) Apply this patch 3) Repeat step 1, the items should now get returned! Tested with (for example): misc/cronjobs/longoverdue.pl --lost 10=1 --mark-returned --verbose --confirm Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit 93c5c8e4c85ed3330184de2c6ea06ab73803656b) Signed-off-by: Fridolin Somers commit 2253956f6915dbe4d4164a094a437ad9fd89f204 Author: Marcel de Rooy Date: Mon Mar 5 11:30:15 2018 +0100 Bug 17717: (QA follow-up) Fix typo chdir This test does obviously not achieve the desired result: [ "chdir" != "no" ] Trivial fix. Adding the same quotes around starting_dir (just as for Bug 19546). Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 7c55ea5917998bc210d3ee632f0a8ea6beefff5f) Signed-off-by: Fridolin Somers commit c7a31a846a9efd01b7cf18893b2da7669d966e3f Author: Tomas Cohen Arazi Date: Fri Mar 2 11:51:20 2018 -0300 Bug 17717: Make cronjobs using koha-foreach use --chdir In order to patch production sites we need to adjust the shipped cronjobs so they are called with the --chdir option switch. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 37750b2f20f63bec2de330533bb4d9a82171e9c1) Signed-off-by: Fridolin Somers commit 67cecb7f752f9a3be3769bbf5bd75a7aa02bd3de Author: Tomas Cohen Arazi Date: Fri Mar 2 11:17:40 2018 -0300 Bug 17717: Add a --chdir option switch for koha-foreach Until Perl 5.26, the current directory is added to @INC when running a Perl script [1]. Having the current directory in @INC means it can be tried to be traversed when performing a lib lookup. Since version 5.18, Perl dies when it finds an unreadable directory (permissions) in @INC that needs to be traversed. This behaviour won't change because Perl devs consider it an enhancement to security. [2] Because of this, we need to make sure our scripts are ran **from** a directory in which they have read permissions. Ths patch adds a --chdir option switch to the **koha-foreach** wrapper script, that makes the inner shells/scripts to be ran within the Koha instance's user home directory. The change is trivial and should be QAed easily. I tested this on a prod server: - Create a /tmp/test.pl file containing: use Modern::Perl; use Cwd; my $dir = getcwd; warn $dir; 1; A) then create a cronjob entry to run it using koha-foreach: (in /etc/cron.d/test): 1/* * * * * root koha-foreach perl /tmp/test.pl - Once I noticed the cronjob ran, I used mutt to read the emails in the root user. => FAIL: ... Subject: Cron koha-foreach --enabled perl /tmp/test.pl "/root" "/root" "/root" "/root" "/root" ... B) I then used the patched koha-foreach with different results: => SUCCESS: ... Subject: Cron /root/koha-foreach --chdir --enabled perl /tmp/test.pl "/var/lib/koha/acaderc" "/var/lib/koha/agro" "/var/lib/koha/anc" "/var/lib/koha/arico" "/var/lib/koha/artes" ... So this patch's approach works. But... C) master's koha-foreach seems to work just the same... I think it is because of my previous attempt to fix this by using sudo in koha-shell. So I think environmental conditions affect the behaviour (which shell is configured for cron, sudo configuration, etc). ==== In conclusion, I think we should go ahead with this patch as it will solve peoples issues, and it is a right solution (option #5 on the list) to this Perl behaviour change. It doesn't cover other commands, but followup patches could do. I avoided /tmp as it is writable by any user... so it is an easy path for both exploiting by replacing some lib, and also because the existence of an unreadable dir that the interpreter could try to traverse (unreadable /tmp/Authen or /tmp/Koha will trigger the same error, and I assume people know what they are putting on the instance's dir, at least it will be easier to track). A followup patch takes care of making the cronjobs use --chdir when calling koha-foreach [1] https://lists.debian.org/debian-devel-announce/2016/08/msg00013.html [2] https://rt.perl.org/Public/Bug/Display.html?id=123795 Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 3db7e1a63a517ad03a5426504ef4010beae0c8bf) Signed-off-by: Fridolin Somers commit d6367c4b431091ef90263f0d49d5dc3d8ef7996c Author: Tomas Cohen Arazi Date: Tue Jun 27 11:55:45 2017 -0300 Bug 18709: Make koha-foreach use koha-shell internally This patch simplifies the koha-foreach script, making it use koha-shell to gain instance privileges and have all environment variables set. To test: - Apply the patch - Have one or more instances created (kohadev already exists in kohadevbox, add another onewith $ sudo koha-create --create-db test) - Run: $ sudo kohaclone/debian/scripts/koha-foreach echo "This is instance __instancename__" => SUCCESS: The script runs gracefuly, and outputs something like: This is instance kohadev This is instance test Note: this means the command was executed for each instance and the current behaviour of replacing the placeholder __instancename__ for the actual instance name still works as expected. - You can try the different filter switches, but the logic has not been touched. only the command call. - Sign off :-D Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit 75994dc94a2f5d1a500a7789ed113575c49f8b51) Signed-off-by: Fridolin Somers commit 6e58877b7d8526228003d4dadb51977d44dbe653 Author: Jonathan Druart Date: Tue Feb 27 15:30:18 2018 -0300 Bug 20286: Fix filter for BakerTaylor* prefs Signed-off-by: Brendan Gallagher Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit a1940ace4187e5f94bac82830a92481e85e9c6d0) Signed-off-by: Fridolin Somers commit 8aad3268b589e7659a6d4a64efa7f0af84927a8a Author: Jonathan Druart Date: Mon Feb 26 10:48:18 2018 -0300 Bug 20286: Correctly escape URI characters in OPAC RSS template Bug 19568 use the TT filter url whereas it must have escaped the URI characters with the uri filter. Test plan: Subscribe to an OPAC search => Without this patch you will get an empty page => With this patch applied you will see result list. Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit 5de7dc040dbb1e6ebae49a64aac8f4a7c19d4091) Signed-off-by: Fridolin Somers commit 2342acfca77a2352a76ec6cca267e6a056dedf34 Author: Jonathan Druart Date: Wed Feb 28 13:54:32 2018 -0300 Bug 20311: Prevent get_age tests to fail on Feb 28th Today Feb 28th 2018: If we subtract 18y to this DateTime object 29/02/2000 and so the patron is not major yet use Koha::DateUtils qw( dt_from_string ); say dt_from_string('28/02/2018')->add(years => -18); say dt_from_string('28/02/2018')->add(years => -18, end_of_month => 'limit'); will display: 2000-02-29T00:00:00 2000-02-28T00:00:00 Signed-off-by: Jonathan Druart (cherry picked from commit 72de4ddaeed5e12a86414e6b965cb6f5a4a76ce1) Signed-off-by: Fridolin Somers commit 48141d57f1d5e124e60b85221926d55fae470a94 Author: Tomas Cohen Arazi Date: Sat Feb 17 11:50:16 2018 -0300 Bug 20234: Update service description in koha-common.init The service description is very old and outdated. This patch fixes this. Sponsored-by: Orex Digital Signed-off-by: Hugo Agud hagud at orex.es Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart (cherry picked from commit 362c0e0cd1035222ee43febae88cab73c410f41e) Signed-off-by: Fridolin Somers commit 443fb91be5805863633439afb4b2eefb7a164112 Author: Tomas Cohen Arazi Date: Sat Feb 17 11:34:58 2018 -0300 Bug 20234: Make maintenance scripts use koha-zebra instead of koha-*-zebra This patch makes all maintenance scripts use **koha-zebra** instead of the old **koha-*-zebra** scripts. To test: - Run: $ perl misc4dev/cp_debian_files.pl $ sudo service koha-common stop => SUCCESS: No errors and the Zebra-related sevices are stopped $ sudo service koha-common start => SUCCESS: No errors and the Zebra-related services are started $ sudo service koha-common restart => SUCCESS: No erros and Zebra-related services are running $ sudo koha-create --create-db test => SUCCESS: Instance created and zebra running for it $ sudo koha-disable test => SUCCESS: No errors and Zebra is stopped for instance test $ sudo koha-zebra --start test $ sudo koha-remove test => SUCCESS: No errors, instance removed, no Zebra running for test - Sign off :-D Sponsored-by: Orex Digital Signed-off-by: Hugo Agud hagud at orex.es Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart (cherry picked from commit 900f3437622c3d3df4fc8cf782161c9b9eea844f) Signed-off-by: Fridolin Somers commit f7b67d01fd98927cf34b9699d1ee998382ba269f Author: Jonathan Druart Date: Fri Feb 16 12:23:26 2018 -0300 Bug 20229: Explicitly list the SQL modes we support In our installation procedure we ask the administrator to edit the MySQL|MariaDB configuration file to specify the SQL modes we support (see bug 17258 comment 6 and 7 for more information). We are on the way to catch and fix all these issues and support these stricter modes (as they highlight problem in our codebase/DB structure) but in the meanwhile it may be good to remove this step and revert the changes when we are ready. TODO: - Remove that for dev installations (to let developers catch these bugs) - Edit the wiki page to remove this step Test plan: 0. Do not apply this patch 1. Edit your MySQL|MariaDB config and add: sql-mode = "ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION" to the [mysqld] section (or edit it) 2. Restart your DBMS 3. Try to make the app explode (watch the logs) (tips: you should get "'koha_kohadev.me.id' isn't in GROUP BY" when editing an order) 4. Apply the patch, restart_all, restart your DBMS 5. Try to recreate the failure => You should no longer see the error in the logs Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 4dfdf061badfa40954022653326c3166448ae5bf) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: Koha/Database.pm | 4 ++- debian/docs/koha-foreach.xml | 17 ++++++++++-- debian/koha-common.cron.d | 2 +- debian/koha-common.cron.daily | 24 ++++++++-------- debian/koha-common.cron.hourly | 2 +- debian/koha-common.cron.monthly | 2 +- debian/koha-common.init | 16 ++++++----- debian/koha-common.logrotate | 4 +-- debian/scripts/koha-create | 2 +- debian/scripts/koha-disable | 2 +- debian/scripts/koha-foreach | 29 +++++++++++--------- debian/scripts/koha-remove | 2 +- .../bootstrap/en/modules/opac-opensearch.tt | 8 +++--- misc/cronjobs/longoverdue.pl | 9 ++++-- t/db_dependent/Koha/Patrons.t | 12 ++++---- 15 files changed, 80 insertions(+), 55 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 10 17:19:33 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Apr 2018 15:19:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1106-gb00d4d9 Message-ID: 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 b00d4d9e4697528fcad7ce911a02e2fdddcf1c58 (commit) from 7e6aca360f5b88d66745141495b474033b9c5167 (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 b00d4d9e4697528fcad7ce911a02e2fdddcf1c58 Author: Jonathan Druart Date: Tue Apr 10 12:04:59 2018 -0300 Bug 3841: (follow-up) Add the ACQ framework for pl-PL No idea why I missed pl-PL! Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: .../marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql | 8 ++++++++ 1 file changed, 8 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 10 18:19:31 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Apr 2018 16:19:31 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1107-g33618ea Message-ID: 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 33618eaec3eedf148a235d246e5ccc9ebc9ae7c3 (commit) from b00d4d9e4697528fcad7ce911a02e2fdddcf1c58 (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 33618eaec3eedf148a235d246e5ccc9ebc9ae7c3 Author: Jonathan Druart Date: Tue Apr 10 13:08:43 2018 -0300 Bug 20557: Prevent Koha/Acquisition/Order.t to fail randomly https://jenkins.koha-community.org/job/Koha_Master_D8/427/consoleFull t/db_dependent/Koha/Acquisition/Order.t .. 1/2 # No tests run! # Failed test 'No tests run for subtest "entrydate"' # at t/db_dependent/Koha/Acquisition/Order.t line 97. # Looks like you failed 1 test of 1. # Failed test 'store' # at t/db_dependent/Koha/Acquisition/Order.t line 99. Cannot insert order: Mandatory parameter quantity is missing at t/db_dependent/Koha/Acquisition/Order.t line 77. # Looks like your test exited with 255 just after 2. It happens when basket.is_standing is 0 Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Koha/Acquisition/Order.t | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 11 22:03:09 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 11 Apr 2018 20:03:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1136-gb9b8245 Message-ID: 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 b9b824559d336150afb27836c2c8e36ca3ad4900 (commit) via 5e41df9101667304a09da007e7ef1104c4fdfeb6 (commit) via 55abcbee5323b16071392cdc3f0dc38b0f1c3cfe (commit) via ad2b04001fe3100a5caeafbbdd5ea56a6ff65e1a (commit) via 198096ffab71ced1aa6ce453ee5c08fc43d0b5d3 (commit) via 30faa632e95362e0f80cf42f9fa37e96047e4a74 (commit) via 946d5bcdd2ccaefaba2596b8be1278781d1cc482 (commit) via 84ce1fb5921cdddf2368f0c330dede0f602742d0 (commit) via d632da51c80f9c4215c6952793353803038d98d3 (commit) via ccc71f6cf13334d554cad74ae85df2e8be3e3649 (commit) via cc8f3dc1cc046ecd7d53349091fbba864dfb91c9 (commit) via d8b6fde9b7f59ba32f4726f55acb6f803c7816d6 (commit) via 654d8c0cfd6cd2643e2deed7bb18618ea740cace (commit) via 5e9c703d2bef25f7ada760952d3e070203376a05 (commit) via 4218875ec039dc375124f969caea1624399c21a4 (commit) via 84d6c23eddf8744a61e06432b0f443753138d7f2 (commit) via dd0469132cf5aee7fded7e69949b4e6e2e54694b (commit) via 999f2ed7e9e56dda254308f9bbbc85dcc66a160c (commit) via f3b8f17395f05548c87129d286a3f49d0b171e0b (commit) via 8acf5912b3fd213b8bcb3e7ee9b47f7cb086002b (commit) via 9a3d12e35e20766a2175c68f870a48058a25d6ec (commit) via b068259521ebea158e8b664cfbab46d5a65495ff (commit) via 7513c70ef04f9326a8f726556788ea85c098ae60 (commit) via 9b1a5cd640a69f6accb6e35eb02eebd35d8af338 (commit) via e8ac2d38331872bc812f6ed32cf2fc5735a88bde (commit) via 015e7ee3331ededee37dd68a7e9743b93605b05a (commit) via cb35784d3cf9fc878859200bcab8f577583d8b07 (commit) via 8fb700b81dac0e180d1acf24c50420b4f6939fd5 (commit) via 4cdf3e38afd608bcd0f8a1c7b6918d40ad84859f (commit) from 33618eaec3eedf148a235d246e5ccc9ebc9ae7c3 (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 b9b824559d336150afb27836c2c8e36ca3ad4900 Author: Marcel de Rooy Date: Tue Apr 10 16:31:44 2018 +0200 Bug 19904: (follow-up) Add Nick Clemens as RM assistant See comments on Bugzilla report and wiki roles page for 18.05. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 5e41df9101667304a09da007e7ef1104c4fdfeb6 Author: Marcel de Rooy Date: Mon Apr 9 14:29:40 2018 +0200 Bug 19904: Release team for 18.05 First moved all relevant 17.11 release team entries to the development section, and then updated the release team section from the wiki 18.05 roles page. Test plan: [1] Check if Koha team tab on about looks as it should. [2] Verify changes with 17.11 and 18.05 roles. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 55abcbee5323b16071392cdc3f0dc38b0f1c3cfe Author: Jonathan Druart Date: Wed Apr 11 16:50:37 2018 -0300 Bug 19289: DBRev 17.12.00.027 Signed-off-by: Jonathan Druart commit ad2b04001fe3100a5caeafbbdd5ea56a6ff65e1a Author: Jonathan Druart Date: Mon Apr 9 12:52:31 2018 -0300 Bug 19289: (follow-up) Add existing fields to the ACQ framework Changes for other frameworks Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 198096ffab71ced1aa6ce453ee5c08fc43d0b5d3 Author: Jonathan Druart Date: Fri Apr 6 17:15:34 2018 -0300 Bug 19289: Extend size of inputs to 50 Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 30faa632e95362e0f80cf42f9fa37e96047e4a74 Author: Jonathan Druart Date: Tue Feb 27 10:38:47 2018 -0300 Bug 19289: Use copyrightdate instead of publicationyear for MARC21 See comment 24 Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 946d5bcdd2ccaefaba2596b8be1278781d1cc482 Author: Jonathan Druart Date: Fri Jan 19 14:13:48 2018 -0300 Bug 19289: Use jQuery validate plugin This is quite dirty but rewrite the JS checks is out of the scope of this bug report. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 84ce1fb5921cdddf2368f0c330dede0f602742d0 Author: Jonathan Druart Date: Fri Oct 13 17:35:11 2017 -0300 Bug 19289: Use the ACQ framework to display bibliographic details The ACQ MARC framework is only used for the ?Item? block. This patch add the ability to define biblio fields (!= 995 or 952) to customize the display of the bibliographic details when ordering. This new feature is controlled by a new pref: UseACQFrameworkForBiblioRecords Test plan: - Create a new installation to populate the ACQ framework correctly - Set the pref UseACQFrameworkForBiblioRecords to "Use" - Create a new order => You will see the lib from the ACQ framework - Add/remove/update biblio subfields in the ACQ framework - Create a new order => You should see the new subfields displayed Note for QA: I though I would be able to refactor existing code to make it more flexible, but it is a bit messy and lost a lot of time. I finally decided to copy/paste the existing code. I simplified it as, I think, we do not want the plugin, etc. like in the full biblio editor. Signed-off-by: Josef Moravec Signed-off-by: Nicolas Legrand Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit d632da51c80f9c4215c6952793353803038d98d3 Author: Jonathan Druart Date: Thu Oct 26 17:29:36 2017 -0300 Bug 19289: Add existing fields to the ACQ framework When ordering, the bibliographic details contain the title, author, publisher code, publication year, isbn and series info. To avoid regression to provide the same behaviour, we will add these fields to the ACQ framework NOTE: This patch makes the change only for - en - fr / unimarc complet Other frameworks will be updated before to be pushed, to avoid unecessary rebases Signed-off-by: Josef Moravec Signed-off-by: Nicolas Legrand Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit ccc71f6cf13334d554cad74ae85df2e8be3e3649 Author: Katrin Fischer Date: Sat Apr 7 10:59:47 2018 +0200 Bug 20540: (follow-up) Remove debug line Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit cc8f3dc1cc046ecd7d53349091fbba864dfb91c9 Author: Jonathan Druart Date: Fri Apr 6 17:16:30 2018 -0300 Bug 20540: Fix TransformHtmlToXml if last tag is empty This bug has been found during testing bug 19289. In some conditions C4::Biblio::TransformHtmlToXml will generate a malformed XML structure. The last can be duplicated. For instance, if a call like: my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values ); with the last value of @field_values is empty, it will return: l k k k k k Which will result later in the following error: :23: parser error : Opening and ending tag mismatch: record line 6 and datafield ^ :24: parser error : Opening and ending tag mismatch: collection line 2 and record ^ :25: parser error : Extra content at the end of the document Test plan: You can test it along with bug 19289 and confirm that it fixes the problem raised on bug 19289 comment 30 Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit d8b6fde9b7f59ba32f4726f55acb6f803c7816d6 Author: Marcel de Rooy Date: Wed Oct 11 14:41:17 2017 +0200 Bug 18625: (QA follow-up) Simplify update_lastseen No need to check the pref. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 654d8c0cfd6cd2643e2deed7bb18618ea740cace Author: Colin Campbell Date: Thu May 18 15:59:49 2017 +0100 Bug 18625: Update lastseen in patron info request Many services use SIP patron req info to validate a patron against the koha database. If recording lastseen sites will also want to record that the user has accessed these library facilities although they have not logged into koha Signed-off-by: Marcel de Rooy Verified that Patron Info request (63) updates lastseen when the pref has been enabled. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 5e9c703d2bef25f7ada760952d3e070203376a05 Author: Nick Clemens Date: Fri Oct 27 02:23:22 2017 +0000 Bug 18625: (QA follow-up) Unit tests Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 4218875ec039dc375124f969caea1624399c21a4 Author: Mark Tompsett Date: Tue Jan 30 19:53:32 2018 +0000 Bug 20104: Update minimum version of Perl to 5.20 This patch not only updates the version check, but repurposes the perlversion parameter, so as to not have to retranslate templates again when the version number changes after this. The changes are very self-evident. Signed-off-by: Roch D'Amour Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 84d6c23eddf8744a61e06432b0f443753138d7f2 Author: Martin Renvoize Date: Fri Apr 6 10:22:20 2018 +0100 Bug 20536: (ILL) authnotrequired should be explicitly unset on opac * koha/opac-illrequest.pl - Added explicit setting of authnotrequired Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit dd0469132cf5aee7fded7e69949b4e6e2e54694b Author: Claire Gravely Date: Tue Apr 10 12:46:11 2018 +0000 Bug 20552: Fix HTML tag for search facets The tags for home library and holding library in the 'refine your search' list should be h5. This patch changes the html tag for the availability, holding library and home library facets. To test: - Search for an item in the OPAC where the relevant facet appears - Use 'Inspect element' to check the tag - Apply patch - Confirm the facet now has the h5 tag - Confirm spacing is improved Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 999f2ed7e9e56dda254308f9bbbc85dcc66a160c Author: Nick Clemens Date: Fri Oct 27 11:38:51 2017 +0000 Bug 19538: Move EnableAdvancedCatalogingEdtor from 'Labs' to 'Cataloging' To test: 1 - View sysprefs 2 - Note 'Labs' tab 3 - Note EnableAdvancedCatalogingEditor is the only pref there 4 - Note that prefs works 5 - Apply patch 6 - Note 'Labs' tba is gone 7 - Check the 'Cataloging' tab (under Interface) 8 - There it is! 9 - Verify it still works Signed-off-by: Katrin Fischer Signed-off-by: Maksim Sen Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit f3b8f17395f05548c87129d286a3f49d0b171e0b Author: Owen Leonard Date: Wed Apr 4 16:33:34 2018 +0000 Bug 20518: Don't show "Messages" header and link on patron details if there are no messages This patch modifies the patron detail page so that the "Messages" header is not displayed if there are no messages. Unrelated: A minor change was made to moremember.pl to quiet an error in the log, "Use of uninitialized value $print in string eq at members/moremember.pl line 219." To test, apply the patch and open the detail page for a patron who has no messages. There should be no "Messages" header or "add message" link. Add a message to the patron's account. The message should appear, along with the "Messages" header and "add message" link. The error logs should show no errors. Signed-off-by: Maksim Sen Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 8acf5912b3fd213b8bcb3e7ee9b47f7cb086002b Author: Nick Clemens Date: Mon Jan 15 14:11:29 2018 +0000 Bug 9634: Allow for combining same paraneters in SQL reports This patch combines report paramters with the same name and data type (authorised value) This presereves the past ability to provide all parameters as 'sql_params' in order to preserve existing public report links To test: 1 - Create a report that takes multiple parameters, e.g.: SELECT <> AS one, <> AS two, <> as three, <> as four, <> as five 2 - Run this report, note you are asked for five parameters 3 - Apply patch 4 - Update database 5 - Run report, note you are asked for three params 6 - Verify the results reflect the supplied parameters 7 - Export the report and verify results 8 - Alter the URL and provide 5 params as sql_params and no param_name variables i.e. http://localhost:8081/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Run+this+report&sql_params=Banana&sql_params=CPL&sql_params=0&sql_params=Orange&sql_params=LPL 9 - Verify results come out as expected. i.e. 5 different values that are those of the URL. Signed-off-by: Victor Grousset Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 9a3d12e35e20766a2175c68f870a48058a25d6ec Author: Tomas Cohen Arazi Date: Wed Apr 11 15:47:01 2018 -0300 Bug 18674: (QA follow-up) Add date and time This patch adds current date and time, formatted as configured. It makes the timezone name be displayed the system uses it (important for the 'local' use case). It removes some warnings too. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit b068259521ebea158e8b664cfbab46d5a65495ff Author: Tomas Cohen Arazi Date: Thu Apr 5 16:29:23 2018 -0300 Bug 18674: TZ error handling This patch adds C4::Context->timezone bad timezone handling. The calculated 'effective' timezone is tested with the right tool and a fallback to 'local' is added. A warning is printed in the logs. A test for this is added to about.pl too, along with the right warning messages in case of problems. Tests are added for both invalid TZ and to make sure the warning is raised. To test: - Apply the patch - Run: $ kshell k$ prove t/timezones.t => SUCCESS: All tests pass Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 7513c70ef04f9326a8f726556788ea85c098ae60 Author: Tomas Cohen Arazi Date: Wed Apr 4 20:49:07 2018 +0000 Bug 18674: Style changes to match other entries Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 9b1a5cd640a69f6accb6e35eb02eebd35d8af338 Author: Mark Tompsett Date: Mon Apr 2 15:24:25 2018 -0400 Bug 18674: Allow TZ SetEnv for plack It should also be noted that /etc/apache2/sites-enabled/{configuration file} should also contain: RequestHeader add X-Koha-SetEnv "TZ {timezone}" Where {timezone} is the desired instance timezone. Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit e8ac2d38331872bc812f6ed32cf2fc5735a88bde Author: Mark Tompsett Date: Mon Feb 26 15:00:54 2018 +0000 Bug 18674: Added timezone information to about page Before patch: No timezone section After patch: timezone section at bottom of Server information tab. Actual is what is being used. Config overrides environment variables. So if there is confusion why the environment variables aren't working, it will be visible why. Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 015e7ee3331ededee37dd68a7e9743b93605b05a Author: Tomas Cohen Arazi Date: Thu Apr 5 10:31:04 2018 -0300 Bug 20123: Make the timezone entry empty and uncommented by default Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit cb35784d3cf9fc878859200bcab8f577583d8b07 Author: Kyle M Hall Date: Fri Mar 9 09:26:13 2018 -0500 Bug 20123: Add commented out example to koha-conf.xml Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 8fb700b81dac0e180d1acf24c50420b4f6939fd5 Author: Kyle M Hall Date: Tue Feb 27 12:10:59 2018 +0000 Bug 20123: (QA follow-up) If tz is 'local', no need to tell database to set the timezone Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 4cdf3e38afd608bcd0f8a1c7b6918d40ad84859f Author: Kyle M Hall Date: Thu Feb 1 13:21:54 2018 -0500 Bug 20123: Allow multiple instances of Koha to have different timezones on the same server Most of Koha depends on the local timezone of the server, except for Koha::Database which support an ENV override with the key TZ. We should take this a step further. We should not only accept the TZ environment variable for all of Koha, we should really be able to set the timezone in the koha conf file as well so we don't have to pass that environment variable to things like cronjobs and one-off scripts. Test Plan: 1) Apply this patch 2) Set a timzone in your koha_conf file, that is *not* your local time zone Available timzones are listed here: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones 3) Restart apache/plack 4) Perform some actions, check the timestamps in the database and in the html output, note they are for the set timezone and not the local timezone. Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 7 +- C4/Context.pm | 23 +- C4/SIP/ILS/Patron.pm | 15 ++ C4/SIP/Sip/MsgType.pm | 1 + Koha.pm | 2 +- Koha/Database.pm | 3 +- Koha/Middleware/SetEnv.pm | 3 +- about.pl | 34 +++ acqui/addorder.pl | 43 ++-- acqui/neworderempty.pl | 118 +++++++++- catalogue/ISBDdetail.pl | 2 +- debian/templates/koha-conf-site.xml.in | 5 + etc/koha-conf.xml | 5 + .../optional/marc21_simple_bib_frameworks.sql | 22 ++ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 22 ++ .../optional/marc21_simple_bib_frameworks.sql | 22 ++ .../obligatoire/marc21_sample_acq_framework.sql | 22 ++ .../Optionnel/marc21_simple_bib_frameworks.sql | 22 ++ .../Obligatoire/framework_DEFAULT.sql | 25 ++ .../Obligatoire/framework_DEFAULT.sql | 22 ++ .../optional/marc21_simple_bib_frameworks.sql | 22 ++ .../optional/marc21_simple_bib_frameworks.sql | 22 ++ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 22 ++ .../unimarc_bibliographic_DEFAULT_general.sql | 22 ++ installer/data/mysql/sysprefs.sql | 1 + .../marc21_bibliographic_DEFAULT_general.sql | 22 ++ .../unimarc_bibliographic_DEFAULT_general.sql | 22 ++ installer/data/mysql/updatedatabase.pl | 11 + installer/install.pl | 4 +- .../prog/en/includes/html_helpers.inc | 12 + .../intranet-tmpl/prog/en/includes/prefs-menu.inc | 1 - .../prog/en/includes/reports-toolbar.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 86 ++++--- .../prog/en/modules/acqui/neworderempty.tt | 239 ++++++++++++-------- .../en/modules/admin/preferences/acquisitions.pref | 7 + .../en/modules/admin/preferences/cataloguing.pref | 9 + .../prog/en/modules/admin/preferences/labs.pref | 11 - .../prog/en/modules/installer/step1.tt | 2 +- .../prog/en/modules/members/moremember.tt | 51 +++-- .../en/modules/reports/guided_reports_start.tt | 1 + .../bootstrap/en/includes/opac-facets.inc | 6 +- members/moremember.pl | 6 +- opac/opac-illrequests.pl | 2 +- reports/guided_reports.pl | 22 +- t/Biblio/TransformHtmlToXml.t | 12 +- t/db_dependent/SIP/Message.t | 52 ++++- t/db_dependent/SIP/Patron.t | 26 ++- t/timezones.t | 34 +++ 48 files changed, 941 insertions(+), 205 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/labs.pref create mode 100644 t/timezones.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 11 23:24:52 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 11 Apr 2018 21:24:52 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1137-ge5229fd Message-ID: 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 e5229fd68b13e69b47349e9b5c986a6243ee69c6 (commit) from b9b824559d336150afb27836c2c8e36ca3ad4900 (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 e5229fd68b13e69b47349e9b5c986a6243ee69c6 Author: Tomas Cohen Arazi Date: Wed Apr 11 18:08:56 2018 -0300 Bug 20123: (follow-up) Mock timezone in t/Auth_with_shibboleth.t Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/Auth_with_shibboleth.t | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 12 17:14:00 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 12 Apr 2018 15:14:00 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1179-g39be847 Message-ID: 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 39be84754fd5cf4a1bd1f41ed901ad7fa59f8892 (commit) via c57ecd00ae312ad2464fbabeef9a7f2aa262cba5 (commit) via 44041681e102c46693c512a34854db195e14997a (commit) via b44db114211fad704bdf80ae6e8f8471b57477d9 (commit) via c9e23381f3f1b2b8ab7a3ad70aaf07dba2756c5e (commit) via a236b684fdae8e0da83ca7263b948da971dfc849 (commit) via f6155d98e0cf6193efd8224ace68e0755f678df6 (commit) via e3f69fc1146b341878cacdb9bb6f67b42d84b658 (commit) via 62c99195157829ce31e87f7b05eb294c297d43b5 (commit) via b4b558fc2242b0a10e30ad7ec57d2c1f9d66d1f5 (commit) via dff72d446e7aee4ef5ff180db29a51454625bebe (commit) via 9e5297efaaf9f5fd55d10e163ba275f4e04562ee (commit) via db75d5bf035efa92ea0a70956a3abb258283b49c (commit) via 4ad0a0fd9eecfc26d7456bcb9cf9fd0d6599249a (commit) via a7df1f9f8eb9ed16246964d94dd8a69b756b6551 (commit) via 5648b1b45fade82aa4dd5d8df6de7c29a0dd5bd5 (commit) via 297529c251a13bab5817c0fb4f9dd66708229eb1 (commit) via 2057bc5ccd52564c846a47031f889c78b4506cd3 (commit) via 32fc3f9ed14df5cec9e13064c93959fce8dec69c (commit) via 0ea53c745632e3b45bcad2d2238e4b126a323231 (commit) via 49933cd449de64f4f546c929641f86550c00812f (commit) via 420f8b01d4c5420cb6538b75c06c828f90fdaac0 (commit) via 73c905300646c20a0c3c5bbe1a728cd29602f87f (commit) via eae628e22d240df705a9b608a778fe6a1b21a586 (commit) via b2a9c6d540b38039d17636adf9c00c0cd2b0f422 (commit) via 5bfa57165e1df549a56d661808efcb5144f970ef (commit) via aa4d328a3bbe1971a3c4aec9adf8468ce4dbb5c8 (commit) via 4a58a5cca2c1881ac0fdf54c06cab7314d7981e1 (commit) via f2e9d0d8951ecaffba2f055a4df588468951a09f (commit) via 031604f59bc92d68a0cc439d4ddc8b6d9a9660f4 (commit) via 8012cc5ebdd2439791d87c11bce22134d1e76533 (commit) via c252ab6a878cc97da97739b0fb5434692e12bb4b (commit) via 36c4d1441d216f25e69fe9bb9e29d92d103a6b45 (commit) via bebf7d17c9e6b12c5d0abe7253cea26f046311bb (commit) via 7b1d08df0f4f69c52826c80a13158245287f4c00 (commit) via 81819184fcff96e71025f1a3be7f653e8f8b822d (commit) via 5e80f4d81e942d59075fb47906174c00e9220d9c (commit) via d3efdeb2db89f49b73930cf53cbf2e8e658c3215 (commit) via a4db544aa5c2994a8e5ff14a8cfaad53e95a217d (commit) via bd147a38323bb810f85c41134abfc894b0ac8e60 (commit) via de3a15c0a80fe6946827a80ca8e4ffd64078625e (commit) via db274061c25c9ec48cf555f54bc63d42ebe546ed (commit) from e5229fd68b13e69b47349e9b5c986a6243ee69c6 (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 39be84754fd5cf4a1bd1f41ed901ad7fa59f8892 Author: Josef Moravec Date: Tue Apr 10 18:30:09 2018 +0000 Bug 17981: (QA follow-up) Fix and update pod in svc/letters/get Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit c57ecd00ae312ad2464fbabeef9a7f2aa262cba5 Author: Jonathan Druart Date: Wed Apr 11 15:55:04 2018 -0300 Bug 17981: Do not crash if the template is already using TT syntax Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 44041681e102c46693c512a34854db195e14997a Author: Jonathan Druart Date: Fri Sep 15 12:50:32 2017 -0300 Bug 17981: Remove uneeded module JS var As we only support CHECKIN and CHECKOUT for now, we do not need this module variable. It may be useful to re-add it later. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit b44db114211fad704bdf80ae6e8f8471b57477d9 Author: Jonathan Druart Date: Tue Jan 24 17:38:17 2017 +0100 Bug 17981: Move the divs to the top of the modal Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit c9e23381f3f1b2b8ab7a3ad70aaf07dba2756c5e Author: Jonathan Druart Date: Tue Jan 24 17:13:07 2017 +0100 Bug 17981: Better error handling Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit a236b684fdae8e0da83ca7263b948da971dfc849 Author: Jonathan Druart Date: Tue Jan 24 13:31:30 2017 +0100 Bug 17981: Add a preview mode for notice templates This patch is a first step to provide a preview mode for notice templates. CHECKIN, CHECKOUT and HOLD_SLIP are supported so far. Maybe more, but I have not tested yet and the interface will not allow you to generate the preview. The idea is to provide an idea of how will render the messages generated from a notice template. A new "Preview" button is added close to each textarea on the editing notice templates view. For each notice template code (letter_code), we will need some input data to produce the preview. For instance, for CHECKIN we need an barcode. From the barcode we can guess all the other data. For CHECKOUT we will need the borrowernumber and the barcode. Note that the way to enter the data for the preview is not really user-friendly, for CHECKOUT you will have to fill 'borrowernumber|barcode', but the placeholder will help you to know how and what to fill. In the modal window, you will see 4 blocks: 1/ the content of the letter (with the placeholds << >>) 2/ the generated message (with the data filled) 3/ if the letter contained historical syntax markers, the screen will try to generate a notice template using the TT syntax 4/ the generated message from this TT syntax => You will be able to compare the 2 generated messages. What is the goal of this first patchset: - Show this first POC and get feedback from other developpers - Add a way to easily visualise the differences between the 2 syntaxes - Confort users with the TT syntax and the migration step from the historical syntax. I'd like to get opinions before going further. The possibilities: - Mock data to get fully working generated messages for any notice templates. For instance, for CHECKIN and CHECKOUT, the item is not checked in/out yet. So we cannot access the issue's information. (I have no idea how to do that) - Browse the data to get the ones we want to use for the preview (big). Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit f6155d98e0cf6193efd8224ace68e0755f678df6 Author: Jonathan Druart Date: Tue Jan 24 11:18:46 2017 +0100 Bug 17981: Add a 'letter' param to GetPreparedLetter This will allow us to call GetPreparedLetter with a letter content that does not exist in the DB Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit e3f69fc1146b341878cacdb9bb6f67b42d84b658 Author: Jonathan Druart Date: Tue Jan 24 10:09:26 2017 +0100 Bug 17981: Move svc/letters to svc/letters/get To allow another script under svc/letters Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 62c99195157829ce31e87f7b05eb294c297d43b5 Author: Jonathan Druart Date: Mon Apr 2 12:56:21 2018 -0300 Bug 20426: Fix default fund value when adding orders from iso2709 file A new bug has been highlighted since: commit b830349f45007629f141a9835e05b95f90ee4b92 Bug 19453: Incorrect jQuery selector for fund drop down validation Prior to bug 19453 the check on the existence of the fund did not work as expected, no select with name='budget_code' existed and the error was never raised. Now it works but expect a fund to be selected for every record to import. This check must only be done if there is no default value selected. Test plan: - Create an order from a staged file - Do not select any funds => You must get a warning - Select a specific fund for some of the records => You must get a warning - Select a default fund in the last tab => You must not get a warning and the records must be imported and inserted with the correct fund Signed-off-by: Sonia Bouis Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit b4b558fc2242b0a10e30ad7ec57d2c1f9d66d1f5 Author: Nick Clemens Date: Wed Apr 11 18:19:58 2018 +0000 Bug 18904: (follow-up) Use Ctrl+Shift+L Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit dff72d446e7aee4ef5ff180db29a51454625bebe Author: Marcel de Rooy Date: Mon Apr 9 12:55:38 2018 +0200 Bug 18904: (QA follow-up) Do not put authid in searchbox of blinddetail Adding trivial test if subfield equals 9. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 9e5297efaaf9f5fd55d10e163ba275f4e04562ee Author: Nick Clemens Date: Fri Apr 6 12:30:16 2018 +0000 Bug 18904: (follow-up) Rebase onto 14769 Signed-off-by: Marcel de Rooy Amended: simplified if-then-else around cur_field.setIndicator[12]. Signed-off-by: Jonathan Druart commit db75d5bf035efa92ea0a70956a3abb258283b49c Author: Nick Clemens Date: Thu Mar 15 10:18:54 2018 +0000 Bug 18904: (follow-up) Set indicators and correct js path TO test: 1 - Have an authority with some indicators 2 - Link a field in rancor to that authority 3 - See that you get some indicators (same in unimarc, diff in marc21) Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 4ad0a0fd9eecfc26d7456bcb9cf9fd0d6599249a Author: Nick Clemens Date: Fri Oct 27 11:17:09 2017 +0000 Bug 18904: Remove debugging code Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit a7df1f9f8eb9ed16246964d94dd8a69b756b6551 Author: Nick Clemens Date: Thu Jul 20 10:23:49 2017 +0000 Bug 18904: (follow-up) Retrieve subfield in the order they are stored Use subfields in the order they are stored. This patch removes use of an intermediate hash for storing values. Order of subfields as obtained from authority is now preserved. Also removes useless code that was intended to set $2 subfields Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 5648b1b45fade82aa4dd5d8df6de7c29a0dd5bd5 Author: Nick Clemens Date: Thu Jul 6 17:49:14 2017 +0000 Bug 18904: (follow-up) Fix whitespace and don't use hardcoded path Fix whitespace/tabs use [% interface %] not intranet-tmpl Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 297529c251a13bab5817c0fb4f9dd66708229eb1 Author: Nick Clemens Date: Thu Jul 6 16:35:38 2017 +0000 Bug 18904: Advanced editor - Rancor - Add authority support This patchset adds the ability to use the authorities search to select or clear fields in the advanced editor To test: 1 - Open a record in the advanced cataloging editor 2 - Press 'Ctrl+L' while in a field that shuold not be linked to authorities (300 for instance) 3 - Nothing should happen 4 - Try it in a field that should be linked 5 - You should get the authorities pop-up 6 - Values in pop-up should be populated from values in record (as appropriate for authority type) 7 - Correct authority type should be selected ( PERSO_NAME for 100, TOPIC_TERM for 650, etc.) 8 - Press 'Clear', field should be blanked 9 - Search again and select an authority 10 - Field should be correctly populated Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 2057bc5ccd52564c846a47031f889c78b4506cd3 Author: Jonathan Druart Date: Tue Apr 10 14:50:16 2018 -0300 Bug 14769: DBRev 17.12.00.029 Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit 32fc3f9ed14df5cec9e13064c93959fce8dec69c Author: Marcel de Rooy Date: Thu Apr 12 08:54:34 2018 +0200 Bug 14769: (QA follow-up) Remove global var $cached_indicators As requested by RM, this patch replaces using the global $cached_indicators by saving state temporarily during the (limited) lifetime of the object. Essentially this affects two places in code: [1] blinddetail-biblio-search.pl (loading auth record in editor) [2] AuthoritiesMarc::merge (merging authority into biblios) Concurrent runs of [1] and/or [2] together with a simultaneous pref change just in between could cause slight (hypothetical) side-effects. The current approach of keeping state in the object makes that a series of controlled_indicators calls during an immediate merge of one specific authority is not affected by a simultaneous pref change. So the same rules are applied to the set of attached biblio record for that authority. Note also that the cron job ignores a simultaneous pref change, since it reads from the unchanged L1 cache (yes, also hypothetical). Test plan: [1] Run t/Koha/Authority/ControlledIndicators.t [2] Run t/db_dependent/Authority/Merge.t [3] Run t/db_dependent/Koha/Authorities.t Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 0ea53c745632e3b45bcad2d2238e4b126a323231 Author: Marcel de Rooy Date: Fri Feb 9 12:18:10 2018 +0100 Bug 14769: (Follow-up) Let blinddetail look at indicator values If the indicators are not controlled, blinddetail should not overwrite what the user already entered. Very strictly seen, we could say that it is outside the scope. But it is strongly related. Signed-off-by: Marcel de Rooy Tested with 100 and 600 in the cataloging editor. For 100 the second indicator should not be overwritten. For 600 it should. Also tested "ind2:" which should blank ind2. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 49933cd449de64f4f546c929641f86550c00812f Author: Marcel de Rooy Date: Fri Feb 9 09:03:26 2018 +0100 Bug 14769: (Follow-up) Reduce number of preference parses In sub merge the Koha::Authority object was already created, so it was kind of silly to recreate it each time with new. In Koha::Authority, the ControlledIndicators object can be saved in the object too for reuse during its life time. Similarly, we prevent repeated lookups for the reporting tag (via authority type). Test plan: [1] Run t/db_dependent/Authority/Merge.t [2] Run t/db_dependent/Koha/Authorities.t Signed-off-by: Marcel de Rooy Limited benchmarking shows me a reduction of 11% on Merge.t and a reduction of 4% on Authorities.t when comparing with and without this last patch. The larger impact on Merge.t could be expected. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 420f8b01d4c5420cb6538b75c06c828f90fdaac0 Author: Marcel de Rooy Date: Fri Jan 26 10:17:33 2018 +0100 Bug 14769: Put ControlledIndicators to work This patch does: [1] Adds Koha::Authority->controlled_indicators (with a test). [2] Adds a call to controlled_indicators in AuthoritiesMarc::merge. Unit test Merge.t is extended too. [3] Simplifies the code in authorities/blinddetail-biblio-search.pl by calling controlled_indicators. Test plan: [1] Run t/db_dependent/Koha/Authorities.t [2] Run t/db_dependent/Authority/Merge.t [3] Steps 3 to 7 for MARC21: Create a PERSO_NAME authority with 008/11=r and ind1=3 [4] Edit a biblio and add a 600 linked to the new authority. [5] Verify that the biblio has ind1==3 and ind2==7 and $2==aat. (If $2 is not visible, check the metadata in biblio_metadata.) [6] Edit the PERSO_NAME authority and change 008/11 to '|' (bar). [7] Verify that merge updated your biblio record: $ind2==4 and $2 gone. [8] UNIMARC: Follow the pattern from steps 3 to 7. Create authority, link it in a biblio, check indicators (they should be copied both). Edit authority, change indicators and verify the merge results in the biblio record. Signed-off-by: Marcel de Rooy Tested PERSO_NAME and UNIF_TITLE. For UNIF_TITLE the second authority indicator is copied to ind1 or ind2, depending on the biblio tag involved. Signed-off-by: Julian Maurice Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 73c905300646c20a0c3c5bbe1a728cd29602f87f Author: Marcel de Rooy Date: Thu Feb 8 12:59:08 2018 +0100 Bug 14769: Add preference AuthorityControlledIndicators Including: [1] Atomic update to add pref for existing installs [2] Add new pref to sysprefs.sql for new installs [3] Add description to authorities preference file. Test plan: [1] Run new install or upgrade to add pref. [2] Check value of pref via System preferences in staff interface. Signed-off-by: Marcel de Rooy Signed-off-by: Julian Maurice Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit eae628e22d240df705a9b608a778fe6a1b21a586 Author: Marcel de Rooy Date: Tue Feb 6 16:47:12 2018 +0100 Bug 14769: Add tests for _thesaurus_info in ControlledIndicators.t Apart from adding tests for this sub, we make the following change too and support it with a test. The fallback to $code in the construction $thes_mapping{ $code } // $code // '4' is removed by this patch. When $code is not in $thes_mapping, we cannot assume that it is a valid code for a biblio indicator. In this case it is more safe to mark it as 4 (Source not specified). Test plan: Run t/Koha/Authority/ControlledIndicators.t Signed-off-by: Marcel de Rooy Signed-off-by: Julian Maurice Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit b2a9c6d540b38039d17636adf9c00c0cd2b0f422 Author: Janusz Kaczmarek Date: Fri Nov 24 22:21:48 2017 +0100 Bug 14769: Biblio indicators based on authority's thesaurus code Original patch from Janusz Kaczmarek on November 24, 2017. Amended by Marcel de Rooy on February 6, 2018. Code moved from AuthoritiesMarc.pm to ControlledIndicators.pm. Special attention has been paid to the proper application of 008/11 while controlling 6XX in MARC 21, specially if 008/11 =~ /[rsz]/ (and if it is 'z' and 040 $f is defined). Test plan: See next patch. Signed-off-by: Marcel de Rooy The construction $thes_mapping{ $code } // $code // '4' will still get some attention on a follow-up. Signed-off-by: Julian Maurice Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 5bfa57165e1df549a56d661808efcb5144f970ef Author: Marcel de Rooy Date: Fri Jan 26 11:06:59 2018 +0100 Bug 14769: Introduce Koha::Authority::ControlledIndicators This module reads its settings from pref AuthorityControlledIndicators. The get method allows you to retrieve indicator values for specific biblio fields. Test plan: Run t/Koha/Authority/ControlledIndicators.t Signed-off-by: Marcel de Rooy Signed-off-by: Julian Maurice Signed-off-by: Marcel de Rooy Amended: Added a test to show that "ind1:" returns empty string. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit aa4d328a3bbe1971a3c4aec9adf8468ce4dbb5c8 Author: Jonathan Druart Date: Thu Apr 12 10:48:17 2018 -0300 Bug 9701: DBRev 17.12.00.028 Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit 4a58a5cca2c1881ac0fdf54c06cab7314d7981e1 Author: Marcel de Rooy Date: Mon Apr 9 09:08:59 2018 +0200 Bug 9701: (QA follow-up) DBIx schema changes Changes in MarcTagStructure.pm Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit f2e9d0d8951ecaffba2f055a4df588468951a09f Author: Josef Moravec Date: Mon Feb 19 10:36:04 2018 +0000 Bug 9701: (follow-up) Adjust tests Test plan: prove t/db_dependent/Biblio.t should be green Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 031604f59bc92d68a0cc439d4ddc8b6d9a9660f4 Author: Joachim Ganseman Date: Sat Jun 4 12:58:36 2016 +0000 Bug 9701: Configure default indicator This patch adds the possibility to define default indicators in the MARC frameworks. It adds 2 columns in the marc_tag_structure table in the database in order to accomplish this. All files that reference this table have also been updated to reflect these added fields. Test: Add or edit a MARC framework. In the Field list should be 2 extra columns. It should be possible to add default indicators (1 character) in these fields. Nothing else should have changed in the meantime. The default indicator values are not yet visible in the cataloguing module. The default values are also loaded in the cataloguing form. Test: Define default values in some MARC framework. Go to cataloguing and create a new record using this framework. Verify that the defined defaults are visible when set. Verify the default is empty (as before) if no default was set. Verify that if the default is changed, the record is saved with the manually changed value. Verify that upon changing such a new record, the manually set indicator value is used and not the default one from the framework. Don't forget to run database and database schema update Signed-off-by: Eugene Jose Espinoza Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 8012cc5ebdd2439791d87c11bce22134d1e76533 Author: Jonathan Druart Date: Fri Feb 23 13:45:09 2018 -0300 Bug 19936: Reuse existing userid if none provided Found this regression when working on other patches: If you edit a patron and blank the userid field, it will be regenerated with an incremented value (firstname.surname will be firstname.surname1) This is because we use a non-existing patron and ->in_storage in has_valid_userid is always false. The trick here is to backup the value, generate the userid, then reset userid to the previous value. As the POD says, it will be fix later, when AddMember and ModMember will be replaced with Koha::Patron->store Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit c252ab6a878cc97da97739b0fb5434692e12bb4b Author: Jonathan Druart Date: Wed Feb 21 16:10:30 2018 -0300 Bug 19936: Replace Check_userid - Update the occurrences Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 36c4d1441d216f25e69fe9bb9e29d92d103a6b45 Author: Jonathan Druart Date: Tue Jan 9 10:33:25 2018 -0300 Bug 19936: Remove warnings from tests C4::Members did not "use warnings;" Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit bebf7d17c9e6b12c5d0abe7253cea26f046311bb Author: Jonathan Druart Date: Tue Jan 9 10:27:34 2018 -0300 Bug 19936: Remove the subroutine Generate_Userid Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 7b1d08df0f4f69c52826c80a13158245287f4c00 Author: Jonathan Druart Date: Mon Jan 8 18:44:25 2018 -0300 Bug 19936: Replace Generate_Userid - Update the occurrences Test plan: Same test plan as previous patch: add/update/import patrons and watch the userid Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 81819184fcff96e71025f1a3be7f653e8f8b822d Author: Jonathan Druart Date: Mon Jan 8 18:48:49 2018 -0300 Bug 19936: Adapt tests And prove that we are not cheating Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 5e80f4d81e942d59075fb47906174c00e9220d9c Author: Jonathan Druart Date: Mon Jan 8 18:44:56 2018 -0300 Bug 19936: Add the Koha::Patron->generate_userid method Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit d3efdeb2db89f49b73930cf53cbf2e8e658c3215 Author: Jonathan Druart Date: Mon Jan 8 18:35:58 2018 -0300 Bug 19936: Move and add tests for Generate_Userid Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit a4db544aa5c2994a8e5ff14a8cfaad53e95a217d Author: Jonathan Druart Date: Mon Jan 8 18:05:29 2018 -0300 Bug 19936: Remove the subroutine Check_Userid It is no longer in user, we can remove it. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit bd147a38323bb810f85c41134abfc894b0ac8e60 Author: Jonathan Druart Date: Mon Jan 8 18:04:56 2018 -0300 Bug 19936: Replace Check_userid - Update the occurrences We previously prove that the method and the subroutine were equivalent, we know update the controller calls. Test plan: - Add and update a patron with different variations of userid (automatically generated or not) - Import patrons with and without userid, as well as with existing userid Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit de3a15c0a80fe6946827a80ca8e4ffd64078625e Author: Jonathan Druart Date: Mon Jan 8 17:50:48 2018 -0300 Bug 19936: Add the Koha::Patron->has_valid_userid method Reuse how C4::Members::Check_Userid works and adapt it to write Koha::Patron->check_userid Adapt the tests to use this new method. The tests still pass, we can adapt the different callers Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit db274061c25c9ec48cf555f54bc63d42ebe546ed Author: Jonathan Druart Date: Mon Jan 8 17:14:49 2018 -0300 Bug 19936: Replace Check_userid - just move the tests This patch moves the tests related to Check_userid out of Members.t The tests must pass with only this patch applied Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 14 +- C4/Biblio.pm | 8 +- C4/Letters.pm | 26 +- C4/Members.pm | 70 +----- Koha.pm | 2 +- Koha/Authority.pm | 55 +++++ Koha/Authority/ControlledIndicators.pm | 154 ++++++++++++ Koha/Patron.pm | 77 ++++++ Koha/Patrons/Import.pm | 26 +- Koha/Schema/Result/MarcTagStructure.pm | 22 +- admin/marctagstructure.pl | 28 ++- authorities/blinddetail-biblio-search.pl | 83 ++----- cataloguing/addbiblio.pl | 4 +- cataloguing/editor.pl | 4 + installer/data/mysql/kohastructure.sql | 2 + installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 76 +++++- .../lib/koha/cateditor/marc-editor.js | 25 ++ .../prog/en/includes/cateditor-ui.inc | 8 + .../prog/en/modules/acqui/addorderiso2709.tt | 22 +- .../prog/en/modules/admin/marctagstructure.tt | 12 + .../en/modules/admin/preferences/authorities.pref | 7 + .../authorities/blinddetail-biblio-search.tt | 47 +++- .../prog/en/modules/cataloguing/editor.tt | 5 + .../intranet-tmpl/prog/en/modules/tools/letter.tt | 92 ++++++- .../prog/en/modules/tools/preview_letter.tt | 57 +++++ members/memberentry.pl | 15 +- svc/{letters => letters/get} | 12 +- svc/letters/preview | 250 ++++++++++++++++++++ t/Koha/Authority/ControlledIndicators.t | 122 ++++++++++ t/db_dependent/Authority/Merge.t | 39 ++- t/db_dependent/Biblio.t | 6 +- t/db_dependent/Koha/Authorities.t | 35 ++- t/db_dependent/Koha/Patrons.t | 119 +++++++++- t/db_dependent/Members.t | 40 +--- tools/letter.pl | 4 + 36 files changed, 1330 insertions(+), 239 deletions(-) create mode 100644 Koha/Authority/ControlledIndicators.pm create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt rename svc/{letters => letters/get} (91%) create mode 100644 svc/letters/preview create mode 100644 t/Koha/Authority/ControlledIndicators.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 13 18:41:21 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Apr 2018 16:41:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1193-g274974f Message-ID: 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 274974fdb82c0ed712b1198200554dc849ce2b67 (commit) via 952c03d6f9d8be29decb4585f3810017f64917ca (commit) via 6c36042e858068f01494bf129e82a62b48cc4e10 (commit) via b7960a7311bccab007e50d586159814f94f848c3 (commit) via 8470024657a9516ae4f50c4cb75f59f16056824a (commit) via 639591f072a64f228a9eb0bb62c0337aea91c322 (commit) via 4626a6f5a58bd8cd3992d9e369b5ae94593443fd (commit) via ae542767cbe496c19aba159325f005bbe7b804f4 (commit) via 0ac45a4a68a567b249d4b5220541ae5461dfed81 (commit) via ed7543287b5e0bb3fadf851d761eb116a79ea727 (commit) via 4fe8b62f8429bde8f73d893ca34d0dec4de0f91c (commit) via 32b6c50855166efbfbc21e08cb9f417577d29e44 (commit) via c43af09eb4976e1790f601cd262d22b731a74ea0 (commit) via 2a04fdbe609ddf1abe7a74a5046e0e517035ae38 (commit) from 39be84754fd5cf4a1bd1f41ed901ad7fa59f8892 (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 274974fdb82c0ed712b1198200554dc849ce2b67 Author: Jonathan Druart Date: Fri Apr 13 13:31:23 2018 -0300 Bug 19882: DBRev 17.12.00.030 Signed-off-by: Jonathan Druart commit 952c03d6f9d8be29decb4585f3810017f64917ca Author: Nick Clemens Date: Thu Apr 12 13:51:17 2018 +0000 Bug 19882: (follow-up) Add 'IGNORE' in DB update Signed-off-by: Jonathan Druart commit 6c36042e858068f01494bf129e82a62b48cc4e10 Author: Nick Clemens Date: Wed Dec 27 13:18:26 2017 +0000 Bug 19882: Add Novelist Select staff client profile This patchset allows for use of a separate Novelist profile for the staff client and opac. This allows Novelist to determine links and special styling for each. Testing is best with novelist credentials, however, confirming that values are set and used correctly and nothing is broken should suffice. To test: 1 - Apply patches 2 - Update database 3 - View detail pages for some records on opac and staff client and ensure no changes have been made 4 - Enable NovelistSelectStaffEnabled (and enter or have info in the Profile and password) 5 - Set NovelistSelectStaffView to 'above' 6 - View detail pages for some records, verify that if novelist info is available it is displayed and nothing is displayed if not 7 - Repeat with all staff view options Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit b7960a7311bccab007e50d586159814f94f848c3 Author: Jonathan Druart Date: Fri Apr 13 12:08:07 2018 -0300 Bug 20538: ->tag is private - tell it explicitly Signed-off-by: Jonathan Druart commit 8470024657a9516ae4f50c4cb75f59f16056824a Author: Julian Maurice Date: Thu Apr 12 11:21:05 2018 +0200 Bug 20538: Add POD for Asset.pm Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 639591f072a64f228a9eb0bb62c0337aea91c322 Author: Julian Maurice Date: Thu Apr 12 11:05:31 2018 +0200 Bug 20538: Move categories.js out of language directory This was the last js/css file inside a language directory Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 4626a6f5a58bd8cd3992d9e369b5ae94593443fd Author: Julian Maurice Date: Thu Apr 12 10:30:10 2018 +0200 Bug 20538: Fix 2 JS paths Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit ae542767cbe496c19aba159325f005bbe7b804f4 Author: Julian Maurice Date: Thu Apr 12 10:28:45 2018 +0200 Bug 20538: Fix copyright notice in Asset.pm Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 0ac45a4a68a567b249d4b5220541ae5461dfed81 Author: Josef Moravec Date: Thu Apr 12 06:57:25 2018 +0000 Bug 20538: (follow-up) Update discharges request page with Asset plugin This is follow-up of bug 20524 Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit ed7543287b5e0bb3fadf851d761eb116a79ea727 Author: Julian Maurice Date: Fri Apr 6 17:02:55 2018 +0200 Bug 20538: Remove the need of writing [% KOHA_VERSION %] everywhere Having to write [% KOHA_VERSION %] for each url is bad because: - It's easily forgettable when adding new