From gitmaster at git.koha-community.org Fri Feb 1 13:44:53 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 12:44:53 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-62-g6fe65f1 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, 18.11.x has been updated via 6fe65f120ffcce7e182feb5bb7f9b425774857f7 (commit) via 23665e562e9b7d9e5c27cb2cab8fa8fc59f54071 (commit) via 17231a2c35f13bef2fc19551cb7c3c7110e5c438 (commit) via 81c6172ee224f7432ec809f8a9cd17f9c4971ecc (commit) via f087b9895eb97f29a5a712dfcb3d0946fd570afd (commit) via ddbfc92aa601e672535c4478eb8e65e624a7d53f (commit) via 582a84a6c7328efe78bbacaad293e4e21e6785ca (commit) via 30895e2c561215fa7c094c9838021a0095a578ba (commit) via c22928630ac2c00501b2bb17d60a3b2ba99481c5 (commit) via fe56745739adcec6a7cb441ced3c359369aacca1 (commit) via 80ebbb60996ac744f8717f8e68440b66964e1fc7 (commit) from 2b8ba2e55874d2837c98a213afca0f4458767b05 (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 6fe65f120ffcce7e182feb5bb7f9b425774857f7 Author: Martin Renvoize Date: Fri Feb 1 12:26:59 2019 +0000 Bug 21089: Compiled CSS Signed-off-by: Nick Clemens (cherry picked from commit 5c547ffff2ca04a87695a57e972171cd76cc828c) (rmaint recompiled for 18.11.x series) Signed-off-by: Martin Renvoize commit 23665e562e9b7d9e5c27cb2cab8fa8fc59f54071 Author: Owen Leonard Date: Mon Jan 7 13:48:55 2019 +0000 Bug 21089: Overlapping elements in ordering information on acqui/supplier.pl This patch changes the HTML structure of the vendor edit page so that the markup is a little simpler. CSS is modified to match. This structure should serve as a model for other similar form structures:
To test, apply the patch and regenerate the staff client CSS. - Go to Acquisitions -> Vendor search -> Vendor -> Edit vendor - In the "Ordering information" section, confirm that the position of radio buttons looks correct. - Confirm that radio button labels work correctly. - Confirm that the adjacent dropdown menus work well. Signed-off-by: David Cook Signed-off-by: Nick Clemens (cherry picked from commit 5c547ffff2ca04a87695a57e972171cd76cc828c) Signed-off-by: Martin Renvoize commit 17231a2c35f13bef2fc19551cb7c3c7110e5c438 Author: Tomas Cohen Arazi Date: Mon Jan 28 12:23:35 2019 -0300 Bug 21478: (QA follow-up) Make sure tests don't fail randomly Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit e33f125384694dd825965dffae8d2ca31840aecf) Signed-off-by: Martin Renvoize commit 81c6172ee224f7432ec809f8a9cd17f9c4971ecc Author: Tomas Cohen Arazi Date: Fri Jan 25 13:49:37 2019 -0300 Bug 21478: Make Koha::Hold->suspend reject found holds Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 1d5934cae52dd96d9c5b8685a5f5531c69e92df8) Signed-off-by: Martin Renvoize commit f087b9895eb97f29a5a712dfcb3d0946fd570afd Author: Tomas Cohen Arazi Date: Fri Jan 25 13:48:54 2019 -0300 Bug 21478: Unit tests Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 92db2e74fd3cd761ae67d2f7573ee03d32d0a8ed) Signed-off-by: Martin Renvoize commit ddbfc92aa601e672535c4478eb8e65e624a7d53f Author: Tomas Cohen Arazi Date: Fri Jan 25 12:48:04 2019 -0300 Bug 21478: Add Koha::Exceptions::Hold Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 11ce911915a237047d8168876849de3df2b3b2e0) Signed-off-by: Martin Renvoize commit 582a84a6c7328efe78bbacaad293e4e21e6785ca Author: Nick Clemens Date: Mon Jan 28 11:32:55 2019 +0000 Bug 21877: (RM follow-up) Move space into conditional Signed-off-by: Nick Clemens (cherry picked from commit 5b4cbb1643aa20ada17c3f73df3e59dfc5a3dbd8) Signed-off-by: Martin Renvoize commit 30895e2c561215fa7c094c9838021a0095a578ba Author: Fridolin Somers Date: Tue Jan 22 09:45:02 2019 +0100 Bug 21877: Use AuthorisedValues.GetDescriptionByKohaField for notforloan in checkout Using only TT plugin for authorised value description is a better code. Test plan : Part 1: 1.1) On a catalog with items.notforloan defined with authorized values category NOT_LOAN 1.2) Define in NOT_LOAN an authorized values 1 with description 'at the beach' 1.3) Define in NOT_LOAN an authorized values 2 with description empty Part 2: 2.1) Set preference 'AllowNotForLoanOverride' to 'Don't allow' 2.2) Edit an item with notforloan=1 2.3) Checkout this item => You see 'Item not for loan (at the beach)' 2.4) Edit an item with notforloan=2 2.5) Checkout this item => You see 'Item not for loan' Part 3: 3.1) Set preference 'AllowNotForLoanOverride' to 'Allow' 3.2) Edit an item with notforloan=1 3.3) Checkout this item => You see 'Item is normally not for loan (at the beach)' 3.4) Edit an item with notforloan=2 3.5) Checkout this item => You see 'Item is normally not for loan' Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 36df53ad8d4987e938e478d934d553b73e7450f2) Signed-off-by: Martin Renvoize commit c22928630ac2c00501b2bb17d60a3b2ba99481c5 Author: Fridolin Somers Date: Tue Jan 22 09:47:22 2019 +0100 Bug 21877: Show authorized value description for withdrawn in checkout During checkout the withdrawn information is displayed in a message : "Item has been withdrawn". Like in other pages and like notforloan, we should display the withdrawn authorized value description. This patch adds this display. Add so that translation does not change. Also adds class 'co-withdrawn' (like in checkin 'ci-*' classes) to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Edit an item with withdrawn=1 5) Checkout this item => You see 'Item has been withdrawn (dropped in trash)' 6) Edit an item with withdrawn=2 7) Checkout this item => You see 'Item has been withdrawn' Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit cfd59672bb09c4766632de4c6f11cf9cf4bea3f9) Signed-off-by: Martin Renvoize commit fe56745739adcec6a7cb441ced3c359369aacca1 Author: Nick Clemens Date: Thu Jan 24 14:57:46 2019 +0000 Bug 22203: Holds modal does not link to patorn account To test: 1 - Place a hold for a patron 2 - Check the item in at the pickup location 3 - Note the holds modal does not link to patron 4 - Apply patch 5 - Check in item again 6 - Patron name in modal is a link Signed-off-by: Maryse Simard Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 258c538e76914e6c2023242b555bb38c6f1970b9) Signed-off-by: Martin Renvoize commit 80ebbb60996ac744f8717f8e68440b66964e1fc7 Author: Owen Leonard Date: Mon Jan 14 14:17:23 2019 +0000 Bug 21989: JS error in "Add orders from MARC file" - addorderiso2709.pl This patch undoes the changes to addorderiso2709.tt introduced by Bug 19753. The item information tab can include embedded JavaScript for cataloging plugins, and these don't currently work with JS in the footer. To test, apply the patch and test the JavaScript driven features of the "Add to basket from a staged file" page: - Acquisitions -> Vendor -> Basket -> Add to basket from a staged file - MARC and Card previews, select all/clear all - Item information tab: Cataloging plugins for fields like date acquired, barcode - Default accounting details tab: Show inactive control Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 5ab46bc24573165e540a1a287ea3438637c938e3) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Exceptions/Hold.pm | 69 ++++++++ Koha/Hold.pm | 24 ++- circ/circulation.pl | 4 +- .../intranet-tmpl/prog/css/src/staff-global.scss | 7 + koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 182 ++++++++++---------- .../prog/en/modules/acqui/supplier.tt | 110 +++++++----- .../prog/en/modules/circ/circulation.tt | 14 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 +- t/Koha/Exceptions.t | 23 ++- t/db_dependent/Hold.t | 105 ++++++++++- 11 files changed, 383 insertions(+), 161 deletions(-) create mode 100644 Koha/Exceptions/Hold.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 14:15:06 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 13:15:06 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-67-g52e13bf 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, 18.11.x has been updated via 52e13bf70c68df255b241f248ec138b96cc41cf1 (commit) via 89212f37c75e8e161239945b77248955355e5f18 (commit) via 4c928041f1ee5ec4c21aab24dfd7f69399ae330f (commit) via 8756b9e2c08700300d6973df70869bd87dd93601 (commit) via a4345d8af3b6e30d21d7cd310dc144fd50d04b8e (commit) from 6fe65f120ffcce7e182feb5bb7f9b425774857f7 (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 52e13bf70c68df255b241f248ec138b96cc41cf1 Author: Jasmine Amohia Date: Tue Jan 15 21:34:32 2019 +0000 Bug 20569: Improved description of CheckPrevCheckout system preference The CheckPrevCheckout preference can be overriden by a setting in the patron categories, I've edited the options to reflect this. Test plan: 1. Check the CheckPrevCheckout system preferences and confirm that the options are clear Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 9b69ceeac64850dce05b56c978856bd5d1c43b06) Signed-off-by: Martin Renvoize commit 89212f37c75e8e161239945b77248955355e5f18 Author: Jasmine Amohia Date: Wed Jan 16 00:54:52 2019 +0000 Bug 22138: updated tab names on members/paycollect.pl Test plan: 1. Give patron outstanding fees 2. Search patron and select 'Make payment' 3. Select either 'Pay' or 'Write off' 4. Confirm that first tab title remains as 'Transactions' 5. Confirm that current tab title remains as 'Make a payment' Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 0584d96bc082b5a7ab2b80af69fe2b7cebcbd188) Signed-off-by: Martin Renvoize commit 4c928041f1ee5ec4c21aab24dfd7f69399ae330f Author: Caroline Cyr La Rose Date: Tue Jan 8 09:28:35 2019 -0500 Bug 22083: Typo in circulation_batch_checkouts.tt There is a typo in circulation_batch_checkouts.tt that makes Koha skip a warning if the user cannot borrow due to circulation rules. This patch corrects this typo. To test: 1. In Administration > Global system preferences, 'Allow' BatchCheckouts and enter patron categories in BatchCheckoutsValidCategories 2. Go to Administration > Circulation and fines rules 3. Enter a rule where a certain category of patrons (that is in BatchCheckoutsValidCategories) cannot take out a particular item type 4. Search the catalog for an item of that item type 5. Copy the barcode 6. Go into patrons and find a patron of that category 7. Click on the Batch checkout tab 8. Paste the barcode in the box and click Check out 9. It should say 'Too many checked out' 10. Apply the patch 11. Try the check out again, it should show both warnings ('Too many checked out' and 'This patron can't check out this item per library circulation policy') Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 3ee95bd0213943b625ea5a35eb04e45835cf6f65) Signed-off-by: Martin Renvoize commit 8756b9e2c08700300d6973df70869bd87dd93601 Author: Tomas Cohen Arazi Date: Mon Jan 7 14:06:01 2019 -0300 Bug 22066: Record library_id for manual credits On creating manual credits, the (newly introduced) branchcode should be set now. This trivial patch makes it work. To test: - Create a manual credit for a known patron - Using MySQL check the result: $ sudo mysql > SELECT * FROM accountlines WHERE borrowernumber=; => FAIL: The created accountline row has NULL for the branchcode - Apply this patch - Create a manual credit for the patron - Run: > SELECT * FROM accountlines WHERE borrowernumber=; => SUCCESS: branchcode is set correctly -Sign off :-D Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 094a1cb0703b22d18c061cdc4879c1fc3c76ea80) Signed-off-by: Martin Renvoize commit a4345d8af3b6e30d21d7cd310dc144fd50d04b8e Author: Lucas Gass Date: Fri Jan 25 15:37:21 2019 +0000 Bug 22207: course reserves page does not have unique id Test plan: Go to cgi-bin/koha/opac-course-reserves.pl in the OPAC and make sure the body id is opac-course-reserves Signed-off-by: Owen Leonard Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 358adce2e75bdd317165c86a9b5064bc52d9e2ad) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref | 4 ++-- .../prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt | 2 +- members/mancredit.pl | 3 +++ 5 files changed, 9 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 16:10:10 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 15:10:10 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-18-g3dc0aa4 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, 18.05.x has been updated via 3dc0aa4293c8997d4660c710727ea0e2235887f4 (commit) from abaefea4187b78086aae40b91cdd0c2745eee504 (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 3dc0aa4293c8997d4660c710727ea0e2235887f4 Author: Jonathan Druart Date: Mon Dec 17 12:55:34 2018 -0300 Bug 21170: Remove "isn't numeric in numeric eq (==)" warnings in MARCdetail Easily removed switching the two conditions. Test plan: Hit catalogue/MARCdetail.pl?biblionumber=1 => Without this patch you will see in the log warnings like Argument "ddc" isn't numeric in numeric eq (==) at /home/vagrant/kohaclone/catalogue/MARCdetail.pl line 277. => With this patch applied the warnings do no longer appear Signed-off-by: Pierre-Marc Thibault Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit b608f548a894cb433c4218b94a33d6b8a824a4c4) Signed-off-by: Martin Renvoize (cherry picked from commit 2cceecd43866efd56d84ab45c6b4e9f10895533f) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: catalogue/MARCdetail.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 17:03:08 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 16:03:08 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-92-g574c89e 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, 18.11.x has been updated via 574c89ef49fdb573d89cca4b28a74a65adb18132 (commit) via 3c8f67afe8d6e4dcc044d5f97a66336bd76af93e (commit) via a9b3b01dd9290f964d739e0f2f818990d9a6e9ba (commit) via 14e2dd9c9f6ee3c2796954f3e25433197c41f9d5 (commit) via 4730724c661d50df4268d581691cc73de8500186 (commit) via 3741027605b61b0e988fd7e8df8ec60dc5fe5b99 (commit) via 92001cc504d03f3aa20b5295154e9ae66c0a530e (commit) via e3fde6153e66b7c01b804ec7c36e22706abd3e27 (commit) via 527b5a309757c328b1927fe18cfed8dc7bae4f4f (commit) via 4bc613011026ac4e510adc1b1c67e9a724a7d21d (commit) via 5f733763d048de2f39d52ee21f1a7f099637f79a (commit) via 697d748f4016e1eaa99a0dde2b29180083e710db (commit) via 8a8e76bf19f14708cbce645df6744468f0f14a45 (commit) via 69802bed3e61f2039c14952480e57540e8f03ca8 (commit) via 75bda2a8743f37919efc3132d190ce70efa3c12c (commit) via c8ca6926ed114062d4a55ce981b32ffeb670fc7a (commit) via b27150cf9a4c62a636ed7d158e1fe44941de189b (commit) via 1debd138ca3603b7bf7fa0929553203c7bcbe2ac (commit) via 1c7b06b13a79f39bb73cadf3bbaada9d5a48bf20 (commit) via 62d5d98371a673bb8c1c15d5dad382cf866879d2 (commit) via e96eed9b841394353cc5c4484ddc608432e22d29 (commit) via ba8cd76c6239ed71246c26666f16f07f56b731b7 (commit) via e227fea2a23b9da2f201e49934018342109c9cd7 (commit) via ea8bd52f6dbb6aab6aabb1d9e191b0356ba1a529 (commit) via e9e29c3592defd30e3ea685b2770c67da7a54bef (commit) from 52e13bf70c68df255b241f248ec138b96cc41cf1 (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 574c89ef49fdb573d89cca4b28a74a65adb18132 Author: Nick Clemens Date: Thu Jan 31 13:36:04 2019 +0000 Bug 22132: DBRev 18.11.02.001 Signed-off-by: Nick Clemens (cherry picked from commit 914f448fe1c1d5c01e3188a827a0d18ec3001b45) Signed-off-by: Martin Renvoize commit 3c8f67afe8d6e4dcc044d5f97a66336bd76af93e Author: Tomas Cohen Arazi Date: Wed Jan 30 15:46:04 2019 -0300 Bug 22132: (QA follow-up) set_password now expects a hashref Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 63f40e519c7fbbba70a2944113830a1d3ed80306) Signed-off-by: Martin Renvoize commit a9b3b01dd9290f964d739e0f2f818990d9a6e9ba Author: Martin Renvoize Date: Thu Jan 24 15:54:08 2019 +0000 Bug 22132: (QA follow-up) Tests - use Mojo builtin for auth Mojolicious has built in handling for encoding/decoding of of basic auth paramenters. We should use it to simplify our test here. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 8ee08c3922dd892e9432ce243fc7244092fdd18f) Signed-off-by: Martin Renvoize commit 14e2dd9c9f6ee3c2796954f3e25433197c41f9d5 Author: Tomas Cohen Arazi Date: Tue Jan 15 13:23:23 2019 -0300 Bug 22132: Add Basic authentication to the API This patch implements Basic authentication for the API to aid testers and developers with tools like Postman. To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/api/v1/auth_basic.t => SUCCESS: Tests pass! - Open Postman or your favourite tool - In Authorization, choose Basic auth. - Enter the username and password of a known privileged user. - Hit an endpoint with Postman, for example: ] GET http://kohadev-intra.myDNSname.org:8081/api/v1/patrons => SUCCESS: Basic authentication is great! - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 26af040c79e548e9388346b247f509f743401c34) Signed-off-by: Martin Renvoize commit 4730724c661d50df4268d581691cc73de8500186 Author: Tomas Cohen Arazi Date: Tue Jan 15 13:23:09 2019 -0300 Bug 22132: Unit tests Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 103670e726b9938aa1484b7486cba94adf7b69a9) Signed-off-by: Martin Renvoize commit 3741027605b61b0e988fd7e8df8ec60dc5fe5b99 Author: Tomas Cohen Arazi Date: Tue Jan 15 13:22:53 2019 -0300 Bug 22132: Add RESTBasicAuth syspref Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 3ffed7d55a1d77df2d3c0748614434866612ed24) Signed-off-by: Martin Renvoize commit 92001cc504d03f3aa20b5295154e9ae66c0a530e Author: Olivia Lu Date: Tue Jan 15 21:24:25 2019 +0000 Bug 20634: Changing the identical label "Library:" to "Location" in Inventory Home. To find fix: 1. Go to tools 2. Go to Inventory 3. Verify that under Item location filters the label should be "Location" Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a3993a75822972e1e013410ab020f5a749248017) Signed-off-by: Martin Renvoize commit e3fde6153e66b7c01b804ec7c36e22706abd3e27 Author: Kyle M Hall Date: Thu Nov 15 08:35:33 2018 -0500 Bug 21495: Regression in hold override functionality The changes caused by the patches for bug 11512 have broken existing workflows for many libraries and are widely considered to be a bad move. We should revert this behavior. Signed-off-by: Kyle M Hall Signed-off-by: Rhonda Kuiper Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 398704662487a0c8a3f848a2ae23618ee96406ff) Signed-off-by: Martin Renvoize commit 527b5a309757c328b1927fe18cfed8dc7bae4f4f Author: Owen Leonard Date: Fri Jan 18 17:10:40 2019 +0000 Bug 22168: Improve styling of new chart settings for reports This patch updates a number of aspects of the reports chart creation interface: Chart creation form is now shown in a modal window, and a separate link has been added to show or hide the chart itself. Also changed: Minor markup and JavaScript cleanup. To test, apply the patch and go to Reports -> Saved reports. - Run a report which returns more than one column. - On the report results page, click the "Create chart" button. The chart settings form should appear in a modal window. - Confirm that the form controls work correctly: Each label should give focus to the correct input. Changing the chart type should show or hide the appropriate form fields. - Click the "Draw" button. The modal should disappear and the chart should be shown. - Above the chart should be a "Hide chart" link which works to hide (and then show) the chart. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 8e1efe8f10fd5b575b2ceea3b33d1ed9dd91bd96) Signed-off-by: Martin Renvoize commit 4bc613011026ac4e510adc1b1c67e9a724a7d21d Author: Tomas Cohen Arazi Date: Mon Jan 28 12:37:54 2019 -0300 Bug 17006: (follow-up) set_password expects a hashref Sponsored-by: Municipal Libray Ceska Trebova Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit a7978a9e97e98c5f2322b16b32289bb59bd1f26f) Signed-off-by: Martin Renvoize commit 5f733763d048de2f39d52ee21f1a7f099637f79a Author: Martin Renvoize Date: Fri Feb 1 15:18:45 2019 +0000 Bug 17006: Add /patrons/{patron_id}/password This patch introduces an endpoint for changing a patron's password. It targets privileged user with the right permissions, changing some patron's password. To test: - Apply this patchset - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_password.t => SUCCESS: tests pass! - Play with the different use cases highlighted by the tests, on your favourite REST testing tool (Postman, RESTer on FF, etc). Sponsored-by: Municipal Libray Ceska Trebova Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit ae1e6b558c1e5c581fe0652774c97ae18531758a) Signed-off-by: Martin Renvoize commit 697d748f4016e1eaa99a0dde2b29180083e710db Author: Tomas Cohen Arazi Date: Thu Aug 16 07:01:21 2018 -0300 Bug 17006: OpenAPI spec Sponsored-by: Municipal Libray Ceska Trebova Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit d4570947b0ba4f52f03e190b787b2605948a1495) Signed-off-by: Martin Renvoize commit 8a8e76bf19f14708cbce645df6744468f0f14a45 Author: Tomas Cohen Arazi Date: Thu Aug 16 07:00:38 2018 -0300 Bug 17006: Unit tests Sponsored-by: Municipal Libray Ceska Trebova Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit fd1e9bf59590a6772a16cd7af4212c91c6b63642) Signed-off-by: Martin Renvoize commit 69802bed3e61f2039c14952480e57540e8f03ca8 Author: Jasmine Amohia Date: Thu Jan 17 00:51:11 2019 +0000 Bug 19994: Used Modern::Perl in Authorities perl scripts Test plan: 1. Review code of the following files and confirm that 'use Modern::Perl;' is used in place of 'use strict; use warnings;' auth_finder.pl authorities-home.pl authorities.pl blinddetail-biblio-search.pl detail-biblio-search.pl detail.pl export.pl merge.pl merge_ajax.pl Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 843c4a4bae760754d96867d2596bc78651910c8e) Signed-off-by: Martin Renvoize commit 75bda2a8743f37919efc3132d190ce70efa3c12c Author: Owen Leonard Date: Fri Jun 29 16:27:28 2018 +0000 Bug 10562: Improve Leader06 Type Labels in MARC21slim2OPACResults.xsl This patch takes the suggestions in Bug 10562 and implements those changes in MARC21slim2OPACResults.xsl. This patch also makes the following changes: - De-duplicate famfamfam icons: Remove the /silk subdirectory and move non-duplicates to famfamfam/; Correct paths to these images in templates and CSS - Improve the granularity of some material type icon choices: Show "Film," "Picture," or "Object" instead of "Visual material." - Remove unnecessary title attributes from material type images - Implement the kind of changes made in Bug 18235, "Add classes to material type icons on result lists and detail pages" Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c747c74568850089d2a13b47aecf9987214ff8db) Signed-off-by: Martin Renvoize commit c8ca6926ed114062d4a55ce981b32ffeb670fc7a Author: helene hickey Date: Thu Jan 17 02:28:57 2019 +0000 Bug 15110: Improve decreaseHighHolds system preference description To test: 1) Apply patch 2) Go to Koha admin 3) Search in system prefernces for 'high demand' 4) Verify that the system prefernce 'decreaseLoanHighHolds' is in the results of the search Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit fe2dceba34310c890dd1f06b114de9f3151f59e1) Signed-off-by: Martin Renvoize commit b27150cf9a4c62a636ed7d158e1fe44941de189b Author: Josef Moravec Date: Mon Jan 14 09:16:53 2019 +0000 Bug 22124: Update cataloguing plugin system to not generate type parameter in script tag Test plan: 1) Apply the patch 2) Have defined some cataloguing plugin which generates javascript - for example dateaccessioned.pl 3) Go to cataloguing/adding item and show source -> there should be no type parameter in script tag in code added by cataloguing pulgin 4) prove t/db_dependent/FrameworkPlugin.t Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit cadb7eaab2c9617551450f84acadff0d48a846b2) Signed-off-by: Martin Renvoize commit 1debd138ca3603b7bf7fa0929553203c7bcbe2ac Author: Ethan Amohia Date: Wed Jan 16 04:01:44 2019 +0000 Bug 22136: Added 'ExtendedPatronAttributes' notes to 'Import Patrons' notes. Fixed ExtendedPatronAttributes typo. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 273656f84c9dbc49c8a3669c7994b8c0ea7f3522) Signed-off-by: Martin Renvoize commit 1c7b06b13a79f39bb73cadf3bbaada9d5a48bf20 Author: helene hickey Date: Thu Jan 17 01:09:04 2019 +0000 Bug 19818: Add id into tag html from moremember.tt 1) Go to the patron details for a patron 2) On the right of the screen, right click one of the labels below 'Library use' etc, and Inspect Element 3) View
  • tags which should now each have a unique tag for each Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a011f4e6444a2a337042cc49ed9f529bb101fde9) Signed-off-by: Martin Renvoize commit 62d5d98371a673bb8c1c15d5dad382cf866879d2 Author: Josef Moravec Date: Fri Nov 30 10:26:54 2018 +0000 Bug 21926: Enhance OAI-PMH:archiveID system preference description Test plan: 1) Apply the patch 2) Go to Administration -> System preferences -> Web services, section OAI-PMH 3) See description on OAI-PMH:archiveID and confirm it does make sense and have the link to implementation guidelines Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ddc4c5b8aa75cfe8994ff150a0cae4cc51656852) Signed-off-by: Martin Renvoize commit e96eed9b841394353cc5c4484ddc608432e22d29 Author: helene hickey Date: Wed Jan 16 23:20:38 2019 +0000 Bug 21290: Updating documentation for ModItem To test: Review the patch and check it is now updated correctly Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 9a5bfee706f85bc5fd53a9c2d0616c2e1186379a) Signed-off-by: Martin Renvoize commit ba8cd76c6239ed71246c26666f16f07f56b731b7 Author: Jasmine Amohia Date: Wed Jan 16 20:53:40 2019 +0000 Bug 20679: Removed 'rows per page' from report print layout Test plan: 1. Create a report or view an existing report 2. Notice that 'Rows per page:' is visible 3. Print report (Ctrl+P) 4. Confirm that on printed report, 'Rows per page:' is no longer visible Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 65b64bcafacf983a101f263e554b6d7274567bb9) Signed-off-by: Martin Renvoize commit e227fea2a23b9da2f201e49934018342109c9cd7 Author: Jasmine Amohia Date: Wed Jan 16 23:10:35 2019 +0000 Bug 22149: Fixed grammar in the manage_circ_rules_from_any_libraries description Test plan: 1. Review patch and confirm that the sentence makes sense Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 9e79de6ef2d1662d04018203d2f9ff48be8a0f0f) Signed-off-by: Martin Renvoize commit ea8bd52f6dbb6aab6aabb1d9e191b0356ba1a529 Author: Jack Kelliher Date: Tue Jan 15 03:24:17 2019 +0000 Bug 21930: Reworded message on permissions.inc 1. Go to patrons account, more, Set Permissions. 2. Dropdown the Parameters section. 3. Text should display "If not set the logged in user could only edit circulation rules for its the own library (please note that manage_circ_rules is still required)" 4. Apply patch and reload page 5. Text should now display "Edit circulation rules from any library. If not set the logged in user could only edit circulation rules for their own library (please note that manage_circ_rules is still required)" Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ae84cf1e7a512ce198e5fe7e0b4dd3930967ba76) Signed-off-by: Martin Renvoize commit e9e29c3592defd30e3ea685b2770c67da7a54bef Author: helene hickey Date: Tue Jan 15 21:08:47 2019 +0000 Bug 22029: Google plus has been removed from the social links. For testing: 1) Make sure SocailNetworks is enabled 2) Find a book and verify that in the social links, there is a Google Plus option 3) apply patch and verify that the Google Plus option is no longer there Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 380e57ed72aa3b11e91b3897501b9966392a3eaf) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 3 +- Koha.pm | 2 +- Koha/FrameworkPlugin.pm | 4 +- Koha/REST/V1/Auth.pm | 46 ++++- Koha/REST/V1/Patrons/Password.pm | 76 +++++++++ api/v1/swagger/paths.json | 3 + api/v1/swagger/paths/patrons_password.json | 84 +++++++++ authorities/auth_finder.pl | 3 +- authorities/authorities-home.pl | 3 +- authorities/authorities.pl | 4 +- authorities/blinddetail-biblio-search.pl | 3 +- authorities/detail-biblio-search.pl | 4 +- authorities/detail.pl | 4 +- authorities/export.pl | 3 +- authorities/merge.pl | 3 +- authorities/merge_ajax.pl | 3 +- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 12 ++ koha-tmpl/intranet-tmpl/prog/css/print.css | 1 + koha-tmpl/intranet-tmpl/prog/css/reports.css | 36 ++++ koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc | 180 ++++++++++---------- .../intranet-tmpl/prog/en/includes/permissions.inc | 2 +- .../prog/en/includes/reports-toolbar.inc | 3 +- .../en/modules/admin/preferences/circulation.pref | 4 +- .../en/modules/admin/preferences/web_services.pref | 10 +- .../prog/en/modules/members/moremember.tt | 58 +++---- .../en/modules/reports/guided_reports_start.tt | 76 +++++---- .../prog/en/modules/tools/import_borrowers.tt | 2 +- .../prog/en/modules/tools/inventory.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/sci.css | 12 +- koha-tmpl/opac-tmpl/bootstrap/css/sco.css | 12 +- .../opac-tmpl/bootstrap/en/includes/calendar.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 - .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 21 ++- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 78 ++++----- .../silk/bricks.png => lib/famfamfam/OB.png} | Bin 825 -> 825 bytes .../lib/famfamfam/{silk => }/arrow_left.png | Bin 345 -> 345 bytes .../lib/famfamfam/{silk => }/arrow_refresh.png | Bin 685 -> 685 bytes .../lib/famfamfam/{silk => }/book_previous.png | Bin 680 -> 680 bytes .../lib/famfamfam/{silk => }/calendar.png | Bin 675 -> 675 bytes .../opac-tmpl/lib/famfamfam/{silk => }/cancel.png | Bin 587 -> 587 bytes .../opac-tmpl/lib/famfamfam/{silk => }/cd.png | Bin 673 -> 673 bytes .../lib/famfamfam/{silk => }/chart_curve.png | Bin 710 -> 710 bytes .../lib/famfamfam/{silk => }/controller.png | Bin 666 -> 666 bytes .../opac-tmpl/lib/famfamfam/{silk => }/cross.png | Bin 655 -> 655 bytes .../lib/famfamfam/{silk => }/database.png | Bin 390 -> 390 bytes .../lib/famfamfam/{silk => }/drive_web.png | Bin 686 -> 686 bytes .../opac-tmpl/lib/famfamfam/{silk => }/dvd.png | Bin 764 -> 764 bytes .../opac-tmpl/lib/famfamfam/{silk => }/font.png | Bin 567 -> 567 bytes .../opac-tmpl/lib/famfamfam/{silk => }/help.png | Bin 786 -> 786 bytes .../opac-tmpl/lib/famfamfam/{silk => }/link.png | Bin 343 -> 343 bytes .../lib/famfamfam/{silk => }/magnifier.png | Bin 615 -> 615 bytes .../opac-tmpl/lib/famfamfam/{silk => }/note.png | Bin 500 -> 500 bytes .../lib/famfamfam/{silk => }/paintbrush.png | Bin 548 -> 548 bytes .../opac-tmpl/lib/famfamfam/{silk => }/pencil.png | Bin 450 -> 450 bytes .../lib/famfamfam/{silk => }/pictures.png | Bin 704 -> 704 bytes .../opac-tmpl/lib/famfamfam/{silk => }/report.png | Bin 649 -> 649 bytes .../opac-tmpl/lib/famfamfam/{silk => }/script.png | Bin 748 -> 748 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/book.png | Bin 593 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/book_link.png | Bin 789 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/book_open.png | Bin 622 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/computer_link.png | Bin 792 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/film.png | Bin 653 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/keyboard.png | Bin 570 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/map.png | Bin 804 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/music.png | Bin 385 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/newspaper.png | Bin 658 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/picture.png | Bin 606 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/report_disk.png | Bin 760 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/sound.png | Bin 610 -> 0 bytes .../opac-tmpl/lib/famfamfam/{silk => }/stop.png | Bin 700 -> 700 bytes .../lib/famfamfam/{silk => }/text_list_bullets.png | Bin 344 -> 344 bytes .../opac-tmpl/lib/famfamfam/{silk => }/user.png | Bin 741 -> 741 bytes .../opac-tmpl/lib/famfamfam/{silk => }/world.png | Bin 923 -> 923 bytes .../lib/famfamfam/{silk => }/world_link.png | Bin 957 -> 957 bytes reserve/request.pl | 2 +- t/db_dependent/api/v1/auth_basic.t | 93 ++++++++++ t/db_dependent/api/v1/patrons_password.t | 145 ++++++++++++++++ 79 files changed, 755 insertions(+), 249 deletions(-) create mode 100644 Koha/REST/V1/Patrons/Password.pm create mode 100644 api/v1/swagger/paths/patrons_password.json copy koha-tmpl/opac-tmpl/{bootstrap/lib/famfamfam/silk/bricks.png => lib/famfamfam/OB.png} (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/arrow_left.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/arrow_refresh.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/book_previous.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/calendar.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/cancel.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/cd.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/chart_curve.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/controller.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/cross.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/database.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/drive_web.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/dvd.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/font.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/help.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/link.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/magnifier.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/note.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/paintbrush.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/pencil.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/pictures.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/report.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/script.png (100%) delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/book.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_link.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_open.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/computer_link.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/film.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/keyboard.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/map.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/music.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/newspaper.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/picture.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/report_disk.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/sound.png rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/stop.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/text_list_bullets.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/user.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/world.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/world_link.png (100%) create mode 100644 t/db_dependent/api/v1/auth_basic.t create mode 100644 t/db_dependent/api/v1/patrons_password.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 18:28:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 17:28:05 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-19-g70e95a7 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, 18.05.x has been updated via 70e95a7dc6fd2b45dbebfc3427b9101414c6546d (commit) from 3dc0aa4293c8997d4660c710727ea0e2235887f4 (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 70e95a7dc6fd2b45dbebfc3427b9101414c6546d Author: Jonathan Druart Date: Mon Aug 13 12:55:55 2018 -0300 Bug 21192: Do not pick SelfRegistration hidden fields for SelfModification There was a mix up between "modification" and "edit" for $action in opac-memberentry.pl. If a patron is logged into the OPAC and they attempt to submit changes to their personal details without having actually changed anything, the page reloads with a message stating 'No changes were made.' However, the fields that now appear are those that have been allowed/hidden according to the preferences set for patron self registration, even if patron self registration is disabled. This can lead to problems if there are discrepancies between the fields allowed for self register settings and those allowed for patron self modification settings. To replicate: 1.) In Administration ? System preferences > OPAC, set PatronSelfRegistration to 'don't allow' 2.) Modify the unwanted fields for PatronSelfModificationBorrowerUnwantedField and PatronSelfRegistrationBorrowerUnwantedField so that at least one field is different between the two settings and save (for example, specify 'mobile' to be hidden in the former, but don't include in the list of fields to be hidden in the latter). 3.) Log into the OPAC and navigate to the 'your personal details' tab. Notice that the editable fields correspond to those not hidden by PatronSelfModificationBorrowerUnwantedField 4.) Without making any changes, click on 'Submit update request'. 5.) Note that on this page the fields correspond to those not hidden by PatronSelfRegistrationBorrowerUnwantedField and are now editable (including any fields that would otherwise be hidden by the Self Modification settings). Reported-By: Chris Slone Signed-off-by: Devinim Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit e0b1f945f9cdb4efd8b4403855cdc995023dc8be) Signed-off-by: Martin Renvoize (cherry picked from commit 63ebdb815987f0072587b7e3df5dc54cada1accd) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: opac/opac-memberentry.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 18:31:44 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 17:31:44 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-20-gd0b450a 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, 18.05.x has been updated via d0b450a649d980e85cb4a2811763a77ad948b169 (commit) from 70e95a7dc6fd2b45dbebfc3427b9101414c6546d (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 d0b450a649d980e85cb4a2811763a77ad948b169 Author: Tomas Cohen Arazi Date: Mon Jan 14 08:04:51 2019 -0300 Bug 22125: branches.pickup_location should be flagged as boolean This trivial patch just marks the mentioned column as a boolean. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec https://bugs.koha-community.org/show_bug.cgi?id=16497 Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 95ce61fd3e2c7f41d14e570da3bb8bf05373c65e) Signed-off-by: Martin Renvoize (cherry picked from commit 92cd2f8ca6ee06a05d2b6511ad75533bbf619773) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/Branch.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 19:49:47 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 18:49:47 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-21-g807e473 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, 18.05.x has been updated via 807e473fbbd1cab47561ecbb8b80e3545160f90e (commit) from d0b450a649d980e85cb4a2811763a77ad948b169 (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 807e473fbbd1cab47561ecbb8b80e3545160f90e Author: Owen Leonard Date: Fri Jan 11 16:27:17 2019 +0000 Bug 22101: Ill Requests missing in menu on advanced search page This patch adds [% USE Koha %] to header.inc so that Koha.Preference calls will work correctly. To test, apply the patch and log in to the staff client as a user who has permission to access the ILL module. - Go to the catalog's advanced search page - Cnfirm there is a header menu item under "More" for "ILL requests." Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 45deff8b43d32865cfeeb516c8ffc1140f294c22) Signed-off-by: Martin Renvoize (cherry picked from commit 7b456961a667ec7a8dbed0176ef6aebb942988e2) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 20:09:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 19:09:05 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-22-gd4f1b4c 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, 18.05.x has been updated via d4f1b4c9be8a9c17e5d856fb9610c4f5fd7ff954 (commit) from 807e473fbbd1cab47561ecbb8b80e3545160f90e (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 d4f1b4c9be8a9c17e5d856fb9610c4f5fd7ff954 Author: Lucas Gass Date: Fri Feb 1 18:50:53 2019 +0000 Revert "Bug 22125: branches.pickup_location should be flagged as boolean" This reverts commit 92cd2f8ca6ee06a05d2b6511ad75533bbf619773. ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/Branch.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 20:31:29 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 19:31:29 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-23-g2fffaf6 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, 18.05.x has been updated via 2fffaf647fe545e742c7f8aa6b7cf94d915595ed (commit) from d4f1b4c9be8a9c17e5d856fb9610c4f5fd7ff954 (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 2fffaf647fe545e742c7f8aa6b7cf94d915595ed Author: Ethan Amohia Date: Wed Jan 16 03:26:36 2019 +0000 Bug 22122: Rearranged inputs from a patrons basket in Acquisitions. Test Plan: 1. From home page, go to "Acquisitions" 2. Add a test vendor under "New vendor" 3. Give the vendor any name and click "Save" 4. Click "New Basket" 5. Give the basket a name and click "Save" 6. Click on "Add to basket" 7. Click on "From an external source" 8. Note the order of inputs (ISBN, ISSN, Title...) 9. Go back to the homepage 10. Go to "Cataloging" 11. Click on "New from Z39.50/SRU" button. A new window should open 12. The order of inputs under 'Z39.50/SRU Search' should all match the order of inputs from step 8. (Except "Select MARC framework) Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 03e5ec617070fdc31829f04612c821e4f83facc1) Signed-off-by: Martin Renvoize (cherry picked from commit 16ad847fa68f64c29d7e10c75a00c163ad81ffff) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 20:39:10 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 19:39:10 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-24-gda94385 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, 18.05.x has been updated via da94385c99d547cf995f5a779e48208e1f53d539 (commit) from 2fffaf647fe545e742c7f8aa6b7cf94d915595ed (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 da94385c99d547cf995f5a779e48208e1f53d539 Author: helene hickey Date: Tue Jan 15 23:07:34 2019 +0000 Bug 20274: Itemtypes report gives zero results if item-level_itypes set to bibliographic records 1) Go to reports then catalog by item types 2) Pick a location and look at table 3) Change the system prefernce of item-level_itypes 4) Verify a zero result 5) Apply patch and retry 6) Verify that result does not change to zero on either preference Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 8ad2c206cba1b737e69393e2e3cd92076fb94e17) Signed-off-by: Martin Renvoize (cherry picked from commit d8194f17e43da3b17a6b9dc3c8643a471a748c36) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: reports/itemtypes.plugin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 21:49:38 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 20:49:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-363-g766eaa0 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 766eaa0df45f04523737a8f04b045122b3e11b18 (commit) via 0ee4e9e14fe461e72806491c819f4c033f95f13b (commit) via 8625eefc76a9390e28e9136f19b9767814bc27a5 (commit) via abb51797d8d5ebb274856e912e207a921ace478b (commit) via bc30f84e583959a8c9f4b77db5b8a24ef24e04dd (commit) via 9330deee558f553c357edf8eb1aa96bd40563087 (commit) from 914f448fe1c1d5c01e3188a827a0d18ec3001b45 (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 766eaa0df45f04523737a8f04b045122b3e11b18 Author: Jonathan Druart Date: Fri Oct 19 08:22:20 2018 -0300 Bug 21610: Improve default values for dates This patch fixes failures on t/db_dependent/Koha/Patrons/Import.t and keep t/Auth_with_shibboleth.t and t/db_dependent/Koha/Object.t green Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 0ee4e9e14fe461e72806491c819f4c033f95f13b Author: Marcel de Rooy Date: Fri Oct 19 12:14:20 2018 +0200 Bug 21610: (follow-up) Default value for dates We have some dates with DEFAULT CURRENT_TIMESTAMP and some dates with default and UPDATE clause. Test plan: Run Object.t again. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 8625eefc76a9390e28e9136f19b9767814bc27a5 Author: Marcel de Rooy Date: Fri Oct 19 11:05:50 2018 +0200 Bug 21610: (QA follow-up) Better use columns_info from DBIx We should better use the published method than a private hash key. And shorter to go via _result than adding a new schema call. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit abb51797d8d5ebb274856e912e207a921ace478b Author: Jonathan Druart Date: Thu Oct 18 18:55:44 2018 -0300 Bug 21610: Fix integers and dates values at Koha::Object->store level With strict SQL modes, we are facing several issues when objects are stored. The following errors can be raised by DBIx::Class when an object does not have a valid (as defined at DB level) value: - Incorrect integer value: '' for column COLUMN - Incorrect decimal value: '' for column COLUMN - Column 'COLUMN' cannot be null - Field 'COLUMN' doesn't have a default value - Incorrect date value: '' for column 'COLUMN' We already handled some of them for Koha::Patron. As we do not want to provide such changes for all Koha::* modules we are going to fix this at Koha::Object->store level in order to provide a global fix. This is related to bug 21599 (for item types) and bug 21596 (for patrons) Test plan: - Apply first patch, run the tests => Patch fail because of the previous error in Koha::ItemType->store, to make them pass you can replace $self->notforloan(0) unless $self->notforloan; with $self->notforloan(undef) unless $self->notforloan; - Apply second patch, run the tests => They fail because of dates and/or integers values - Apply third patch, run the tests => They now pass Deep code review wanted! Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit bc30f84e583959a8c9f4b77db5b8a24ef24e04dd Author: Jonathan Druart Date: Thu Oct 18 18:46:30 2018 -0300 Bug 21610: Remove specific changes we made previously We handled integers and dates for Koha::Patron and Koha::ItemType, we want now Koha::Object to deal with. Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 9330deee558f553c357edf8eb1aa96bd40563087 Author: Jonathan Druart Date: Thu Oct 18 18:38:18 2018 -0300 Bug 21610: Add tests Adding few tests to Koha/Object.t in order to highlight what we are trying to fix. Note that Koha::ItemType->store was wrong for notforloan, the default value should be null `notforloan` smallint(6) DEFAULT NULL, but the previous fix (bug 21599) made it default to '0' Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha/ItemType.pm | 12 ------------ Koha/Object.pm | 41 +++++++++++++++++++++++++++++++++++++++++ Koha/Patron.pm | 31 ------------------------------- t/db_dependent/Koha/Object.t | 41 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 81 insertions(+), 44 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 21:57:30 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 20:57:30 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-25-g9899343 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, 18.05.x has been updated via 989934348e42416b874c460ec7c034a6a610b52c (commit) from da94385c99d547cf995f5a779e48208e1f53d539 (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 989934348e42416b874c460ec7c034a6a610b52c Author: helene hickey Date: Wed Jan 16 02:16:26 2019 +0000 Bug 7403: Shorten CataloguingLog preference description To test: 1) Look at value of CataloguingLog prefernce 2) Apply the patch and the value should change 3) Verify that the warning has been removed Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 90a43b1868a068b54e398c1df2227a6b6cf93875) Signed-off-by: Martin Renvoize (cherry picked from commit 85bca71c640e1261d74d8c433f620f821b5d5f3d) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 22:10:36 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 21:10:36 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-26-ga93a742 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, 18.05.x has been updated via a93a7422ca42baff5124499f7e2d94d34832913a (commit) from 989934348e42416b874c460ec7c034a6a610b52c (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 a93a7422ca42baff5124499f7e2d94d34832913a Author: helene hickey Date: Wed Jan 16 22:06:15 2019 +0000 Bug 20491: Updating the MARC subfield desciption of 952q Test plan: 1) Go to admin, then to MARC frameworks, then to default frameworks structure, then subfield stucture for 952 2) Verify that 'q' is described as 'checked out' 3) Go to /cgi-bin/koha/cataloguing/additem.pl?biblionumber=x 4) Verify that 'q' is also descirbed as 'Checked out' in 5) Apply patch and update your database 6) Verify that the description of 'q' has changed to 'Date due' 7) Go to /cgi-bin/koha/cataloguing/additem.pl?biblionumber=x 6) Verify that it has changed to 'Date due' Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Bug 20491: (QA follow-up) Remove atomic update We should not update existing installations, especially since this would not work for translated frameworks. Signed-off-by: Nick Clemens (cherry picked from commit 6e4e4c9cbc04b42653599b4ddea35cbaa57e42f3) Signed-off-by: Martin Renvoize (cherry picked from commit cabf7be3246fcd2248fcbbed497524c3cfa07980) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/Obligatoire/marc21_framework_DEFAULT.sql | 2 +- .../marc21/Optionnel/marc21_simple_bib_frameworks.sql | 16 ++++++++-------- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_simple_bib_frameworks.sql | 16 ++++++++-------- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_simple_bib_frameworks.sql | 16 ++++++++-------- 7 files changed, 28 insertions(+), 28 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 22:30:20 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 21:30:20 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-27-g2ec9cb5 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, 18.05.x has been updated via 2ec9cb5e9450a3906558b6b5d1cadd7eea2c010c (commit) from a93a7422ca42baff5124499f7e2d94d34832913a (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 2ec9cb5e9450a3906558b6b5d1cadd7eea2c010c Author: Jasmine Amohia Date: Wed Jan 16 02:11:42 2019 +0000 Bug 19920: Removed unnecessary code from C4/Members.pm A seperate bug (Bug 16853) removed the subroutine used in this file. I removed the code as it had become unnecessary. Test plan: 1. Confirm that &changepassword can't be found in C4/Members.pm Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 9f446de79128352fe5138bb22260a49254c65450) Signed-off-by: Martin Renvoize (cherry picked from commit a41ee8ad18acafde0a045b4908ecfc90118bdf0a) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 1 - 1 file changed, 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 22:34:26 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 21:34:26 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-28-g0451ac7 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, 18.05.x has been updated via 0451ac7f66cd775baa202c7106fa8bdaa819c7b1 (commit) from 2ec9cb5e9450a3906558b6b5d1cadd7eea2c010c (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 0451ac7f66cd775baa202c7106fa8bdaa819c7b1 Author: Jasmine Amohia Date: Thu Jan 17 02:32:08 2019 +0000 Bug 11922: Add SHOW_BCODE patron attribute for Norwegian web installer Test plan: 1. Notice that /patron_attributes.sql and /patron_attributes.txt can be located in 2-Valgfritt 2. Confirm that the SHOW_BCODE patron attribute in the English web installers .sql and .txt file is also in the Norwegian web installers .sql and .txt file Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 495619649b329ce52b86998668461ca72827c6ab) Signed-off-by: Martin Renvoize (cherry picked from commit 9f2110cbbedb2c5f13f915fc496bc2156a08d0ac) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../patron_atributes.sql => nb-NO/2-Valgfritt/patron_attributes.sql} | 0 .../patron_atributes.txt => nb-NO/2-Valgfritt/patron_attributes.txt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) copy installer/data/mysql/{en/optional/patron_atributes.sql => nb-NO/2-Valgfritt/patron_attributes.sql} (100%) copy installer/data/mysql/{en/optional/patron_atributes.txt => nb-NO/2-Valgfritt/patron_attributes.txt} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 23:03:47 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 22:03:47 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-29-g9880c7d 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, 18.05.x has been updated via 9880c7d852358cdabaa37348dd67af57613a53e7 (commit) from 0451ac7f66cd775baa202c7106fa8bdaa819c7b1 (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 9880c7d852358cdabaa37348dd67af57613a53e7 Author: Katrin Fischer Date: Sat Jan 12 09:21:38 2019 +0100 Bug 22118: Format hold fee when placing holds in OPAC When Koha charges for holds, a message with the fee is shown before the patron places the hold. The amount needs to be formatted according to CurrencyFormat system preference. To test: - Add a hold fee to your patron category - Log into the OPAC - Search for a record to place a hold on - Click Place hold - Verify there is a note showing about the hold fee - Toggle CurrencyFormat and HoldFeeMode and verify that the formatting is always correct Signed-off-by: Jack Kelliher Signed-off-by: Mikael Olangcay Brisebois Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 4f0618a8888dff72b15dfe9193259c1bc5d06b5f) Signed-off-by: Martin Renvoize (cherry picked from commit b8527c5057ddac6f956d102efa27ef95cd5d3051) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 ++-- opac/opac-reserve.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 23:33:40 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 22:33:40 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-30-g2660cc8 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, 18.05.x has been updated via 2660cc8f0bbb7f8d0903aa2145095a43c84c5a8e (commit) from 9880c7d852358cdabaa37348dd67af57613a53e7 (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 2660cc8f0bbb7f8d0903aa2145095a43c84c5a8e Author: Kyle M Hall Date: Tue Mar 6 13:29:22 2018 -0500 Bug 18909: Enable the maximum zebra records size to be specified per instance The default for Zebra is to not return results where the record size is greater than 1045 KB ( 1 MB ). Some libraries need to increase this ceiling, but it may come at a cost with z39.50 compatibility with other services. For that reason, we should make this setting configurable on a per-instance basis. Test plan for kohadevbox: 1) Apply this patch 2) Run: $ reset_all 3) Restart Zebra: $ sudo koha-zebra --restart kohadev 4) Check how zebrasrv was called: $ ps waux | grep zebrasrv => SUCCESS: Looks like ... /usr/bin/zebrasrv -v none,fatal,warn -k 1024 5) Edit /etc/koha/sites/kohadev/koha-conf.xml, add: 2048 6) Repeat (3) and (4) => SUCCESS: Looks like ... /usr/bin/zebrasrv -v none,fatal,warn -k 2048 7) Sign off :-D General test plan: 1) Apply this patch 2) Build a Debian package 3) Specify a zebra_max_record_size of 2048 in your koha_conf.xml 4) Restart zebra 5) Index a record greater than 1 MB but smaller than 2 MB 6) Note that it is searchable! Signed-off-by: Tomas Cohen Arazi Signed-off-by: Hugo Agud Signed-off-by: Nick Clemens (cherry picked from commit 8c0c6be7488e0543662e47006ded12e74ae4eb8d) Signed-off-by: Martin Renvoize (cherry picked from commit 35fc9c10032a4b130d9861efb36f112112294e57) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-functions.sh | 11 +++++++++++ debian/scripts/koha-zebra | 2 ++ debian/templates/koha-conf-site.xml.in | 1 + 3 files changed, 14 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 23:41:41 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 22:41:41 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-31-g0fc6c90 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, 18.05.x has been updated via 0fc6c90cf6367e7284ba2ee61f834399151a0ce7 (commit) from 2660cc8f0bbb7f8d0903aa2145095a43c84c5a8e (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 0fc6c90cf6367e7284ba2ee61f834399151a0ce7 Author: Olivia Lu Date: Wed Jan 16 03:54:25 2019 +0000 Bug 21855: Changed "deprecated delete_unverified_opac_registrations.pl cronjob" to "cleanup_database" To Find Fix: 1. Go to Koha Administration 2. Search PatronSelfRegistrationVerifyByEmail 3. Verify that NOTE now says "system preference requires the cleanup_database ..." Signed-off-by: Katrin Fischer Signed-off-by: Mikael Olangcay Brisebois Signed-off-by: Nick Clemens (cherry picked from commit b93c5dcbfdeafc2758cb880bea02ca91c0ef4e67) Signed-off-by: Martin Renvoize (cherry picked from commit 3f4b04852780e946c2fbc64ae4599058699a941d) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/preferences/opac.pref | 2 +- .../delete_unverified_opac_registrations.pl | 66 -------------------- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100755 misc/cronjobs/delete_unverified_opac_registrations.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 23:50:04 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 22:50:04 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-32-g9ad483b 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, 18.05.x has been updated via 9ad483b2040ca1fa322ef0af7abe211817d84926 (commit) from 0fc6c90cf6367e7284ba2ee61f834399151a0ce7 (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 9ad483b2040ca1fa322ef0af7abe211817d84926 Author: Katrin Fischer Date: Sat Jan 5 05:41:48 2019 +0000 Bug 22113: Add price formatting on item lost report The item lost report displays the price and replacement price for lost items. With the patch they will display according to the CurrencyFormat system preference. To test: - Mark 1 or more items lost - Make sure that replacement cost and purchase price are set - Go to Reports > Items lost - Search for your lost items - Verify price and replacement price display - Apply patch and toggle CurrencyFormat to different settings - Refresh lost items report - Verify prices are always displayed according to syspref setting Signed-off-by: Olivia Lu Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit c3fb484fe2922d2a97053b3fde4fb433c5aa0c4f) Signed-off-by: Martin Renvoize (cherry picked from commit da8e5fcd2447aad751e511adac4d29bac7cec82c) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/reports/itemslost.tt | 21 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Feb 2 00:03:17 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2019 23:03:17 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-33-g2f918ab 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, 18.05.x has been updated via 2f918ab38d22047a8cd180aa16248f41ffc10329 (commit) from 9ad483b2040ca1fa322ef0af7abe211817d84926 (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 2f918ab38d22047a8cd180aa16248f41ffc10329 Author: Katrin Fischer Date: Sat Jan 5 03:50:36 2019 +0000 Bug 22111: Format amount shown on place holds when maxoutstanding is reached (staff) Displays amount outstanding correctly when holds are blocked by maxoutstanding. To test: - Check maxoutstanding system preference value - Add a fine to a patron account exceeding maxoutstanding - Try to place a hold for this patron from staff - Verify this message is shown: Patron has outstanding fines: 6.00 - Toggle CurrencyFormat system preference and verify display changes according to setting Signed-off-by: Owen Leonard Signed-off-by: Mikael Olangcay Brisebois Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit c37ded96714409cd572c79f3c9cd69694e0e71de) Signed-off-by: Martin Renvoize (cherry picked from commit 78e617b201402b5e551ba79131b362b2ef7f0bee) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 4 11:11:08 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Feb 2019 10:11:08 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.14-12-ga1e3318 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 a1e331883ce01530d8764be0e5093f0fcaff11ab (commit) via 72d6652697a471aed98a8503e02073c27e26bf86 (commit) via 01d26165a9519ed7336c01d2145a03aa9875a56f (commit) via f6d389221c31671b852f1e72af13bda3485aaaaf (commit) via 4491e4b06a8c3de21d5d31af90c5fd82b5882c9a (commit) from d504715ea7db808ed2adc5c75f7fd0488715487d (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 a1e331883ce01530d8764be0e5093f0fcaff11ab Author: helene hickey Date: Tue Jan 15 23:07:34 2019 +0000 Bug 20274: Itemtypes report gives zero results if item-level_itypes set to bibliographic records 1) Go to reports then catalog by item types 2) Pick a location and look at table 3) Change the system prefernce of item-level_itypes 4) Verify a zero result 5) Apply patch and retry 6) Verify that result does not change to zero on either preference Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 8ad2c206cba1b737e69393e2e3cd92076fb94e17) Signed-off-by: Martin Renvoize (cherry picked from commit d8194f17e43da3b17a6b9dc3c8643a471a748c36) Signed-off-by: Lucas Gass (cherry picked from commit da94385c99d547cf995f5a779e48208e1f53d539) Signed-off-by: Fridolin Somers commit 72d6652697a471aed98a8503e02073c27e26bf86 Author: Ethan Amohia Date: Wed Jan 16 03:26:36 2019 +0000 Bug 22122: Rearranged inputs from a patrons basket in Acquisitions. Test Plan: 1. From home page, go to "Acquisitions" 2. Add a test vendor under "New vendor" 3. Give the vendor any name and click "Save" 4. Click "New Basket" 5. Give the basket a name and click "Save" 6. Click on "Add to basket" 7. Click on "From an external source" 8. Note the order of inputs (ISBN, ISSN, Title...) 9. Go back to the homepage 10. Go to "Cataloging" 11. Click on "New from Z39.50/SRU" button. A new window should open 12. The order of inputs under 'Z39.50/SRU Search' should all match the order of inputs from step 8. (Except "Select MARC framework) Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 03e5ec617070fdc31829f04612c821e4f83facc1) Signed-off-by: Martin Renvoize (cherry picked from commit 16ad847fa68f64c29d7e10c75a00c163ad81ffff) Signed-off-by: Lucas Gass (cherry picked from commit 2fffaf647fe545e742c7f8aa6b7cf94d915595ed) Signed-off-by: Fridolin Somers commit 01d26165a9519ed7336c01d2145a03aa9875a56f Author: Owen Leonard Date: Fri Jan 11 16:27:17 2019 +0000 Bug 22101: Ill Requests missing in menu on advanced search page This patch adds [% USE Koha %] to header.inc so that Koha.Preference calls will work correctly. To test, apply the patch and log in to the staff client as a user who has permission to access the ILL module. - Go to the catalog's advanced search page - Cnfirm there is a header menu item under "More" for "ILL requests." Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 45deff8b43d32865cfeeb516c8ffc1140f294c22) Signed-off-by: Martin Renvoize (cherry picked from commit 7b456961a667ec7a8dbed0176ef6aebb942988e2) Signed-off-by: Lucas Gass (cherry picked from commit 807e473fbbd1cab47561ecbb8b80e3545160f90e) Signed-off-by: Fridolin Somers commit f6d389221c31671b852f1e72af13bda3485aaaaf Author: Jonathan Druart Date: Mon Aug 13 12:55:55 2018 -0300 Bug 21192: Do not pick SelfRegistration hidden fields for SelfModification There was a mix up between "modification" and "edit" for $action in opac-memberentry.pl. If a patron is logged into the OPAC and they attempt to submit changes to their personal details without having actually changed anything, the page reloads with a message stating 'No changes were made.' However, the fields that now appear are those that have been allowed/hidden according to the preferences set for patron self registration, even if patron self registration is disabled. This can lead to problems if there are discrepancies between the fields allowed for self register settings and those allowed for patron self modification settings. To replicate: 1.) In Administration ? System preferences > OPAC, set PatronSelfRegistration to 'don't allow' 2.) Modify the unwanted fields for PatronSelfModificationBorrowerUnwantedField and PatronSelfRegistrationBorrowerUnwantedField so that at least one field is different between the two settings and save (for example, specify 'mobile' to be hidden in the former, but don't include in the list of fields to be hidden in the latter). 3.) Log into the OPAC and navigate to the 'your personal details' tab. Notice that the editable fields correspond to those not hidden by PatronSelfModificationBorrowerUnwantedField 4.) Without making any changes, click on 'Submit update request'. 5.) Note that on this page the fields correspond to those not hidden by PatronSelfRegistrationBorrowerUnwantedField and are now editable (including any fields that would otherwise be hidden by the Self Modification settings). Reported-By: Chris Slone Signed-off-by: Devinim Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit e0b1f945f9cdb4efd8b4403855cdc995023dc8be) Signed-off-by: Martin Renvoize (cherry picked from commit 63ebdb815987f0072587b7e3df5dc54cada1accd) Signed-off-by: Lucas Gass (cherry picked from commit 70e95a7dc6fd2b45dbebfc3427b9101414c6546d) Signed-off-by: Fridolin Somers commit 4491e4b06a8c3de21d5d31af90c5fd82b5882c9a Author: Jonathan Druart Date: Mon Dec 17 12:55:34 2018 -0300 Bug 21170: Remove "isn't numeric in numeric eq (==)" warnings in MARCdetail Easily removed switching the two conditions. Test plan: Hit catalogue/MARCdetail.pl?biblionumber=1 => Without this patch you will see in the log warnings like Argument "ddc" isn't numeric in numeric eq (==) at /home/vagrant/kohaclone/catalogue/MARCdetail.pl line 277. => With this patch applied the warnings do no longer appear Signed-off-by: Pierre-Marc Thibault Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit b608f548a894cb433c4218b94a33d6b8a824a4c4) Signed-off-by: Martin Renvoize (cherry picked from commit 2cceecd43866efd56d84ab45c6b4e9f10895533f) Signed-off-by: Lucas Gass (cherry picked from commit 3dc0aa4293c8997d4660c710727ea0e2235887f4) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: catalogue/MARCdetail.pl | 4 +++- koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 8 ++++---- opac/opac-memberentry.pl | 6 +++--- reports/itemtypes.plugin | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 4 12:30:21 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Feb 2019 11:30:21 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-98-g491ad8f 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, 18.11.x has been updated via 491ad8fc3389be9db46eb8d42f03f78befd69e66 (commit) via 87d59cfb7d5a44524bc626ad41323eef5e2d293a (commit) via b1af157152c459b2094d2d2f9290ff49ee67116d (commit) via 2e4883bdc57f0acd23435abed983dfccccf96f98 (commit) via c139076372ccc8dc286a060fc0c392aba8d9c94b (commit) via 0582bd25d885f49073bc4c84e087f1cfc5354287 (commit) from 574c89ef49fdb573d89cca4b28a74a65adb18132 (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 491ad8fc3389be9db46eb8d42f03f78befd69e66 Author: Jonathan Druart Date: Fri Oct 19 08:22:20 2018 -0300 Bug 21610: Improve default values for dates This patch fixes failures on t/db_dependent/Koha/Patrons/Import.t and keep t/Auth_with_shibboleth.t and t/db_dependent/Koha/Object.t green Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 766eaa0df45f04523737a8f04b045122b3e11b18) Signed-off-by: Martin Renvoize commit 87d59cfb7d5a44524bc626ad41323eef5e2d293a Author: Marcel de Rooy Date: Fri Oct 19 12:14:20 2018 +0200 Bug 21610: (follow-up) Default value for dates We have some dates with DEFAULT CURRENT_TIMESTAMP and some dates with default and UPDATE clause. Test plan: Run Object.t again. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 0ee4e9e14fe461e72806491c819f4c033f95f13b) Signed-off-by: Martin Renvoize commit b1af157152c459b2094d2d2f9290ff49ee67116d Author: Marcel de Rooy Date: Fri Oct 19 11:05:50 2018 +0200 Bug 21610: (QA follow-up) Better use columns_info from DBIx We should better use the published method than a private hash key. And shorter to go via _result than adding a new schema call. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 8625eefc76a9390e28e9136f19b9767814bc27a5) Signed-off-by: Martin Renvoize commit 2e4883bdc57f0acd23435abed983dfccccf96f98 Author: Jonathan Druart Date: Thu Oct 18 18:55:44 2018 -0300 Bug 21610: Fix integers and dates values at Koha::Object->store level With strict SQL modes, we are facing several issues when objects are stored. The following errors can be raised by DBIx::Class when an object does not have a valid (as defined at DB level) value: - Incorrect integer value: '' for column COLUMN - Incorrect decimal value: '' for column COLUMN - Column 'COLUMN' cannot be null - Field 'COLUMN' doesn't have a default value - Incorrect date value: '' for column 'COLUMN' We already handled some of them for Koha::Patron. As we do not want to provide such changes for all Koha::* modules we are going to fix this at Koha::Object->store level in order to provide a global fix. This is related to bug 21599 (for item types) and bug 21596 (for patrons) Test plan: - Apply first patch, run the tests => Patch fail because of the previous error in Koha::ItemType->store, to make them pass you can replace $self->notforloan(0) unless $self->notforloan; with $self->notforloan(undef) unless $self->notforloan; - Apply second patch, run the tests => They fail because of dates and/or integers values - Apply third patch, run the tests => They now pass Deep code review wanted! Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit abb51797d8d5ebb274856e912e207a921ace478b) Signed-off-by: Martin Renvoize commit c139076372ccc8dc286a060fc0c392aba8d9c94b Author: Jonathan Druart Date: Thu Oct 18 18:46:30 2018 -0300 Bug 21610: Remove specific changes we made previously We handled integers and dates for Koha::Patron and Koha::ItemType, we want now Koha::Object to deal with. Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit bc30f84e583959a8c9f4b77db5b8a24ef24e04dd) Signed-off-by: Martin Renvoize commit 0582bd25d885f49073bc4c84e087f1cfc5354287 Author: Jonathan Druart Date: Thu Oct 18 18:38:18 2018 -0300 Bug 21610: Add tests Adding few tests to Koha/Object.t in order to highlight what we are trying to fix. Note that Koha::ItemType->store was wrong for notforloan, the default value should be null `notforloan` smallint(6) DEFAULT NULL, but the previous fix (bug 21599) made it default to '0' Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 9330deee558f553c357edf8eb1aa96bd40563087) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/ItemType.pm | 12 ------------ Koha/Object.pm | 41 +++++++++++++++++++++++++++++++++++++++++ Koha/Patron.pm | 31 ------------------------------- t/db_dependent/Koha/Object.t | 41 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 81 insertions(+), 44 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 4 14:17:38 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Feb 2019 13:17:38 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.14-18-g5148262 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 5148262441002899fb18a2ec5ad5da1546f3f951 (commit) via b4c420af86e8101667bfc42710de212083b4649f (commit) via 31597400e68d32f8fdffda96f0a8a3727588861b (commit) via d6d4bb6993f41f92de75659e2a62264840585f66 (commit) via d5ba703bc3895c2c5ae428ca28d1559df723e924 (commit) via aa7bbb11fbec6c32d030372f17956a6ec4824ac2 (commit) from a1e331883ce01530d8764be0e5093f0fcaff11ab (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 5148262441002899fb18a2ec5ad5da1546f3f951 Author: Katrin Fischer Date: Sat Jan 5 03:50:36 2019 +0000 Bug 22111: Format amount shown on place holds when maxoutstanding is reached (staff) Displays amount outstanding correctly when holds are blocked by maxoutstanding. To test: - Check maxoutstanding system preference value - Add a fine to a patron account exceeding maxoutstanding - Try to place a hold for this patron from staff - Verify this message is shown: Patron has outstanding fines: 6.00 - Toggle CurrencyFormat system preference and verify display changes according to setting Signed-off-by: Owen Leonard Signed-off-by: Mikael Olangcay Brisebois Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit c37ded96714409cd572c79f3c9cd69694e0e71de) Signed-off-by: Martin Renvoize (cherry picked from commit 78e617b201402b5e551ba79131b362b2ef7f0bee) Signed-off-by: Lucas Gass (cherry picked from commit 2f918ab38d22047a8cd180aa16248f41ffc10329) Signed-off-by: Fridolin Somers commit b4c420af86e8101667bfc42710de212083b4649f Author: Katrin Fischer Date: Sat Jan 5 05:41:48 2019 +0000 Bug 22113: Add price formatting on item lost report The item lost report displays the price and replacement price for lost items. With the patch they will display according to the CurrencyFormat system preference. To test: - Mark 1 or more items lost - Make sure that replacement cost and purchase price are set - Go to Reports > Items lost - Search for your lost items - Verify price and replacement price display - Apply patch and toggle CurrencyFormat to different settings - Refresh lost items report - Verify prices are always displayed according to syspref setting Signed-off-by: Olivia Lu Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit c3fb484fe2922d2a97053b3fde4fb433c5aa0c4f) Signed-off-by: Martin Renvoize (cherry picked from commit da8e5fcd2447aad751e511adac4d29bac7cec82c) Signed-off-by: Lucas Gass (cherry picked from commit 9ad483b2040ca1fa322ef0af7abe211817d84926) Signed-off-by: Fridolin Somers commit 31597400e68d32f8fdffda96f0a8a3727588861b Author: Katrin Fischer Date: Sat Jan 12 09:21:38 2019 +0100 Bug 22118: Format hold fee when placing holds in OPAC When Koha charges for holds, a message with the fee is shown before the patron places the hold. The amount needs to be formatted according to CurrencyFormat system preference. To test: - Add a hold fee to your patron category - Log into the OPAC - Search for a record to place a hold on - Click Place hold - Verify there is a note showing about the hold fee - Toggle CurrencyFormat and HoldFeeMode and verify that the formatting is always correct Signed-off-by: Jack Kelliher Signed-off-by: Mikael Olangcay Brisebois Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 4f0618a8888dff72b15dfe9193259c1bc5d06b5f) Signed-off-by: Martin Renvoize (cherry picked from commit b8527c5057ddac6f956d102efa27ef95cd5d3051) Signed-off-by: Lucas Gass (cherry picked from commit 9880c7d852358cdabaa37348dd67af57613a53e7) Signed-off-by: Fridolin Somers commit d6d4bb6993f41f92de75659e2a62264840585f66 Author: Jasmine Amohia Date: Thu Jan 17 02:32:08 2019 +0000 Bug 11922: Add SHOW_BCODE patron attribute for Norwegian web installer Test plan: 1. Notice that /patron_attributes.sql and /patron_attributes.txt can be located in 2-Valgfritt 2. Confirm that the SHOW_BCODE patron attribute in the English web installers .sql and .txt file is also in the Norwegian web installers .sql and .txt file Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 495619649b329ce52b86998668461ca72827c6ab) Signed-off-by: Martin Renvoize (cherry picked from commit 9f2110cbbedb2c5f13f915fc496bc2156a08d0ac) Signed-off-by: Lucas Gass (cherry picked from commit 0451ac7f66cd775baa202c7106fa8bdaa819c7b1) Signed-off-by: Fridolin Somers commit d5ba703bc3895c2c5ae428ca28d1559df723e924 Author: Jasmine Amohia Date: Wed Jan 16 02:11:42 2019 +0000 Bug 19920: Removed unnecessary code from C4/Members.pm A seperate bug (Bug 16853) removed the subroutine used in this file. I removed the code as it had become unnecessary. Test plan: 1. Confirm that &changepassword can't be found in C4/Members.pm Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 9f446de79128352fe5138bb22260a49254c65450) Signed-off-by: Martin Renvoize (cherry picked from commit a41ee8ad18acafde0a045b4908ecfc90118bdf0a) Signed-off-by: Lucas Gass (cherry picked from commit 2ec9cb5e9450a3906558b6b5d1cadd7eea2c010c) Signed-off-by: Fridolin Somers commit aa7bbb11fbec6c32d030372f17956a6ec4824ac2 Author: helene hickey Date: Wed Jan 16 22:06:15 2019 +0000 Bug 20491: Updating the MARC subfield desciption of 952q Test plan: 1) Go to admin, then to MARC frameworks, then to default frameworks structure, then subfield stucture for 952 2) Verify that 'q' is described as 'checked out' 3) Go to /cgi-bin/koha/cataloguing/additem.pl?biblionumber=x 4) Verify that 'q' is also descirbed as 'Checked out' in 5) Apply patch and update your database 6) Verify that the description of 'q' has changed to 'Date due' 7) Go to /cgi-bin/koha/cataloguing/additem.pl?biblionumber=x 6) Verify that it has changed to 'Date due' Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Bug 20491: (QA follow-up) Remove atomic update We should not update existing installations, especially since this would not work for translated frameworks. Signed-off-by: Nick Clemens (cherry picked from commit 6e4e4c9cbc04b42653599b4ddea35cbaa57e42f3) Signed-off-by: Martin Renvoize (cherry picked from commit cabf7be3246fcd2248fcbbed497524c3cfa07980) Signed-off-by: Lucas Gass (cherry picked from commit a93a7422ca42baff5124499f7e2d94d34832913a) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 1 - .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/Obligatoire/marc21_framework_DEFAULT.sql | 2 +- .../marc21/Optionnel/marc21_simple_bib_frameworks.sql | 16 ++++++++-------- .../2-Valgfritt/patron_attributes.sql} | 0 .../2-Valgfritt/patron_attributes.txt} | 0 .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_simple_bib_frameworks.sql | 16 ++++++++-------- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_simple_bib_frameworks.sql | 16 ++++++++-------- .../intranet-tmpl/prog/en/modules/reports/itemslost.tt | 5 +++-- .../intranet-tmpl/prog/en/modules/reserve/request.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 ++-- opac/opac-reserve.pl | 2 +- 14 files changed, 36 insertions(+), 35 deletions(-) copy installer/data/mysql/{en/optional/patron_atributes.sql => nb-NO/2-Valgfritt/patron_attributes.sql} (100%) copy installer/data/mysql/{en/optional/patron_atributes.txt => nb-NO/2-Valgfritt/patron_attributes.txt} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 4 18:53:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Feb 2019 17:53:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-404-gdf611b1 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 df611b17d12b63bb2f14909969ff8e8f67a332d0 (commit) via 98798a6be8ddcca981c8cc21a2ce381c9a0af49e (commit) via 20a38ee50e6fe62712e299bcec9e939dc2bbb58e (commit) via b4c9058b871b17a20f08a52875582c617bfd91d9 (commit) via 0c53a07a829299067186cd5c5dfbc74eec9fac8d (commit) via 85d09997c988c9acc7e00c3a128002c83e044ca0 (commit) via ee94197482ccd68ba88e3fce33eb3029f4e88f6f (commit) via ba1f33e6ae69e9e1e499b5fedee299211580469f (commit) via dd7daf493b50c019cd8b7737e42536567ebdc694 (commit) via aa3294ae579a49c7279c89aef475b0134426a943 (commit) via 5189a42588209ae3e2d34dfbe5ae6e3a451bdb73 (commit) via 268a1248a39ce2cbf641e9161932e4b060d71225 (commit) via 12e331d14890569eaca1f0a7a4948641be4bbd18 (commit) via 2578b9469141a4f0c7f24b4fd5743fa2ce4fbca2 (commit) via 24ffe470ffbe17318ae16f2beb3a2dd488ef00b5 (commit) via 6179f23dd8b4ed24add2e76c7b8e193372052201 (commit) via b3c25b64b868b56423c50b9df4fac4bb55947679 (commit) via 9caede8d3ce67c684afd615b93ae2eb3dd5991bb (commit) via 7f918ed8b1deed69609850800675e704da4cbf68 (commit) via e142e85d65f91a58a7aefbab3560d59f92134c2f (commit) via 1575d339629e68902ad9a92565f4b331e8c04d79 (commit) via 081bb2d9bc8ba6bf53c57507a2f6e7bdf0b4fa32 (commit) via d0a8d0e55a07e07d95474a09b751f23a79fac979 (commit) via ab9e4ca6a46519ddc69ad76837407c0a4f0ed0cd (commit) via 7520ede89987a7a65301debdda46950a6364ebfd (commit) via 1da0ba48b6fdf38cfd3d3ea63ec076b15995610f (commit) via a32653a66fa02f1fe9002647d337261bf36d62e0 (commit) via 9961e2c08f8dba0896ed4f6bfa6a7befebd28d5d (commit) via a8259c38dbe910188ece5126d226166014e001ed (commit) via d2ce727e260f6b45266a8147aee7654811a44fa1 (commit) via c345d30cc8284f690f375faa140de49e62358709 (commit) via 186209875a4951b15faded3f8c47eba71716c7af (commit) via fb62e8d1fc8b210a5b23801b7b8faff3280bf638 (commit) via e33bdbd9dae74987869b52fd6df748784657b632 (commit) via 0904863c7559467ef9a6f5210950c04dcc5ee04e (commit) via 014baf181cd4b8c74bfeb04d53f418c58e14ebb8 (commit) via 4b82ed3549fcea3588b1500574a6715d0fe51702 (commit) via 3ca0234d34ac9708a8335cfa97805fb7498201bf (commit) via b2dce05ddff8a047e7770ea241b1edd9b798212e (commit) via 7e69ab62a5ef3fbd350c6606d25b5ab6f6bc168e (commit) via 0f83ac98c753efbae7e33619be717327a820f2e1 (commit) from 766eaa0df45f04523737a8f04b045122b3e11b18 (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 df611b17d12b63bb2f14909969ff8e8f67a332d0 Author: Christopher Brannon Date: Sat Sep 29 19:08:47 2018 +0000 Bug 21446: Remove fix comment Fix is not needed. Signed-off-by: helene hickey Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 98798a6be8ddcca981c8cc21a2ce381c9a0af49e Author: Christopher Brannon Date: Sat Sep 29 18:09:03 2018 +0000 Bug 21446: Improve display of changed values on course reserves and show permanent location instead of cart TO TEST: 1) Set ReturnToShelvingCart on. 2) Create a Course Reserve and make inactive. 3) Add an item, changing Item type, Collection code, Shelving location, and Holding library. 4) Note these four fields in the item list. 5) Activate course reserve. 6) Note subtle/no difference in these fiels in the list. 7) Check in the item. 8) Go back to course reserves and note that the cart is listed in the field instead of permanent location. 9) Deactivate course reserve. 10) Reset permanent location on item manually. 11) Apply patch. 12) Repeat steps 4-9 noting that the permanent location is showing instead of current location. Also, if a change is assigned to the item, the change AND the regular state always show. The active state will be in bold. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 20a38ee50e6fe62712e299bcec9e939dc2bbb58e Author: Aleisha Amohia Date: Wed Dec 19 20:32:32 2018 +0000 Bug 20000: Use Modern::Perl in installer scripts To test: Check that we are using Modern::Perl when strict *and* warnings were used before, and commented lines and FIXMEs have been removed from the rest, out of files listed below. data/mysql/backfill_statistics.pl data/mysql/labels_upgrade.pl data/mysql/patroncards_upgrade.pl data/mysql/update22to30.pl data/mysql/updatedatabase.pl externalmodules.pl html-template-to-template-toolkit.pl install.pl Sponsored-by: Catalyst IT Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit b4c9058b871b17a20f08a52875582c617bfd91d9 Author: Owen Leonard Date: Fri Jan 11 16:05:12 2019 +0000 Bug 11373: (follow-up) Add "change calculation" feature to the fine payment forms This patch provides some follow-ups, including corrections to the JavaScript and updates to the text for readability. - Remove obsolete script "type" attribute - Update the use of the obsolete jQuery method "bind" - Use Bootstrap's built-in "show" option instead of simulated click - Handle preventDoubleFormSubmit function's "waiting" class if modal is closed manually To test, apply the patch and follow the original test plan. Everything should work as expected. Note that when the modal is shown, the cursor changes to the "waiting" one when you hover over the body of the page. If you click "No" in the modal, the cursor should return to normal. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 0c53a07a829299067186cd5c5dfbc74eec9fac8d Author: Fr?d?rick Date: Tue Dec 10 16:51:39 2013 -0500 Bug 11373: Show the difference between the amount collected and the amount paid of a fine payment. This patch adds a feature in the fine payment section. It allows to see the change due to patrons when the amount collected is higher than the amount paid. Test plan : - Apply patch. - Select a patron with a fine. - Go to Fines > Pay fines. - Click the button pay. - Choose the amount paid equal to the outstanding amount (exemple : 3$). - Choose the amount collected to be more than the outstanding amount (exemple : 5$). - Confirm that the change is correct (example : 5$ - 3$ = 2$). - Click the button confirm. - Click on Yes in the dialog box. - Confirm that the payment has been made (example : last amount = 3$). Signed-off-by: Michal Denar Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 85d09997c988c9acc7e00c3a128002c83e044ca0 Author: Owen Leonard Date: Fri Feb 1 14:12:18 2019 +0000 Bug 22195: (follow-up) Add text labels to buttons if window is wide enough This patch adds responsive handling of text labels to the columns configuration and export buttons. To test, apply the patch and clear your browser cache if necessary. - View a page with column configuration, e.g. Administration -> Patron categories. - At wider browser widths the buttons should have text labels. - At narrower browser widths the labels should be hidden. Signed-off-by: Nick Clemens commit ee94197482ccd68ba88e3fce33eb3029f4e88f6f Author: Owen Leonard Date: Sat Jan 26 19:20:32 2019 +0000 Bug 22195: (follow-up) Add tooltip to buttons This patch adds title attributes and Bootstrap tooltips to the columns configuration and export/print butttons. To test, apply the patch and visit a page with columns configuration buttons. Confirm that when you hover over each of the DataTable control buttons a tooltip is shown. Signed-off-by: Nick Clemens commit ba1f33e6ae69e9e1e499b5fedee299211580469f Author: Owen Leonard Date: Wed Jan 23 16:40:44 2019 +0000 Bug 22195: Change default DataTables configuration to consolidate buttons This patch changes the default DataTables configuration provided by the columns settings include file. It consolidates DataTables buttons into to menus: One for column configuration and one for export options. This change would not affect tables which aren't set up for column configuration. To test, apply the patch and view a page with columns configuration. Example: Tools -> Notices & slips - Confirm that the buttons appear as expected. - Confirm that each button menu performs its task correctly (column visiblity, export, print). - Test other pages with columns configuration. For instance: Acquisitions order search, Currencies administration, Holds queue Signed-off-by: David Nind Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit dd7daf493b50c019cd8b7737e42536567ebdc694 Author: Owen Leonard Date: Mon Jan 28 18:46:41 2019 +0000 Bug 21850: (follow-up) Add query information in title attribute This follow-up adds back the old machine-friendly search details to a title attribute in case it might be useful for debugging purposes. To test, apply the patch and perform a search in the OPAC. On the search results page, hover your mouse over the "Results" link in the breadcrumbs. The title attribute value should appear with the search details. Signed-off-by: Nick Clemens commit aa3294ae579a49c7279c89aef475b0134426a943 Author: Owen Leonard Date: Fri Jan 4 15:26:05 2019 +0000 Bug 21850: Remove search request from page title of OPAC result list This patch modifies the OPAC search results template so that advanced search terms are not shown in the page title and breadcrumbs. This removes potentially confusing computer-oriented code from the public view. For simple searches the search term is displayed, using the same logic that determines whether the search bar should be populated with the last search term. To test: - Apply the patch - Peform a simple keyword search in the OPAC - On the results page the title and breadcrumbs should show 'Results of search for [your keyword] - Perform an advanced search with multiple parameters - The page title and breadrumbs should show only 'Search results' - The breadcrumbs should also show a link back to Advanced search using the returntosearch parameter Signed-off-by: Maryse Simard Signed-off-by: mikael Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 5189a42588209ae3e2d34dfbe5ae6e3a451bdb73 Author: Nick Clemens Date: Mon Feb 4 15:54:59 2019 +0000 Bug 20809: Compiled CSS Signed-off-by: Nick Clemens commit 268a1248a39ce2cbf641e9161932e4b060d71225 Author: Katrin Fischer Date: Sun Jan 6 00:22:28 2019 +0000 Bug 20809: (QA follow-up) Fix missing filters Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 12e331d14890569eaca1f0a7a4948641be4bbd18 Author: Owen Leonard Date: Fri Sep 14 17:06:31 2018 +0000 Bug 20809: (follow-up) Add missing JS to view log page If the log viewer is being used to track patron-related data the patron-related JavaScript file should be included. To test, apply the patch and open a patron record. In the left-hand sidebar choose Modification Log. Test the patron image edit/replace process from the patron image in the sidebar and confirm that it works correctly. Signed-off-by: Lucas Gass Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 2578b9469141a4f0c7f24b4fd5743fa2ce4fbca2 Author: Owen Leonard Date: Wed Sep 12 16:33:48 2018 +0000 Bug 20809: (follow-up) Corrections to CSS and JS This follow-up modifies JavaScript so that the confirmation dialog is triggered when deleting a patron image from the modal window. The CSS is modified to improve the alignment of patron image and edit button. Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 24ffe470ffbe17318ae16f2beb3a2dd488ef00b5 Author: Owen Leonard Date: Tue Aug 14 13:04:39 2018 +0000 Bug 20809: Link patron image to patron image add/edit form This patch modifies an include file so that it is possible with edit a patron's image on any patron-related page which uses that include. To test you must have the patronimages system preference enabled. Apply the patch and open any patron record for viewing. - Hover the mouse over the patron image. - If the patron has a previously-defined patron image, should you see an "Edit" button appear. Clicking the button should display a modal dialog titled "Edit patron image." Test that the "Upload," "Delete," and "Cancel" buttons work correctly. - If a patron has no patron image defined, you should see an "Add" button appear. Clicking the button should display a modal dialog titled "Edit patron image." Test that the "Upload," "Delete," and "Cancel" buttons work correctly. This process should work from any page which shows the patron sidebar: Check out, Details, Fines, Routing lists, Circulation history, etc. Patch works as described. Signed-off-by: Dilan Johnpull? Signed-off-by: Katrin Fischer Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 6179f23dd8b4ed24add2e76c7b8e193372052201 Author: Marcel de Rooy Date: Mon Nov 12 11:48:23 2018 +0100 Bug 21808: Field 711 is not handled correctly in showAuthor XSLT for relator term or code The test should check $4 or $e for fields ne 111,711. And should check $4 or $j for 111,711. Test plan: Edit a record, add a meeting in 711 without $4 but with $j. Without this patch the term is not visible, with this patch it is. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit b3c25b64b868b56423c50b9df4fac4bb55947679 Author: Kyle M Hall Date: Thu Jan 10 14:32:22 2019 -0500 Bug 22097: CataloguingLog should be suppressed for item branch transfers Bug 18816 missed the fact that a branch transfer triggers ModItem and thus generates an action log line. We should not be creating those action logs, especially considering the transfers table itself already documents the transfer. Test Plan: 1) Enable CataloguingLog 2) Transfer an item to another branch 3) Note the new action log line created 4) Apply this patch 5) Create another item transfer 6) No new action log line should be created! Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 9caede8d3ce67c684afd615b93ae2eb3dd5991bb Author: Owen Leonard Date: Thu Jan 24 13:48:42 2019 +0000 Bug 22197: Add Mana KB link to administration sidebar menu This patch adds a link to the Mana KB configuration page to the administration sidebar menu. To test, apply the patch and: - Log in to the staff client as a user who lacks permission to manage Mana KB. - Go to an Administration page which shows the sidebar, like Libraries or Patron categories. There should be no link to Mana KB in the left-hand sidebar. - Log in to the staff client as a user who has permission to manage Mana KB. - Go to Administration -> Mana KB - In the sidebar menu you should see a link to Mana KB and it should be bold. - Navigate to another Administration page which shows the sidebar. The Mana KB link should not be highlighted. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 7f918ed8b1deed69609850800675e704da4cbf68 Author: Nick Clemens Date: Mon Feb 4 14:59:37 2019 +0000 Bug 22198: DBRev 18.12.00.013 Signed-off-by: Nick Clemens commit e142e85d65f91a58a7aefbab3560d59f92134c2f Author: Owen Leonard Date: Thu Jan 24 13:47:26 2019 +0000 Bug 22198: Add granular permission setting for Mana KB This patch adds a separate permission for managing Mana KB. To test, apply the patch and update the database. - Open the permissions page for a patron with staff client privileges - Confirm that there is a "Manage Mana KB content sharing (manage_mana)" permission. - Leaving this new permission unchecked, log into the staff client with as that patron and go to the Administration home page. - The "Using Mana-KB" link should not appear. - Navigate directly to /cgi-bin/koha/admin/share_content.pl. You should get a "permission denied" message. - Modify the patron's permissions to grant them access to Mana KB. - Confirm that the link now appears on the Administration home page and that the user can access the page. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 1575d339629e68902ad9a92565f4b331e8c04d79 Author: Josef Moravec Date: Mon Jan 28 20:56:40 2019 +0000 Bug 22196: (QA follow-up) Fix some more typo Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 081bb2d9bc8ba6bf53c57507a2f6e7bdf0b4fa32 Author: Katrin Fischer Date: Sun Jan 27 01:07:01 2019 +0000 Bug 22196: (QA follow-up) Fix some typo Fixes the typo on the admin main page. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit d0a8d0e55a07e07d95474a09b751f23a79fac979 Author: Owen Leonard Date: Wed Jan 23 17:56:50 2019 +0000 Bug 22196: Clean up Mana KB administration template This patch makes language changes to the Mana KB administration template, and corresponding language changes to the Web Services preference file. Some markup errors have been fixed: - Correct title and breadcrumbs, copied and pasted from another template - Add ids to form fields to match their label "for" attributes - Make s self-closing - Correct class names on alert dialogs - Wrap text in JavaScript with _() to make it translatable Also changed: Some language revisions to the Mana dialogs on the Administration home page. To test, apply the patch and go to Administration -> Share content with Mana KB. Test the process for enabling and configuring Mana KB. Check that forms work correctly and that the language of instructions and labels reads well. Go to Administration -> System preferences -> Web services, and confirm that the language changes to the Mana KB preference look good. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit ab9e4ca6a46519ddc69ad76837407c0a4f0ed0cd Author: Jonathan Druart Date: Tue Dec 11 10:13:42 2018 -0300 Bug 21907: Fix article requests count for non-superlibrarians The query generates "Column 'branchcode' in where clause is ambiguous" Test plan: 1 - Enable 'IndependentBranchesPatronModifications' and article requests 2 - Sign in as non-superlibrarian 3 - View plack log 4 - Refresh mainpage, see error in logs Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 7520ede89987a7a65301debdda46950a6364ebfd Author: Owen Leonard Date: Wed Oct 3 16:07:19 2018 +0000 Bug 16231: Correct permission handling in subscription edit This patch corrects the way subscription edit menu items are displayed according to the user's permissions settings. To test, apply the patch and log in to the staff client as a user who has permission to create, edit, and delete subscriptions. - Locate an subscription and view the details for it. - Confirm that each "Edit" menu item works correctly. - Repeat the process when logged in as a user with varying combinations of create, edit, and delete permissions. - Test as a user limited by IndependentBranches. Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 1da0ba48b6fdf38cfd3d3ea63ec076b15995610f Author: Martin Renvoize Date: Fri Feb 1 09:55:54 2019 +0000 Bug 22254: Correction to datehandling in test Adding 13 months is not always the same as adding 1 month and then adding 12 months in DateTime maths. This patch rectified the test to match the correct behaviour in koha. Test plan. 1) Modify the test (around line 268) to test against the suspect leap date of 2019-01-31 and watch the test fail. 2) Apply the patch (which also adds this modification to test for such a leap date) and watch the test now pass. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit a32653a66fa02f1fe9002647d337261bf36d62e0 Author: Nick Clemens Date: Fri Jan 4 18:37:09 2019 +0000 Bug 19915: (follow-up) Fix test count from rebase https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 9961e2c08f8dba0896ed4f6bfa6a7befebd28d5d Author: Nick Clemens Date: Thu Nov 1 13:11:16 2018 +0000 Bug 19915: Don't delete in tests https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit a8259c38dbe910188ece5126d226166014e001ed Author: Nick Clemens Date: Fri Jun 15 04:10:39 2018 +0000 Bug 19915: Only show class sources in use Signed-off-by: Marcel de Rooy https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit d2ce727e260f6b45266a8147aee7654811a44fa1 Author: Nick Clemens Date: Thu Jan 4 15:00:28 2018 +0000 Bug 19915: Use cn_sort values for getting inventory items To test: 1 - Catalog an item under LCC with callnumber GT95 2 - cn_sort should calculate as GT0095 3 - Go to inventory tool 4 - Enter a range that should have your item e.g LC GT90 to GT100 5 - Item is not returned 6 - Apply patch 7 - Item should be returned 8 - Verify things otherwise work as expected Signed-off-by: Anne-Claire Bernaudin Signed-off-by: Marcel de Rooy https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit c345d30cc8284f690f375faa140de49e62358709 Author: Marcel de Rooy Date: Fri Jul 6 11:20:47 2018 +0200 Bug 19915: (QA follow-up) Tidy up GetItemsForInventory.t Standard edits like modules, schema, Koha objects instead of DBIC. Removing unneeded autoflush. Moving initial test to a first subtest. No need to clear issues if you clear items. Adding a FIXME for OldWay; would be nice to remove that code.. Signed-off-by: Marcel de Rooy https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 186209875a4951b15faded3f8c47eba71716c7af Author: Nick Clemens Date: Thu Jan 4 14:53:14 2018 +0000 Bug 19915: Add unit test to GetItemsForInventory.t prove -v t/db_dependent/Items/GetItemsForInventory.t Signed-off-by: Anne-Claire Bernaudin Signed-off-by: Marcel de Rooy Moved the betwen typo edit back here. https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit fb62e8d1fc8b210a5b23801b7b8faff3280bf638 Author: Marcel de Rooy Date: Wed Jan 30 15:37:10 2019 +0000 Bug 22236: Translation should generate tags with consistent attribute order When running misc/translator/translate, the order of attributes in the translated templates is not consistent and may vary. This is caused by the random order of hash keys in perl. This causes things like this in run 1: And this in run 2: As you can see, there is actually no difference apart from the order. When comparing the result of various translation runs, I would rather get rid of such noise and only see the real changes. The needed change is not trivial to find, but only requires a simple addition to a sort operation in tmpl_process3.pl. The current sort only makes sure that the '/' comes at the end. We should sort the names of the keys too when this value is 0 (just meaning: no end tag symbol). Test plan: [1] Run a translation without this patch and set a few templates aside. [2] Run a translation with this patch. [3] Run a compare (diff) on the templates copied in step 1. Verify that the only changes are found in the sort order of attributes in html tags. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit e33bdbd9dae74987869b52fd6df748784657b632 Author: Nick Clemens Date: Mon Feb 4 14:28:19 2019 +0000 Bug 21751: Compiled CSS Signed-off-by: Nick Clemens commit 0904863c7559467ef9a6f5210950c04dcc5ee04e Author: Owen Leonard Date: Mon Jan 28 13:28:30 2019 +0000 Bug 21751: (follow-up) Correction to selectors This patch makes a couple of corrections to the selectors used by hcsticky in targeting the position of the floating toolbar. These changes were made necessary by changes made in recently-pushed patches. To test, confirm that these two pages work correctly: - Acquisitions -> Vendor -> View basket - Patrons -> New patron Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 014baf181cd4b8c74bfeb04d53f418c58e14ebb8 Author: Jonathan Druart Date: Thu Dec 6 14:54:58 2018 -0300 Bug 21751: Remove former fixFloat plugin Signed-off-by: David Cook Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 4b82ed3549fcea3588b1500574a6715d0fe51702 Author: Owen Leonard Date: Thu Dec 6 17:15:49 2018 +0000 Bug 21751: Replace fixFloat with HC-sticky to fix Chrome display This patch replaces the fixFloat jQuery plugin with a new one: HC-sticky (https://github.com/somewebmedia/hc-sticky). This plugin provides the same functionality without the page-reflow problems fixFloat suffers from. To test, apply the patch and regenerate the staff client CSS. Test the behavior of the floating toolbar on these pages: - Acquisitions -> Vendor -> Vendor details - Acquisitions -> Vendor -> View basket - On both these pages, test toolbar behavior before and after expanding the "Orders search" options at the top of the page. - Administration -> System preferences - Authorities -> Create or edit an authority - Catalog -> Advanced search - Search results - Catalog -> Item search - Cataloging -> Add or edit a record - Open the plugin window for the 008 field - Tools -> Label creator -> New label batch -> Add items -> Search -> Results - Patrons -> New patron - Test before and after expanding the patron search options at the top of the page - Test editing a patron too - Tools -> Automatic item modifications by age -> Edit - Tools -> Notices & slips -> Edit - Lists -> View list Check that the About page has been updated with information about the plugin. Signed-off-by: David Cook Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 3ca0234d34ac9708a8335cfa97805fb7498201bf Author: Fridolin Somers Date: Thu Jan 31 09:12:13 2019 +0100 Bug 22242: Javascript error in value builder cased by Select2 Same as Bug 17780 but in value builders. Select2 (Bug 13501) introduced divs and inputs that broke some assumptions about the expected HTML structure. This patch checks if input has name attribute, because some inputs in Select2 have not. It brakes value builders marc21_linking_section.tt and unimarc_field_4XX.tt. Test plan : 1) On a MARC21 database 2) Define 774$0 as a regular subfield 3) Define 774$4 with an authorised value category 4) Define 774$t with value builder marc21_linking_section 5) Create a new record 6) Use value builder in 774$t 7) Search for a record and click choose 8) Without patch : a popup window does not close and show a blank screen 9) With patch : popup windows get close and you see in field 774 $0 and $t field with values 10) Same tests with a UNIMARC database on field 461 with value builder unimarc_field_4XX.tt Signed-off-by: Owen Leonard Tested successfully with MARC21 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit b2dce05ddff8a047e7770ea241b1edd9b798212e Author: Tomas Cohen Arazi Date: Thu Jan 24 14:29:09 2019 -0300 Bug 19816: Implement dateonly for rfc3339 format This patch implements the dateonly option for the rfc3339. This is described in the OpenAPI 2.0 specification [1]. The required output format is described on RFC 3339 [2], as 'full-date'. [1] https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#dataTypeFormat [2] https://tools.ietf.org/html/rfc3339#section-5.6 To test: - Apply the regression tests patch - Run: k$ prove t/DateUtils.t => FAIL: Tests fail because dateonly is not implemented - Apply this patch - Run: k$ prove t/DateUtils.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 7e69ab62a5ef3fbd350c6606d25b5ab6f6bc168e Author: Tomas Cohen Arazi Date: Thu Jan 24 14:27:28 2019 -0300 Bug 19816: Regression tests This patch adds tests for the rfc3339 behaviour when dateonly => 1. To test: - Run: $ kshell k$ prove t/DateUtils.t => SUCCESS: Tests pass - Apply this patch - Run: k$ prove t/DateUtils.t => FAIL: dateonly is not implemented Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 0f83ac98c753efbae7e33619be717327a820f2e1 Author: Tomas Cohen Arazi Date: Thu Jan 31 16:30:25 2019 -0300 Bug 22253: Check we actually need to update the password This patch makes memberentry.pl check if password needs to be updated before attempting to call set_password. Above this there's a check that won't raise any errors if no password is passed, or the default string (****) is received. So we could reach that line of code with no password, but the code wouldn't check that. To test: - In master, edit any patron without changing the password => FAIL: It raises an exception - Apply this patch - Edit the patron withtout changing the password => SUCCESS: Edit successful - Edit the patron, changing the password - Try to login with the new password => SUCCESS: The password got changed correctly - Sigh off :-D Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 14 ++- Koha.pm | 2 +- Koha/DateUtils.pm | 9 +- admin/share_content.pl | 2 +- gulpfile.js | 2 +- installer/data/mysql/backfill_statistics.pl | 3 +- installer/data/mysql/labels_upgrade.pl | 3 - installer/data/mysql/patroncards_upgrade.pl | 3 - installer/data/mysql/update22to30.pl | 1 - installer/data/mysql/updatedatabase.pl | 12 ++- installer/data/mysql/userpermissions.sql | 1 + installer/externalmodules.pl | 5 +- installer/html-template-to-template-toolkit.pl | 3 +- installer/install.pl | 3 +- koha-tmpl/intranet-tmpl/lib/hc-sticky.js | 11 +++ .../lib/jquery/plugins/jquery.fixFloat.js | 73 --------------- koha-tmpl/intranet-tmpl/prog/css/datatables.css | 10 ++ .../intranet-tmpl/prog/css/src/staff-global.scss | 79 +++++++++++----- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/includes/admin-menu.inc | 3 + .../intranet-tmpl/prog/en/includes/circ-menu.inc | 54 ++++++++--- .../prog/en/includes/columns_settings.inc | 35 +++++-- .../intranet-tmpl/prog/en/includes/permissions.inc | 1 + .../prog/en/includes/serials-toolbar.inc | 35 ++++--- .../prog/en/includes/str/members-menu.inc | 15 ++- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 + .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 13 ++- .../prog/en/modules/acqui/supplier.tt | 11 ++- .../prog/en/modules/admin/admin-home.tt | 39 ++++---- .../prog/en/modules/admin/preferences.tt | 14 ++- .../en/modules/admin/preferences/web_services.pref | 11 ++- .../prog/en/modules/admin/share_content.tt | 81 +++++++++-------- .../prog/en/modules/authorities/authorities.tt | 9 +- .../prog/en/modules/catalogue/advsearch.tt | 9 +- .../prog/en/modules/catalogue/itemsearch.tt | 10 +- .../prog/en/modules/catalogue/results.tt | 11 ++- .../prog/en/modules/cataloguing/addbiblio.tt | 9 +- .../cataloguing/value_builder/marc21_field_008.tt | 11 ++- .../value_builder/marc21_linking_section.tt | 1 + .../cataloguing/value_builder/unimarc_field_4XX.tt | 1 + .../en/modules/course_reserves/course-details.tt | 40 ++++++-- .../intranet-tmpl/prog/en/modules/labels/result.tt | 11 ++- .../prog/en/modules/members/memberentrygen.tt | 41 ++++----- .../prog/en/modules/members/moremember.tt | 16 +--- .../prog/en/modules/members/paycollect.tt | 96 ++++++++++++++++++-- .../tools/automatic_item_modification_by_age.tt | 9 +- .../prog/en/modules/tools/inventory.tt | 13 ++- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 + .../prog/en/modules/virtualshelves/shelves.tt | 9 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- koha-tmpl/intranet-tmpl/prog/js/letter.js | 8 +- koha-tmpl/intranet-tmpl/prog/js/members-menu.js | 16 ++++ koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 5 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 27 ++++-- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- mainpage.pl | 2 +- members/memberentry.pl | 5 +- misc/translator/tmpl_process3.pl | 1 + t/DateUtils.t | 5 +- t/db_dependent/Items/GetItemsForInventory.t | 61 ++++++++++++- t/db_dependent/Koha/Patrons.t | 8 +- tools/inventory.pl | 10 ++ 63 files changed, 669 insertions(+), 338 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/lib/hc-sticky.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.fixFloat.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 6 00:06:33 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Feb 2019 23:06:33 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-34-g5315b2d 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, 18.05.x has been updated via 5315b2de1e35f49c470b225467af464252dcbaae (commit) from 2f918ab38d22047a8cd180aa16248f41ffc10329 (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 5315b2de1e35f49c470b225467af464252dcbaae Author: Nick Clemens Date: Thu Jan 24 14:57:46 2019 +0000 Bug 22203: Holds modal does not link to patorn account To test: 1 - Place a hold for a patron 2 - Check the item in at the pickup location 3 - Note the holds modal does not link to patron 4 - Apply patch 5 - Check in item again 6 - Patron name in modal is a link Signed-off-by: Maryse Simard Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 258c538e76914e6c2023242b555bb38c6f1970b9) Signed-off-by: Martin Renvoize (cherry picked from commit fe56745739adcec6a7cb441ced3c359369aacca1) ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 6 00:29:06 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Feb 2019 23:29:06 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-37-ga93fca9 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, 18.05.x has been updated via a93fca9b201d37b5887444cf23b169ea2516f923 (commit) via 11abf890e9b0d4843b5594060987028817104589 (commit) via ea3972c08090619c462354cb1c37bdd2947bd0ad (commit) from 5315b2de1e35f49c470b225467af464252dcbaae (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 a93fca9b201d37b5887444cf23b169ea2516f923 Author: Nick Clemens Date: Mon Jan 28 11:32:55 2019 +0000 Bug 21877: (RM follow-up) Move space into conditional Signed-off-by: Nick Clemens (cherry picked from commit 5b4cbb1643aa20ada17c3f73df3e59dfc5a3dbd8) Signed-off-by: Martin Renvoize (cherry picked from commit 582a84a6c7328efe78bbacaad293e4e21e6785ca) Signed-off-by: Lucas Gass commit 11abf890e9b0d4843b5594060987028817104589 Author: Fridolin Somers Date: Tue Jan 22 09:45:02 2019 +0100 Bug 21877: Use AuthorisedValues.GetDescriptionByKohaField for notforloan in checkout Using only TT plugin for authorised value description is a better code. Test plan : Part 1: 1.1) On a catalog with items.notforloan defined with authorized values category NOT_LOAN 1.2) Define in NOT_LOAN an authorized values 1 with description 'at the beach' 1.3) Define in NOT_LOAN an authorized values 2 with description empty Part 2: 2.1) Set preference 'AllowNotForLoanOverride' to 'Don't allow' 2.2) Edit an item with notforloan=1 2.3) Checkout this item => You see 'Item not for loan (at the beach)' 2.4) Edit an item with notforloan=2 2.5) Checkout this item => You see 'Item not for loan' Part 3: 3.1) Set preference 'AllowNotForLoanOverride' to 'Allow' 3.2) Edit an item with notforloan=1 3.3) Checkout this item => You see 'Item is normally not for loan (at the beach)' 3.4) Edit an item with notforloan=2 3.5) Checkout this item => You see 'Item is normally not for loan' Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 36df53ad8d4987e938e478d934d553b73e7450f2) Signed-off-by: Martin Renvoize (cherry picked from commit 30895e2c561215fa7c094c9838021a0095a578ba) Signed-off-by: Lucas Gass commit ea3972c08090619c462354cb1c37bdd2947bd0ad Author: Fridolin Somers Date: Tue Jan 22 09:47:22 2019 +0100 Bug 21877: Show authorized value description for withdrawn in checkout During checkout the withdrawn information is displayed in a message : "Item has been withdrawn". Like in other pages and like notforloan, we should display the withdrawn authorized value description. This patch adds this display. Add so that translation does not change. Also adds class 'co-withdrawn' (like in checkin 'ci-*' classes) to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Edit an item with withdrawn=1 5) Checkout this item => You see 'Item has been withdrawn (dropped in trash)' 6) Edit an item with withdrawn=2 7) Checkout this item => You see 'Item has been withdrawn' Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit cfd59672bb09c4766632de4c6f11cf9cf4bea3f9) Signed-off-by: Martin Renvoize (cherry picked from commit c22928630ac2c00501b2bb17d60a3b2ba99481c5) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: circ/circulation.pl | 4 +--- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 14 +++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 6 00:37:19 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Feb 2019 23:37:19 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-41-g7c89f03 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, 18.05.x has been updated via 7c89f035807f5fbecd14c91cff4fbfcb554669f9 (commit) via a2bb202071b6b101869bbf694c75b8ae406cdb63 (commit) via a4bca9e77c15502dc35a8acd0d0802e7c98f826a (commit) via 25f979cc5ae37290e7af0bd7adc7820068708081 (commit) from a93fca9b201d37b5887444cf23b169ea2516f923 (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 7c89f035807f5fbecd14c91cff4fbfcb554669f9 Author: Tomas Cohen Arazi Date: Mon Jan 28 12:23:35 2019 -0300 Bug 21478: (QA follow-up) Make sure tests don't fail randomly Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit e33f125384694dd825965dffae8d2ca31840aecf) Signed-off-by: Martin Renvoize (cherry picked from commit 17231a2c35f13bef2fc19551cb7c3c7110e5c438) Signed-off-by: Lucas Gass commit a2bb202071b6b101869bbf694c75b8ae406cdb63 Author: Tomas Cohen Arazi Date: Fri Jan 25 13:49:37 2019 -0300 Bug 21478: Make Koha::Hold->suspend reject found holds Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 1d5934cae52dd96d9c5b8685a5f5531c69e92df8) Signed-off-by: Martin Renvoize (cherry picked from commit 81c6172ee224f7432ec809f8a9cd17f9c4971ecc) Signed-off-by: Lucas Gass commit a4bca9e77c15502dc35a8acd0d0802e7c98f826a Author: Tomas Cohen Arazi Date: Fri Jan 25 13:48:54 2019 -0300 Bug 21478: Unit tests Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 92db2e74fd3cd761ae67d2f7573ee03d32d0a8ed) Signed-off-by: Martin Renvoize (cherry picked from commit f087b9895eb97f29a5a712dfcb3d0946fd570afd) Signed-off-by: Lucas Gass commit 25f979cc5ae37290e7af0bd7adc7820068708081 Author: Tomas Cohen Arazi Date: Fri Jan 25 12:48:04 2019 -0300 Bug 21478: Add Koha::Exceptions::Hold Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 11ce911915a237047d8168876849de3df2b3b2e0) Signed-off-by: Martin Renvoize (cherry picked from commit ddbfc92aa601e672535c4478eb8e65e624a7d53f) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha/Exceptions/Hold.pm | 69 +++++++++++++++++++++++++++++++ Koha/Hold.pm | 24 ++++++++--- t/Koha/Exceptions.t | 23 ++++++++++- t/db_dependent/Hold.t | 105 +++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 206 insertions(+), 15 deletions(-) create mode 100644 Koha/Exceptions/Hold.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 6 17:46:41 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Feb 2019 16:46:41 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-42-gd1fb153 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, 18.05.x has been updated via d1fb153aabe31a816f95785d6225b70e8084113d (commit) from 7c89f035807f5fbecd14c91cff4fbfcb554669f9 (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 d1fb153aabe31a816f95785d6225b70e8084113d Author: Lucas Gass Date: Wed Feb 6 16:17:43 2019 +0000 Bug 21478: (RMaint follow-up) fixed test count Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: t/Koha/Exceptions.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 6 19:20:52 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Feb 2019 18:20:52 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-54-g7983a81 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, 18.05.x has been updated via 7983a8122359e7c258849c0ea873f84f6f400e9e (commit) via a1bb5588fd1757537c7fe89ed5b0f178c1ee1b39 (commit) via b73a4a79c54b200510714f669f563d1c79f8fe1a (commit) via 7cc47deb40b0f969d7793efe7fb444169f613d8b (commit) via e940d87a29dc6f470d66a286d033ad2682b335b5 (commit) via 3ea009bcc33656e3644ff71cd1fae086bdf3a529 (commit) via cd7e62f06b2e494de2895bc276371062c6827795 (commit) via 3e7bed07c34d0cf62705e4477a6169b5ca68dc62 (commit) via 190971bd4eda7ee7f96997af10f0e564a2096705 (commit) via dae6496a4bd3f4a5e5bd699d3b9e98e4b9e10285 (commit) via c641fb1b0840b30f189a16693ffe4306e009aaff (commit) via da0de43d4bd3ac3028f7d3032e028ee1228505a0 (commit) from d1fb153aabe31a816f95785d6225b70e8084113d (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 7983a8122359e7c258849c0ea873f84f6f400e9e Author: Jasmine Amohia Date: Thu Jan 17 00:51:11 2019 +0000 Bug 19994: Used Modern::Perl in Authorities perl scripts Test plan: 1. Review code of the following files and confirm that 'use Modern::Perl;' is used in place of 'use strict; use warnings;' auth_finder.pl authorities-home.pl authorities.pl blinddetail-biblio-search.pl detail-biblio-search.pl detail.pl export.pl merge.pl merge_ajax.pl Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 843c4a4bae760754d96867d2596bc78651910c8e) Signed-off-by: Martin Renvoize (cherry picked from commit 69802bed3e61f2039c14952480e57540e8f03ca8) Signed-off-by: Jesse Maseto commit a1bb5588fd1757537c7fe89ed5b0f178c1ee1b39 Author: helene hickey Date: Thu Jan 17 02:28:57 2019 +0000 Bug 15110: Improve decreaseHighHolds system preference description To test: 1) Apply patch 2) Go to Koha admin 3) Search in system prefernces for 'high demand' 4) Verify that the system prefernce 'decreaseLoanHighHolds' is in the results of the search Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit fe2dceba34310c890dd1f06b114de9f3151f59e1) Signed-off-by: Martin Renvoize (cherry picked from commit c8ca6926ed114062d4a55ce981b32ffeb670fc7a) Signed-off-by: Jesse Maseto commit b73a4a79c54b200510714f669f563d1c79f8fe1a Author: Josef Moravec Date: Mon Jan 14 09:16:53 2019 +0000 Bug 22124: Update cataloguing plugin system to not generate type parameter in script tag Test plan: 1) Apply the patch 2) Have defined some cataloguing plugin which generates javascript - for example dateaccessioned.pl 3) Go to cataloguing/adding item and show source -> there should be no type parameter in script tag in code added by cataloguing pulgin 4) prove t/db_dependent/FrameworkPlugin.t Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit cadb7eaab2c9617551450f84acadff0d48a846b2) Signed-off-by: Martin Renvoize (cherry picked from commit b27150cf9a4c62a636ed7d158e1fe44941de189b) Signed-off-by: Jesse Maseto commit 7cc47deb40b0f969d7793efe7fb444169f613d8b Author: Ethan Amohia Date: Wed Jan 16 04:01:44 2019 +0000 Bug 22136: Added 'ExtendedPatronAttributes' notes to 'Import Patrons' notes. Fixed ExtendedPatronAttributes typo. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 273656f84c9dbc49c8a3669c7994b8c0ea7f3522) Signed-off-by: Martin Renvoize (cherry picked from commit 1debd138ca3603b7bf7fa0929553203c7bcbe2ac) Signed-off-by: Jesse Maseto commit e940d87a29dc6f470d66a286d033ad2682b335b5 Author: Josef Moravec Date: Fri Nov 30 10:26:54 2018 +0000 Bug 21926: Enhance OAI-PMH:archiveID system preference description Test plan: 1) Apply the patch 2) Go to Administration -> System preferences -> Web services, section OAI-PMH 3) See description on OAI-PMH:archiveID and confirm it does make sense and have the link to implementation guidelines Signed-off-by: Michal Denar Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ddc4c5b8aa75cfe8994ff150a0cae4cc51656852) Signed-off-by: Martin Renvoize (cherry picked from commit 62d5d98371a673bb8c1c15d5dad382cf866879d2) Signed-off-by: Jesse Maseto commit 3ea009bcc33656e3644ff71cd1fae086bdf3a529 Author: helene hickey Date: Wed Jan 16 23:20:38 2019 +0000 Bug 21290: Updating documentation for ModItem To test: Review the patch and check it is now updated correctly Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 9a5bfee706f85bc5fd53a9c2d0616c2e1186379a) Signed-off-by: Martin Renvoize (cherry picked from commit e96eed9b841394353cc5c4484ddc608432e22d29) Signed-off-by: Jesse Maseto commit cd7e62f06b2e494de2895bc276371062c6827795 Author: Jasmine Amohia Date: Wed Jan 16 20:53:40 2019 +0000 Bug 20679: Removed 'rows per page' from report print layout Test plan: 1. Create a report or view an existing report 2. Notice that 'Rows per page:' is visible 3. Print report (Ctrl+P) 4. Confirm that on printed report, 'Rows per page:' is no longer visible Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 65b64bcafacf983a101f263e554b6d7274567bb9) Signed-off-by: Martin Renvoize (cherry picked from commit ba8cd76c6239ed71246c26666f16f07f56b731b7) Signed-off-by: Jesse Maseto commit 3e7bed07c34d0cf62705e4477a6169b5ca68dc62 Author: Jasmine Amohia Date: Wed Jan 16 23:10:35 2019 +0000 Bug 22149: Fixed grammar in the manage_circ_rules_from_any_libraries description Test plan: 1. Review patch and confirm that the sentence makes sense Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 9e79de6ef2d1662d04018203d2f9ff48be8a0f0f) Signed-off-by: Martin Renvoize (cherry picked from commit e227fea2a23b9da2f201e49934018342109c9cd7) Signed-off-by: Jesse Maseto commit 190971bd4eda7ee7f96997af10f0e564a2096705 Author: Jack Kelliher Date: Tue Jan 15 03:24:17 2019 +0000 Bug 21930: Reworded message on permissions.inc 1. Go to patrons account, more, Set Permissions. 2. Dropdown the Parameters section. 3. Text should display "If not set the logged in user could only edit circulation rules for its the own library (please note that manage_circ_rules is still required)" 4. Apply patch and reload page 5. Text should now display "Edit circulation rules from any library. If not set the logged in user could only edit circulation rules for their own library (please note that manage_circ_rules is still required)" Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ae84cf1e7a512ce198e5fe7e0b4dd3930967ba76) Signed-off-by: Martin Renvoize (cherry picked from commit ea8bd52f6dbb6aab6aabb1d9e191b0356ba1a529) Signed-off-by: Jesse Maseto commit dae6496a4bd3f4a5e5bd699d3b9e98e4b9e10285 Author: Jasmine Amohia Date: Tue Jan 15 21:34:32 2019 +0000 Bug 20569: Improved description of CheckPrevCheckout system preference The CheckPrevCheckout preference can be overriden by a setting in the patron categories, I've edited the options to reflect this. Test plan: 1. Check the CheckPrevCheckout system preferences and confirm that the options are clear Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 9b69ceeac64850dce05b56c978856bd5d1c43b06) Signed-off-by: Martin Renvoize (cherry picked from commit 52e13bf70c68df255b241f248ec138b96cc41cf1) Signed-off-by: Jesse Maseto commit c641fb1b0840b30f189a16693ffe4306e009aaff Author: Caroline Cyr La Rose Date: Tue Jan 8 09:28:35 2019 -0500 Bug 22083: Typo in circulation_batch_checkouts.tt There is a typo in circulation_batch_checkouts.tt that makes Koha skip a warning if the user cannot borrow due to circulation rules. This patch corrects this typo. To test: 1. In Administration > Global system preferences, 'Allow' BatchCheckouts and enter patron categories in BatchCheckoutsValidCategories 2. Go to Administration > Circulation and fines rules 3. Enter a rule where a certain category of patrons (that is in BatchCheckoutsValidCategories) cannot take out a particular item type 4. Search the catalog for an item of that item type 5. Copy the barcode 6. Go into patrons and find a patron of that category 7. Click on the Batch checkout tab 8. Paste the barcode in the box and click Check out 9. It should say 'Too many checked out' 10. Apply the patch 11. Try the check out again, it should show both warnings ('Too many checked out' and 'This patron can't check out this item per library circulation policy') Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 3ee95bd0213943b625ea5a35eb04e45835cf6f65) Signed-off-by: Martin Renvoize (cherry picked from commit 4c928041f1ee5ec4c21aab24dfd7f69399ae330f) Signed-off-by: Jesse Maseto commit da0de43d4bd3ac3028f7d3032e028ee1228505a0 Author: Lucas Gass Date: Fri Jan 25 15:37:21 2019 +0000 Bug 22207: course reserves page does not have unique id Test plan: Go to cgi-bin/koha/opac-course-reserves.pl in the OPAC and make sure the body id is opac-course-reserves Signed-off-by: Owen Leonard Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 358adce2e75bdd317165c86a9b5064bc52d9e2ad) Signed-off-by: Martin Renvoize (cherry picked from commit a4345d8af3b6e30d21d7cd310dc144fd50d04b8e) Signed-off-by: Jesse Maseto ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 3 +-- Koha/FrameworkPlugin.pm | 4 +--- authorities/auth_finder.pl | 3 +-- authorities/authorities-home.pl | 3 +-- authorities/authorities.pl | 4 ++-- authorities/blinddetail-biblio-search.pl | 3 +-- authorities/detail-biblio-search.pl | 4 +--- authorities/detail.pl | 4 +--- authorities/export.pl | 3 +-- authorities/merge.pl | 3 +-- authorities/merge_ajax.pl | 3 +-- koha-tmpl/intranet-tmpl/prog/css/print.css | 1 + koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 1 + .../prog/en/modules/admin/preferences/circulation.pref | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref | 4 ++-- .../prog/en/modules/admin/preferences/web_services.pref | 4 +++- .../prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt | 2 +- 19 files changed, 23 insertions(+), 32 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 7 02:40:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Feb 2019 01:40:05 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-55-g4c5ec5a 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, 18.05.x has been updated via 4c5ec5ae42f45a7d26018ff547f1489b70a6b1a3 (commit) from 7983a8122359e7c258849c0ea873f84f6f400e9e (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 4c5ec5ae42f45a7d26018ff547f1489b70a6b1a3 Author: Kyle M Hall Date: Thu Nov 15 08:35:33 2018 -0500 Bug 21495: Regression in hold override functionality The changes caused by the patches for bug 11512 have broken existing workflows for many libraries and are widely considered to be a bad move. We should revert this behavior. Signed-off-by: Kyle M Hall Signed-off-by: Rhonda Kuiper Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 398704662487a0c8a3f848a2ae23618ee96406ff) Signed-off-by: Martin Renvoize (cherry picked from commit e3fde6153e66b7c01b804ec7c36e22706abd3e27) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref | 2 +- reserve/request.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 7 02:46:49 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Feb 2019 01:46:49 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-56-gfcc13aa 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, 18.05.x has been updated via fcc13aaf7751a779dd059a0c907d663c96e48d27 (commit) from 4c5ec5ae42f45a7d26018ff547f1489b70a6b1a3 (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 fcc13aaf7751a779dd059a0c907d663c96e48d27 Author: Olivia Lu Date: Tue Jan 15 21:24:25 2019 +0000 Bug 20634: Changing the identical label "Library:" to "Location" in Inventory Home. To find fix: 1. Go to tools 2. Go to Inventory 3. Verify that under Item location filters the label should be "Location" Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a3993a75822972e1e013410ab020f5a749248017) Signed-off-by: Martin Renvoize (cherry picked from commit 92001cc504d03f3aa20b5295154e9ae66c0a530e) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 8 01:49:09 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Feb 2019 00:49:09 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-62-g5dd2bed 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, 18.05.x has been updated via 5dd2bed00cf4661cb9d1762415df649db7648e19 (commit) via c028f916747ee4b6618b76ff5a85db1f3ba9ff88 (commit) via 7296f1d0bf76798ab914f45d65810e23194a565d (commit) via 2403b01021e66cae65e210426b644cc6a695ff5f (commit) via 2b12b70de4a117365cf76521be2119aa01a00957 (commit) via 5b020c98163c9af74b60338d126887eb2fd7ec9f (commit) from fcc13aaf7751a779dd059a0c907d663c96e48d27 (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 5dd2bed00cf4661cb9d1762415df649db7648e19 Author: Lucas Gass Date: Thu Feb 7 23:31:38 2019 +0000 Bug 22132: DBRev 18.05.08.001 Signed-off-by: Lucas Gass commit c028f916747ee4b6618b76ff5a85db1f3ba9ff88 Author: Tomas Cohen Arazi Date: Wed Jan 30 15:46:04 2019 -0300 Bug 22132: (QA follow-up) set_password now expects a hashref Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 63f40e519c7fbbba70a2944113830a1d3ed80306) Signed-off-by: Martin Renvoize (cherry picked from commit 3c8f67afe8d6e4dcc044d5f97a66336bd76af93e) Signed-off-by: Lucas Gass commit 7296f1d0bf76798ab914f45d65810e23194a565d Author: Martin Renvoize Date: Thu Jan 24 15:54:08 2019 +0000 Bug 22132: (QA follow-up) Tests - use Mojo builtin for auth Mojolicious has built in handling for encoding/decoding of of basic auth paramenters. We should use it to simplify our test here. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 8ee08c3922dd892e9432ce243fc7244092fdd18f) Signed-off-by: Martin Renvoize (cherry picked from commit a9b3b01dd9290f964d739e0f2f818990d9a6e9ba) Signed-off-by: Lucas Gass commit 2403b01021e66cae65e210426b644cc6a695ff5f Author: Tomas Cohen Arazi Date: Tue Jan 15 13:23:23 2019 -0300 Bug 22132: Add Basic authentication to the API This patch implements Basic authentication for the API to aid testers and developers with tools like Postman. To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/api/v1/auth_basic.t => SUCCESS: Tests pass! - Open Postman or your favourite tool - In Authorization, choose Basic auth. - Enter the username and password of a known privileged user. - Hit an endpoint with Postman, for example: ] GET http://kohadev-intra.myDNSname.org:8081/api/v1/patrons => SUCCESS: Basic authentication is great! - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 26af040c79e548e9388346b247f509f743401c34) Signed-off-by: Martin Renvoize (cherry picked from commit 14e2dd9c9f6ee3c2796954f3e25433197c41f9d5) Signed-off-by: Lucas Gass commit 2b12b70de4a117365cf76521be2119aa01a00957 Author: Tomas Cohen Arazi Date: Tue Jan 15 13:23:09 2019 -0300 Bug 22132: Unit tests Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 103670e726b9938aa1484b7486cba94adf7b69a9) Signed-off-by: Martin Renvoize (cherry picked from commit 4730724c661d50df4268d581691cc73de8500186) Signed-off-by: Lucas Gass commit 5b020c98163c9af74b60338d126887eb2fd7ec9f Author: Tomas Cohen Arazi Date: Tue Jan 15 13:22:53 2019 -0300 Bug 22132: Add RESTBasicAuth syspref Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 3ffed7d55a1d77df2d3c0748614434866612ed24) Signed-off-by: Martin Renvoize (cherry picked from commit 3741027605b61b0e988fd7e8df8ec60dc5fe5b99) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/REST/V1/Auth.pm | 46 +++++++++- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 15 ++++ .../en/modules/admin/preferences/web_services.pref | 6 ++ t/db_dependent/api/v1/auth_basic.t | 93 ++++++++++++++++++++ 6 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 t/db_dependent/api/v1/auth_basic.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 11 15:10:36 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Feb 2019 14:10:36 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-114-g99cd91a 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, 18.11.x has been updated via 99cd91ad2dbbc1c24bf4aea41865147013f947bb (commit) via 9199083de8637d96148b873cc745c1a81fe78d01 (commit) via 0f0218bc838bee7b55853a456334fd2518b5784c (commit) via 9c823701268d07feb149e219ece7c88d89d47732 (commit) via f2151c1bbc98003576606d8b1bd2cb2453e6925a (commit) via 413f34ba244af3560861785f5aa74ab457f00b02 (commit) via 2da377435f03ced75d2f9deb782f9838f4cafbdf (commit) via 411f8faffdd0b9eb7c158ab8717029dd10721bcb (commit) via 7f5602a3c36d7975f7f31698459d5e80b0287f77 (commit) via 09ef59cf797853a3b85928ce0c6cf4e084cac64d (commit) via 39acd694cafab8cacd36df329b8a9cda89ed6bd9 (commit) via 567c0df6ee1510fbfa1085460e678ee9e0a4dfa4 (commit) via 150de6dfe7f7d18f5b61e45b0442802c2f61fe9f (commit) via 55b20ad1a7b8afa5c385bd3f9825014d40936ba1 (commit) via dcc0478089f5fde72426d94810bed6430df73a34 (commit) via 41115fc79dfd16be62dd56e1946e0a2e08c6a2fc (commit) from 491ad8fc3389be9db46eb8d42f03f78befd69e66 (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 99cd91ad2dbbc1c24bf4aea41865147013f947bb Author: Aleisha Amohia Date: Wed Dec 19 20:32:32 2018 +0000 Bug 20000: Use Modern::Perl in installer scripts To test: Check that we are using Modern::Perl when strict *and* warnings were used before, and commented lines and FIXMEs have been removed from the rest, out of files listed below. data/mysql/backfill_statistics.pl data/mysql/labels_upgrade.pl data/mysql/patroncards_upgrade.pl data/mysql/update22to30.pl data/mysql/updatedatabase.pl externalmodules.pl html-template-to-template-toolkit.pl install.pl Sponsored-by: Catalyst IT Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 20a38ee50e6fe62712e299bcec9e939dc2bbb58e) Signed-off-by: Martin Renvoize commit 9199083de8637d96148b873cc745c1a81fe78d01 Author: Marcel de Rooy Date: Mon Nov 12 11:48:23 2018 +0100 Bug 21808: Field 711 is not handled correctly in showAuthor XSLT for relator term or code The test should check $4 or $e for fields ne 111,711. And should check $4 or $j for 111,711. Test plan: Edit a record, add a meeting in 711 without $4 but with $j. Without this patch the term is not visible, with this patch it is. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 6179f23dd8b4ed24add2e76c7b8e193372052201) Signed-off-by: Martin Renvoize commit 0f0218bc838bee7b55853a456334fd2518b5784c Author: Kyle M Hall Date: Thu Jan 10 14:32:22 2019 -0500 Bug 22097: CataloguingLog should be suppressed for item branch transfers Bug 18816 missed the fact that a branch transfer triggers ModItem and thus generates an action log line. We should not be creating those action logs, especially considering the transfers table itself already documents the transfer. Test Plan: 1) Enable CataloguingLog 2) Transfer an item to another branch 3) Note the new action log line created 4) Apply this patch 5) Create another item transfer 6) No new action log line should be created! Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit b3c25b64b868b56423c50b9df4fac4bb55947679) Signed-off-by: Martin Renvoize commit 9c823701268d07feb149e219ece7c88d89d47732 Author: Jonathan Druart Date: Tue Dec 11 10:13:42 2018 -0300 Bug 21907: Fix article requests count for non-superlibrarians The query generates "Column 'branchcode' in where clause is ambiguous" Test plan: 1 - Enable 'IndependentBranchesPatronModifications' and article requests 2 - Sign in as non-superlibrarian 3 - View plack log 4 - Refresh mainpage, see error in logs Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ab9e4ca6a46519ddc69ad76837407c0a4f0ed0cd) Signed-off-by: Martin Renvoize commit f2151c1bbc98003576606d8b1bd2cb2453e6925a Author: Owen Leonard Date: Wed Oct 3 16:07:19 2018 +0000 Bug 16231: Correct permission handling in subscription edit This patch corrects the way subscription edit menu items are displayed according to the user's permissions settings. To test, apply the patch and log in to the staff client as a user who has permission to create, edit, and delete subscriptions. - Locate an subscription and view the details for it. - Confirm that each "Edit" menu item works correctly. - Repeat the process when logged in as a user with varying combinations of create, edit, and delete permissions. - Test as a user limited by IndependentBranches. Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 7520ede89987a7a65301debdda46950a6364ebfd) Signed-off-by: Martin Renvoize commit 413f34ba244af3560861785f5aa74ab457f00b02 Author: Martin Renvoize Date: Fri Feb 1 09:55:54 2019 +0000 Bug 22254: Correction to datehandling in test Adding 13 months is not always the same as adding 1 month and then adding 12 months in DateTime maths. This patch rectified the test to match the correct behaviour in koha. Test plan. 1) Modify the test (around line 268) to test against the suspect leap date of 2019-01-31 and watch the test fail. 2) Apply the patch (which also adds this modification to test for such a leap date) and watch the test now pass. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 1da0ba48b6fdf38cfd3d3ea63ec076b15995610f) Signed-off-by: Martin Renvoize commit 2da377435f03ced75d2f9deb782f9838f4cafbdf Author: Nick Clemens Date: Fri Jan 4 18:37:09 2019 +0000 Bug 19915: (follow-up) Fix test count from rebase https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a32653a66fa02f1fe9002647d337261bf36d62e0) Signed-off-by: Martin Renvoize commit 411f8faffdd0b9eb7c158ab8717029dd10721bcb Author: Nick Clemens Date: Thu Nov 1 13:11:16 2018 +0000 Bug 19915: Don't delete in tests https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 9961e2c08f8dba0896ed4f6bfa6a7befebd28d5d) Signed-off-by: Martin Renvoize commit 7f5602a3c36d7975f7f31698459d5e80b0287f77 Author: Nick Clemens Date: Fri Jun 15 04:10:39 2018 +0000 Bug 19915: Only show class sources in use Signed-off-by: Marcel de Rooy https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit a8259c38dbe910188ece5126d226166014e001ed) Signed-off-by: Martin Renvoize commit 09ef59cf797853a3b85928ce0c6cf4e084cac64d Author: Nick Clemens Date: Thu Jan 4 15:00:28 2018 +0000 Bug 19915: Use cn_sort values for getting inventory items To test: 1 - Catalog an item under LCC with callnumber GT95 2 - cn_sort should calculate as GT0095 3 - Go to inventory tool 4 - Enter a range that should have your item e.g LC GT90 to GT100 5 - Item is not returned 6 - Apply patch 7 - Item should be returned 8 - Verify things otherwise work as expected Signed-off-by: Anne-Claire Bernaudin Signed-off-by: Marcel de Rooy https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit d2ce727e260f6b45266a8147aee7654811a44fa1) Signed-off-by: Martin Renvoize commit 39acd694cafab8cacd36df329b8a9cda89ed6bd9 Author: Marcel de Rooy Date: Fri Jul 6 11:20:47 2018 +0200 Bug 19915: (QA follow-up) Tidy up GetItemsForInventory.t Standard edits like modules, schema, Koha objects instead of DBIC. Removing unneeded autoflush. Moving initial test to a first subtest. No need to clear issues if you clear items. Adding a FIXME for OldWay; would be nice to remove that code.. Signed-off-by: Marcel de Rooy https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c345d30cc8284f690f375faa140de49e62358709) Signed-off-by: Martin Renvoize commit 567c0df6ee1510fbfa1085460e678ee9e0a4dfa4 Author: Nick Clemens Date: Thu Jan 4 14:53:14 2018 +0000 Bug 19915: Add unit test to GetItemsForInventory.t prove -v t/db_dependent/Items/GetItemsForInventory.t Signed-off-by: Anne-Claire Bernaudin Signed-off-by: Marcel de Rooy Moved the betwen typo edit back here. https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 186209875a4951b15faded3f8c47eba71716c7af) Signed-off-by: Martin Renvoize commit 150de6dfe7f7d18f5b61e45b0442802c2f61fe9f Author: Marcel de Rooy Date: Wed Jan 30 15:37:10 2019 +0000 Bug 22236: Translation should generate tags with consistent attribute order When running misc/translator/translate, the order of attributes in the translated templates is not consistent and may vary. This is caused by the random order of hash keys in perl. This causes things like this in run 1: And this in run 2: As you can see, there is actually no difference apart from the order. When comparing the result of various translation runs, I would rather get rid of such noise and only see the real changes. The needed change is not trivial to find, but only requires a simple addition to a sort operation in tmpl_process3.pl. The current sort only makes sure that the '/' comes at the end. We should sort the names of the keys too when this value is 0 (just meaning: no end tag symbol). Test plan: [1] Run a translation without this patch and set a few templates aside. [2] Run a translation with this patch. [3] Run a compare (diff) on the templates copied in step 1. Verify that the only changes are found in the sort order of attributes in html tags. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit fb62e8d1fc8b210a5b23801b7b8faff3280bf638) Signed-off-by: Martin Renvoize commit 55b20ad1a7b8afa5c385bd3f9825014d40936ba1 Author: Fridolin Somers Date: Thu Jan 31 09:12:13 2019 +0100 Bug 22242: Javascript error in value builder cased by Select2 Same as Bug 17780 but in value builders. Select2 (Bug 13501) introduced divs and inputs that broke some assumptions about the expected HTML structure. This patch checks if input has name attribute, because some inputs in Select2 have not. It brakes value builders marc21_linking_section.tt and unimarc_field_4XX.tt. Test plan : 1) On a MARC21 database 2) Define 774$0 as a regular subfield 3) Define 774$4 with an authorised value category 4) Define 774$t with value builder marc21_linking_section 5) Create a new record 6) Use value builder in 774$t 7) Search for a record and click choose 8) Without patch : a popup window does not close and show a blank screen 9) With patch : popup windows get close and you see in field 774 $0 and $t field with values 10) Same tests with a UNIMARC database on field 461 with value builder unimarc_field_4XX.tt Signed-off-by: Owen Leonard Tested successfully with MARC21 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 3ca0234d34ac9708a8335cfa97805fb7498201bf) Signed-off-by: Martin Renvoize commit dcc0478089f5fde72426d94810bed6430df73a34 Author: Tomas Cohen Arazi Date: Thu Jan 24 14:29:09 2019 -0300 Bug 19816: Implement dateonly for rfc3339 format This patch implements the dateonly option for the rfc3339. This is described in the OpenAPI 2.0 specification [1]. The required output format is described on RFC 3339 [2], as 'full-date'. [1] https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#dataTypeFormat [2] https://tools.ietf.org/html/rfc3339#section-5.6 To test: - Apply the regression tests patch - Run: k$ prove t/DateUtils.t => FAIL: Tests fail because dateonly is not implemented - Apply this patch - Run: k$ prove t/DateUtils.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit b2dce05ddff8a047e7770ea241b1edd9b798212e) Signed-off-by: Martin Renvoize commit 41115fc79dfd16be62dd56e1946e0a2e08c6a2fc Author: Tomas Cohen Arazi Date: Thu Jan 24 14:27:28 2019 -0300 Bug 19816: Regression tests This patch adds tests for the rfc3339 behaviour when dateonly => 1. To test: - Run: $ kshell k$ prove t/DateUtils.t => SUCCESS: Tests pass - Apply this patch - Run: k$ prove t/DateUtils.t => FAIL: dateonly is not implemented Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 7e69ab62a5ef3fbd350c6606d25b5ab6f6bc168e) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 14 +++-- Koha/DateUtils.pm | 9 ++- installer/data/mysql/backfill_statistics.pl | 3 +- installer/data/mysql/labels_upgrade.pl | 3 - installer/data/mysql/patroncards_upgrade.pl | 3 - installer/data/mysql/update22to30.pl | 1 - installer/data/mysql/updatedatabase.pl | 3 +- installer/externalmodules.pl | 5 +- installer/html-template-to-template-toolkit.pl | 3 +- installer/install.pl | 3 +- .../prog/en/includes/serials-toolbar.inc | 35 +++++++---- .../value_builder/marc21_linking_section.tt | 1 + .../cataloguing/value_builder/unimarc_field_4XX.tt | 1 + .../prog/en/modules/tools/inventory.tt | 13 ++++- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- mainpage.pl | 2 +- misc/translator/tmpl_process3.pl | 1 + t/DateUtils.t | 5 +- t/db_dependent/Items/GetItemsForInventory.t | 61 ++++++++++++++++++-- t/db_dependent/Koha/Patrons.t | 8 +-- tools/inventory.pl | 10 ++++ 22 files changed, 138 insertions(+), 50 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 11 19:53:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Feb 2019 18:53:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-430-g89ae6cc 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 89ae6cc3bfea81dea8d6995965a44b92c34764aa (commit) via cfea47cb064362bbb1fc93769be4b7df3a8e2fae (commit) via 7a58d0215907c05b0b82944141f6f4d4595c3979 (commit) via f3f5b98fd909f9e13aa4e45a16dc275ef4ee8489 (commit) via 5b160af2a051dc3693f04dabf320d0995cf26160 (commit) via 04e121a741a442f5b557e11864eb69be9d0c3ded (commit) via 558742577d3902cd5e2abf5c3f165c6425e163da (commit) via dc6be66e2b2ec5917d7bec020d4e94c40baa9f6c (commit) via a628dab3b60d64e383ef2ffa20e5ea1c80f9b9d9 (commit) via 3c2cc8da26f7a907c0b51f928ffb100eefbfa692 (commit) via 0e220869f5a3327eee8f9426d648fbcaaa0fd7fa (commit) via 0939d44c22cda569faf4c0c60fd67de04097b34d (commit) via 3cfc8ae24c99647fcf5f55ce0e6c6521a3f3ff83 (commit) via 5bb04247477dce80fbacf9993be3164518c03df6 (commit) via c0e6051ac5bd0190a6491ecc853614a156014d88 (commit) via 74b6a659e5ec831e99beaad2f9ce6dad6409a3a0 (commit) via 713f873626404e7904bebd0b97dee1d9f67745fc (commit) via 6ec979057b2b4f10fe469d2655fa0fcb47af1cb7 (commit) via ae258098d9cfbc6d6ea211f8bcbb6c50c15b0ecd (commit) via 0844f2c174c83ce3da11be07511730b0c220e5ad (commit) via 619d97b91d075bd7d48c95102029a8d89269be6f (commit) via ea36265697c85cfb1f7de0b2344ef8647dc31387 (commit) via 556877ccd518dd32fb3604c39ecd5c6fcd0811fe (commit) via 102b1ca4bf3b1721f496417473643ff951c13833 (commit) via 870191d40611e3e7414388d4dd911446a2059225 (commit) via c7f47ea36a8992356c6c055a22891ea168cbdc9c (commit) from df611b17d12b63bb2f14909969ff8e8f67a332d0 (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 89ae6cc3bfea81dea8d6995965a44b92c34764aa Author: Katrin Fischer Date: Sat Jan 5 06:45:05 2019 +0000 Bug 22116: Add price formatting to rental charge and replacement price on items tab in staff Adds formatting to replacement price and rental charge on items tab. To test: - Add a rental charge to one or more of your item types - Edit a record with some items, add replacement cost to some - Find or create a record with your rental charged itemtype (MARC21:942$c) - Go to the staff detail page of those records - Check "Items" tab for - Rental charge on top - Replacement price for items - Verify information is displayed correctly when toggling CurrencyFormat system preference Signed-off-by: Jack Kelliher Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit cfea47cb064362bbb1fc93769be4b7df3a8e2fae Author: Katrin Fischer Date: Tue Feb 5 00:42:34 2019 +0100 Bug 21441: Fix wrong reference to a 'holds' table on system information tab It looks like a typo snuck in on the about page, listing a holds table instead of reserves. To test: - Manually create the same PK (reserve_id) in reserves and old_reserves - Verify that the message on about > system information now correctly lists those tables (not holds and old_reserves) Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 7a58d0215907c05b0b82944141f6f4d4595c3979 Author: Jasmine Amohia Date: Wed Jan 16 01:37:22 2019 +0000 Bug 21840: Fixed some typos in the templates intranet-tmpl/prog/en/modules/ill/ill-requests.tt:13 Bibliograpic record ID --> Bibliographic record ID intranet-tmpl/prog/en/modules/acqui/basket.tt:547 Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first --> ... with this order. Cancel holds first intranet-tmpl/prog/en/modules/acqui/parcel.tt Can't cancel order, ([% loop_order.holds_on_order | html %]) holds are linked with this order cancel holds first --> ... with this order. Cancel holds first intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt:32 Print this slabel --> Print this label Test plan: 1. Check that the fixes in the patch are correct Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit f3f5b98fd909f9e13aa4e45a16dc275ef4ee8489 Author: Kyle M Hall Date: Mon Feb 11 07:15:11 2019 -0500 Bug 21829: (QA follow-up) - Update the number of unit tests Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 5b160af2a051dc3693f04dabf320d0995cf26160 Author: Jonathan Druart Date: Wed Nov 14 09:38:01 2018 -0300 Bug 21829: Correctly format dateexpiry in notices (date only) dateexpiry is a date, we should not display the time part in notice. Test plan: Create a notice with borrowers.dateexpiry, generate this notice. The value should be displayed without the time part Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 04e121a741a442f5b557e11864eb69be9d0c3ded Author: Jonathan Druart Date: Wed Nov 14 09:37:58 2018 -0300 Bug 21829: Add tests for dateexpiry format in notices Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 558742577d3902cd5e2abf5c3f165c6425e163da Author: Katrin Fischer Date: Thu Dec 20 23:37:02 2018 +0000 Bug 22009: Fix error messages for filing rules and splitting rules. Some error messages were doubled up with different error codes. To test: I am not sure how to trigger those from the GUI, might require a code review/code changes. Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit dc6be66e2b2ec5917d7bec020d4e94c40baa9f6c Author: Katrin Fischer Date: Sun Jan 13 10:06:22 2019 +0100 Bug 22119: Add price formatting in more places in circulation This adds some missing Price filters to some places in circulation. To check verify the amount are displayed according to setting of CurrencyFormat (use FR or CH for seeing a change) Use a patron account with no pending fines at the beginning for all tests. 1) - Switch RentalFeesCheckoutConfirmation to "Ask" - Check out an item with a rental charge - Verify message is formatted correctly: Rental charge for this item: ... 2) - Switch RentalsInNoissuesCharge to "Don't include" - Make sure patron has only Rental fines on their account - Check out another item - Verify message is formatted correctly: The patron has unpaid charges for holds, rentals etc ... 3) - Switch BatchCheckouts to "Allow" - Add the patron category of your test patron to BatchCheckoutsValidCategories - Checkout any item - Verify the message in the information column is formatted correctly: The patron has unpaid charges for holds, rentals etc of ... Signed-off-by: Jasmine Amohia Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit a628dab3b60d64e383ef2ffa20e5ea1c80f9b9d9 Author: Katrin Fischer Date: Sat Jan 5 17:39:42 2019 +0000 Bug 22121: Display 'Price paid' on ILL requests according to CurrencyFormat pref To test: - Install BLDSS backend see: https://wiki.koha-community.org/wiki/ILL_backends - Add a new BLDSS ILL request - Edit ILL request - Fill in Price paid field - Verify Price paid is formatted correctly on 'Manage ILL request' page Signed-off-by: Ethan Amohia Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 3c2cc8da26f7a907c0b51f928ffb100eefbfa692 Author: Katrin Fischer Date: Sun Jan 13 11:15:27 2019 +0100 Bug 22120: Add price formattig to patron summary print The patron summary print lists the replacement prices and rental charges of items and totals them. With this patch they will be formatted according to the CurrencyFormat system preference. To test: - Find or create a patron with some checkouts - Make sure some items have replacement price set and some have a rental charge - "Print summary" from the account in staff - Verify that charges and prices in the checkouts table are formatted correctly - Toggle CurrencyFormat to different settings Signed-off-by: helene hickey Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 0e220869f5a3327eee8f9426d648fbcaaa0fd7fa Author: Katrin Fischer Date: Mon Jan 14 05:41:48 2019 +0000 Bug 17347: Ignore whitespace before and after on renewing When an item is checked out, Koha ignores whitespace at the beginning and the end of the entered barcode. This makes life easier, if a barcode is C&P from another page. This patch makes the renewal page behave the same. To test: - Checkout an item - Renew the item from the renew tab or renewal page entering the barcode with leading and trailing whitespace - "Barcode not found" - Apply patch - Try again - Barcode should be found now Signed-off-by: Owen Leonard Signed-off-by: Devinim Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 0939d44c22cda569faf4c0c60fd67de04097b34d Author: Pasi Kallinen Date: Tue Nov 27 11:53:32 2018 +0200 Bug 21885: Calendar to-date starts before end-date When adding new holidays to the calendar, you pick the start date, and then the end date, but the end date calendar will start from current date, not from the picked start date. Sometimes this means many extra clicks to pick an end date. Make the end date calendar start from the beginning date by default. Test plan: 1) Go to the tools -> calendar 2) Pick a start date somewhere in the future, and then open the end date calendar. Notice how it starts before the start date of the date range. 3) Apply patch. 4) Pick a start date in the future. The end date calendar should automatically default to the same date. 5) Change the start date a day backwards, note how the end date does not change. 6) Change the start date after the end date, note how the end date adjusts, so it is not in the past. Signed-off-by: Pasi Kallinen Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 3cfc8ae24c99647fcf5f55ce0e6c6521a3f3ff83 Author: Tomas Cohen Arazi Date: Wed Jan 30 15:31:43 2019 -0300 Bug 22238: Remove koha-*-sip scripts in favor of koha-sip This patch removes traces from the (deprecated) koha-*-sip scripts. To test: - Apply the patch - Verify no traces of koha-*-sip remain on the codebase (besides Release Notes, koha-common.links and the koha-sip script): $ cd kohaclone $ git grep koha-start-sip $ git grep koha-stop-sip $ git grep koha-enable-sip => SUCCESS: No traces! - Create the following symlinks: $ sudo ln -s /usr/sbin/koha-sip /usr/sbin/koha-start-sip $ sudo ln -s /usr/sbin/koha-sip /usr/sbin/koha-stop-sip $ sudo ln -s /usr/sbin/koha-sip /usr/sbin/koha-enable-sip - Try the koha-*-zebra commands: $ sudo koha-stop-sip kohadev $ sudo koha-start-sip kohadev $ sudo koha-restart-sip kohadev => SUCCESS: They all work as expected! - Sign off :-D! Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 5bb04247477dce80fbacf9993be3164518c03df6 Author: Tomas Cohen Arazi Date: Wed Jan 30 09:44:21 2019 -0300 Bug 22235: (follow-up) Make koha-remove stop SIP server if required Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit c0e6051ac5bd0190a6491ecc853614a156014d88 Author: Tomas Cohen Arazi Date: Wed Jan 30 09:37:47 2019 -0300 Bug 22235: Make maintenance scripts use koha-sip instead of koha-*-sip This patch makes all maintenance scripts use **koha-sip** instead of the old **koha-*-sip** scripts. To test: - Run: $ perl misc4dev/cp_debian_files.pl $ sudo service koha-common stop => SUCCESS: No errors and the SIP-related sevices are stopped $ sudo service koha-common start => SUCCESS: No errors and the SIP-related services are started $ sudo service koha-common restart => SUCCESS: No erros and SIP-related services are running $ sudo koha-create --create-db test $ sudo koha-sip --enable test $ sudo koha-sip --start test $ sudo koha-disable test => SUCCESS: No errors, instance disabled, no SIP running for test - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 74b6a659e5ec831e99beaad2f9ce6dad6409a3a0 Author: Tomas Cohen Arazi Date: Wed Jan 30 09:12:36 2019 -0300 Bug 18562: Tab completion in bash This patch adds the fancy tab completion in bash. To test: - Run: $ source debian/koha-common.bash-completion $ sudo koha-sip - Play with all the options => SUCCESS: The combinations make sense (e.g. only SIP-enabled instances are completed for --start, --stop, --restart, -v and --verbose are not offered if the other one is already in there, --enable only applies to SIP-disabled instances, etc). - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 713f873626404e7904bebd0b97dee1d9f67745fc Author: Tomas Cohen Arazi Date: Wed Jan 30 09:12:25 2019 -0300 Bug 18562: Add manpage for koha-sip This patch adds the manpage for koha-sip. To test: - Apply this patch - Run: $ kshell k$ prove xt/verify-debian-docbook.t => SUCCESS: Tests pass! - Run: $ misc4dev/cp_debian_files.pl $ man koha-sip => SUCCESS: The man page shows correctly. - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 6ec979057b2b4f10fe469d2655fa0fcb47af1cb7 Author: Tomas Cohen Arazi Date: Wed Jan 30 08:42:53 2019 -0300 Bug 18562: Add koha-sip maintenance script This patch introduces a single script to handle all actions on SIP servers for Koha instances. It is intended to be a replacement for: - koha-start-sip - koha-stop-sip - koha-enable-sip It adds a function called is_sip_running to koha-functions.sh. To test: - Apply this patch - Run: $ misc4dev/cp_debian_files.pl $ sudo koha-sip --enable kohadev $ sudo koha-sip --start kohadev $ sudo koha-sip --status kohadev => SUCCESS: The SIP server is running for kohadev - Run: $ sudo koha-sip --restart --verbose kohadev $ sudo koha-sip --status kohadev => SUCCESS: The SIP server is running for kohadev - Run: $ sudo koha-sip --stop kohadev $ sudo koha-sip --status kohadev => SUCCESS: The SIP server is not running for kohadev - Play with other combinations like enabling an already enabled instance, etc. Remember you need to remove the /etc/koha/sites/kohadev/SIPconfig.xml file so it is considered disabled. - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit ae258098d9cfbc6d6ea211f8bcbb6c50c15b0ecd Author: Owen Leonard Date: Fri Feb 8 12:52:48 2019 +0000 Bug 22293: Sticky toolbar making vendor form uneditable The new floating toolbar plugin doesn't like a particular combination of markup: A toolbar inside a form which is styled "display:inline." The staff client CSS styles forms that way globally, so it must be explicitly overridden in these situations. Changing the default will have broad consequences, so I propose an inline style to fix this. To test, apply the patch and go to Acquisitions. Add or edit a vendor and confirm that after scrolling down the page the form is still editable. Signed-off-by: Andrew Isherwood Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 0844f2c174c83ce3da11be07511730b0c220e5ad Author: Liz Rea Date: Thu Jan 31 22:41:29 2019 +0000 Bug 22282: Fix PDF issue when exporting PDF in French format. Fixing up QA comments, keeping 1st instance and removing the 2nd. Original test plan by Christophe Croullebois. To test : Without the patch : 1? select in Acquisitions preferences/OrderPdfFormat French 3-page 2? restart plack if needed 3? In acqui/basketgroup.pl select closed tab 4? Click on "Export as PDF" button 5? You should see a blank page saying "Internal Server Error" With the patch : Do the same Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 619d97b91d075bd7d48c95102029a8d89269be6f Author: Katrin Fischer Date: Mon Jan 14 12:47:25 2019 +0000 Bug 22110: Fix editing of adjustments for CurrencyFormat != US When using CurrencyFormat FR or CH the editing an amount behave badly. Example: changing displayed 1,00 to 1,11 would save as 1,00. At the moment Koha only understands decimal dot, not comma. So every time data is entered, we use decimal dot. 1) Add an adjustment to an invoice 2) Change system preference CurrencyFormat to FR or CH 3) Verify the amount displays with a decimal comma 4) Try changing the amount to something like 1,11 5) Save the amount 6) Verify it shows 1.00 7) Apply patch 8) Refresh the invoice page if necessary 9) Verify amount is now shown as 1.00 10) Repeat test, use 1.11 11) Verify it will be stored correctly. Signed-off-by: Mackey Johnstone Signed-off-by: mikael Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit ea36265697c85cfb1f7de0b2344ef8647dc31387 Author: Nick Clemens Date: Wed Feb 6 12:49:58 2019 +0000 Bug 22278: Clear cache when creating new report groups or subgroups When a user adds a new group we create it, then fetch the groups from the cache. However, we aren't clearing the cache on creation. This patch fixes that To test: 0) Start a new report 1) Pick create for the group 2) Enter code and value 3) Save 4) You remain on the page and value and code are now empty (ok) 5) BUT: The pull down for the group remains "None" instead of reflecting the new group 6) Open a new tab and browse to reports - note the group exists and the report is in it 7) On original tab save report again, the group was not selected so is lost 8) Apply patch 9) Retest with a new report 10) Group is created, saved, and selected upon save 11) Subsequent edits include the new group 12) Test with subgroups as well Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 556877ccd518dd32fb3604c39ecd5c6fcd0811fe Author: Alex Arnaud Date: Thu Feb 7 17:22:17 2019 +0100 Bug 21738: unit tests for HoldTitle Signed-off-by: Nick Clemens commit 102b1ca4bf3b1721f496417473643ff951c13833 Author: Alex Arnaud Date: Fri Jan 4 16:33:39 2019 +0100 Bug 21738: make call of CanBookBeReserved more safe Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 870191d40611e3e7414388d4dd911446a2059225 Author: Alex Arnaud Date: Tue Nov 13 09:44:51 2018 +0100 Bug 21738: check items count in C4:ILSDI::HoldTitle Test plan: - Try holding a title without items via ILS-DI (cgi-bin/koha/ilsdi.pl?service=HoldTitle&patron_id=1&bib_id=1), - you get an error, - apply this patch, - try again, - you should get the code "Notitems"Bug 21738: check items count in C4:ILSDI::HoldTitle Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit c7f47ea36a8992356c6c055a22891ea168cbdc9c Author: Jose-Mario Monteiro-Santos Date: Thu Jan 17 16:41:58 2019 -0500 Bug 18723: Change dot into comma This fixes the regression that multiplies the amount entered by 100 when CurrencyFormat is set to FR. It replaces the last dot with a comma before dealing with the value of ActualCost and ReplacementCost. Test Plan: a)Replicate the issue: 0- Set CurrencyFormat to FR 1- Go to Acquisitions 2- Search for a Vendor 3- Click on "New basket" 4- Give basket a name and click "Save" 5- Click on "Add to basket" 6- Add an order through preferred method 7- In Accounting details, enter a vendor price with dot decimal (i.e. 19.44) 8- Save your order line 9- Click on "Close this basket" 10- Confirm closing of basket by clicking on "Yes, close" 11- Click on "Receive shipment" 12- Enter an invoice number and click "Next" 13- Click on "Receive" to the right of your order 14- In Accounting details, notice the Actual cost is written with a decimal dot. 15- Change the Actual cost, using a dot decimal (i.e 20.99) 16- Receive the order 17- Click on "Save" 18- In "Already received" notice the price is multiplied by 100 (i.e. 2099,00) 19- Click on "Cancel receipt" 20- Click on "Receive" to the right of your order 21- In Accounting details, change the Actual cost, using a comma decimal (i.e. 20,99) 22- Receive the order 23- Click on "Save" 24- In "Already received", notice the price is correct. b)Apply the patch c)Test the patch: 1- Click on "Cancel receipt" 2- Click on "Receive to the right of your order 3- Change the Actual cost/Replacement cost, using a dot decimal (21.99) 4- Receive the order 5- Click on "Save" 6- Notice that the Actual cost and the Replacement cost use commas 7- Change the Actual cost, using a comma decimal (21,99) 8- Click on "Save" 9- In "Already received", notice the price is still correct. Signed-off-by: Victor Grousset Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/ILSDI/Services.pm | 12 ++ C4/Letters.pm | 2 +- C4/Reserves.pm | 2 +- Koha/pdfformat/layout3pagesfr.pm | 2 +- acqui/finishreceive.pl | 10 ++ catalogue/moredetail.pl | 4 +- circ/renew.pl | 1 + debian/docs/koha-common.xml | 21 +-- debian/docs/koha-enable-sip.xml | 57 -------- debian/docs/{koha-zebra.xml => koha-sip.xml} | 35 +++-- debian/docs/koha-start-sip.xml | 53 ------- debian/docs/koha-stop-sip.xml | 52 ------- debian/koha-common.bash-completion | 46 ++++-- debian/koha-common.init | 9 +- debian/koha-common.install | 4 +- debian/koha-common.links | 5 +- debian/scripts/koha-disable | 2 +- debian/scripts/koha-enable-sip | 38 ----- debian/scripts/koha-functions.sh | 14 ++ debian/scripts/koha-remove | 4 + debian/scripts/{koha-zebra => koha-sip} | 148 ++++++++++++-------- debian/scripts/koha-start-sip | 68 --------- debian/scripts/koha-stop-sip | 45 ------ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- .../prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 4 +- .../prog/en/modules/catalogue/moredetail.tt | 5 +- .../prog/en/modules/circ/circulation.tt | 4 +- .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/ill/ill-requests.tt | 5 +- .../prog/en/modules/labels/spinelabel-print.tt | 2 +- .../prog/en/modules/members/moremember-print.tt | 8 +- .../prog/en/modules/tools/holidays.tt | 24 +++- members/summary-print.pl | 2 +- reports/guided_reports.pl | 9 +- reserve/request.pl | 1 - t/db_dependent/ILSDI_Services.t | 13 +- t/db_dependent/Letters.t | 17 ++- t/db_dependent/Reserves.t | 8 +- 43 files changed, 292 insertions(+), 458 deletions(-) delete mode 100644 debian/docs/koha-enable-sip.xml copy debian/docs/{koha-zebra.xml => koha-sip.xml} (61%) delete mode 100644 debian/docs/koha-start-sip.xml delete mode 100644 debian/docs/koha-stop-sip.xml delete mode 100755 debian/scripts/koha-enable-sip copy debian/scripts/{koha-zebra => koha-sip} (57%) delete mode 100755 debian/scripts/koha-start-sip delete mode 100755 debian/scripts/koha-stop-sip hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 11 22:07:19 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Feb 2019 21:07:19 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-431-g3f965b3 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 3f965b3e37f4f5969d26b079d7e72454f7997fb2 (commit) from 89ae6cc3bfea81dea8d6995965a44b92c34764aa (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 3f965b3e37f4f5969d26b079d7e72454f7997fb2 Author: Nick Clemens Date: Mon Feb 11 20:49:00 2019 +0000 Bug 17047: (RM follow-up) Fix tests for Ubuntu In Ubuntu the message returned is: An error occurred, mana server returned: Can't connect to foo.bar:443 (Name or service not known) Checking for 'Can't connect' and not enforcing end of string should be sufficient and fixes the test Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Koha/SharedContent.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 13:45:40 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 12:45:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-432-g66f3a72 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 66f3a72a01ba5238a9bba39a3b9cb659dbb47a42 (commit) from 3f965b3e37f4f5969d26b079d7e72454f7997fb2 (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 66f3a72a01ba5238a9bba39a3b9cb659dbb47a42 Author: root Date: Tue Feb 12 12:25:12 2019 +0000 Revert "Bug 22121: Display 'Price paid' on ILL requests according to CurrencyFormat pref" Reverted while 20600 is being pushed through community to avoid rebase issues This reverts commit a628dab3b60d64e383ef2ffa20e5ea1c80f9b9d9. Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 14:37:42 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 13:37:42 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-134-g3a5201f 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, 18.11.x has been updated via 3a5201fb90e51df7e5dd30cc2339c7d3dc2cfa31 (commit) via d7c112bc0ecc380fa8621842bc02ff30d8e3c68c (commit) via a6945032dab677dbba47c66f3116ba6a34d3ff0e (commit) via 60b1a4f83611414a042651bea757dc7e96fde6f9 (commit) via ecb86a84c13e4e5661f4c6683b7755c21d607bbe (commit) via 1106c0fa595c8378807bc955b29c2f83c2af5ba9 (commit) via 8f48da710b4363e44cc06788751e0c9e93143977 (commit) via 26c59980fe123fc6033098ae374f57c4afd53aca (commit) via 3638172077c95f0cba2f0e190f245e598e4b004d (commit) via 7c881b32b5f7bfca6ccb17b8ddc8045ad37a3524 (commit) via a69fd8912496c5d7335e0e4d8f113d2b2aeb7b61 (commit) via fa4ed5e67744019d013a9374002ffde3956153c3 (commit) via 38c960a6ef49ce8f95c5320fafcd4f334b24f81a (commit) via 84052899398043f8dc29df0f6631ce7e5fd04f50 (commit) via 8f18b5499c1a5698c6ecca18566cb4ef38442379 (commit) via c9ca18549ca06c7443ee354b0aa74e56a020acb5 (commit) via 981670c68cb3d12b30c410c12ed6488f5a555117 (commit) via 350a9e475fb32d9b6ca16db573f9a0577ea087be (commit) via f64d0d9038a58abe360744200348950688e834cd (commit) via bf7524f0b1cebb68584eebf2d3acaec44126355d (commit) from 99cd91ad2dbbc1c24bf4aea41865147013f947bb (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 3a5201fb90e51df7e5dd30cc2339c7d3dc2cfa31 Author: Katrin Fischer Date: Sat Jan 5 06:45:05 2019 +0000 Bug 22116: Add price formatting to rental charge and replacement price on items tab in staff Adds formatting to replacement price and rental charge on items tab. To test: - Add a rental charge to one or more of your item types - Edit a record with some items, add replacement cost to some - Find or create a record with your rental charged itemtype (MARC21:942$c) - Go to the staff detail page of those records - Check "Items" tab for - Rental charge on top - Replacement price for items - Verify information is displayed correctly when toggling CurrencyFormat system preference Signed-off-by: Jack Kelliher Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 89ae6cc3bfea81dea8d6995965a44b92c34764aa) Signed-off-by: Martin Renvoize commit d7c112bc0ecc380fa8621842bc02ff30d8e3c68c Author: Katrin Fischer Date: Tue Feb 5 00:42:34 2019 +0100 Bug 21441: Fix wrong reference to a 'holds' table on system information tab It looks like a typo snuck in on the about page, listing a holds table instead of reserves. To test: - Manually create the same PK (reserve_id) in reserves and old_reserves - Verify that the message on about > system information now correctly lists those tables (not holds and old_reserves) Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit cfea47cb064362bbb1fc93769be4b7df3a8e2fae) Signed-off-by: Martin Renvoize commit a6945032dab677dbba47c66f3116ba6a34d3ff0e Author: Jasmine Amohia Date: Wed Jan 16 01:37:22 2019 +0000 Bug 21840: Fixed some typos in the templates intranet-tmpl/prog/en/modules/ill/ill-requests.tt:13 Bibliograpic record ID --> Bibliographic record ID intranet-tmpl/prog/en/modules/acqui/basket.tt:547 Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first --> ... with this order. Cancel holds first intranet-tmpl/prog/en/modules/acqui/parcel.tt Can't cancel order, ([% loop_order.holds_on_order | html %]) holds are linked with this order cancel holds first --> ... with this order. Cancel holds first intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt:32 Print this slabel --> Print this label Test plan: 1. Check that the fixes in the patch are correct Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 7a58d0215907c05b0b82944141f6f4d4595c3979) Signed-off-by: Martin Renvoize commit 60b1a4f83611414a042651bea757dc7e96fde6f9 Author: Kyle M Hall Date: Mon Feb 11 07:15:11 2019 -0500 Bug 21829: (QA follow-up) - Update the number of unit tests Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit f3f5b98fd909f9e13aa4e45a16dc275ef4ee8489) Signed-off-by: Martin Renvoize commit ecb86a84c13e4e5661f4c6683b7755c21d607bbe Author: Jonathan Druart Date: Wed Nov 14 09:38:01 2018 -0300 Bug 21829: Correctly format dateexpiry in notices (date only) dateexpiry is a date, we should not display the time part in notice. Test plan: Create a notice with borrowers.dateexpiry, generate this notice. The value should be displayed without the time part Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 5b160af2a051dc3693f04dabf320d0995cf26160) Signed-off-by: Martin Renvoize commit 1106c0fa595c8378807bc955b29c2f83c2af5ba9 Author: Jonathan Druart Date: Wed Nov 14 09:37:58 2018 -0300 Bug 21829: Add tests for dateexpiry format in notices Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 04e121a741a442f5b557e11864eb69be9d0c3ded) Signed-off-by: Martin Renvoize commit 8f48da710b4363e44cc06788751e0c9e93143977 Author: Katrin Fischer Date: Thu Dec 20 23:37:02 2018 +0000 Bug 22009: Fix error messages for filing rules and splitting rules. Some error messages were doubled up with different error codes. To test: I am not sure how to trigger those from the GUI, might require a code review/code changes. Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 558742577d3902cd5e2abf5c3f165c6425e163da) Signed-off-by: Martin Renvoize commit 26c59980fe123fc6033098ae374f57c4afd53aca Author: Katrin Fischer Date: Sun Jan 13 10:06:22 2019 +0100 Bug 22119: Add price formatting in more places in circulation This adds some missing Price filters to some places in circulation. To check verify the amount are displayed according to setting of CurrencyFormat (use FR or CH for seeing a change) Use a patron account with no pending fines at the beginning for all tests. 1) - Switch RentalFeesCheckoutConfirmation to "Ask" - Check out an item with a rental charge - Verify message is formatted correctly: Rental charge for this item: ... 2) - Switch RentalsInNoissuesCharge to "Don't include" - Make sure patron has only Rental fines on their account - Check out another item - Verify message is formatted correctly: The patron has unpaid charges for holds, rentals etc ... 3) - Switch BatchCheckouts to "Allow" - Add the patron category of your test patron to BatchCheckoutsValidCategories - Checkout any item - Verify the message in the information column is formatted correctly: The patron has unpaid charges for holds, rentals etc of ... Signed-off-by: Jasmine Amohia Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit dc6be66e2b2ec5917d7bec020d4e94c40baa9f6c) Signed-off-by: Martin Renvoize commit 3638172077c95f0cba2f0e190f245e598e4b004d Author: Katrin Fischer Date: Sun Jan 13 11:15:27 2019 +0100 Bug 22120: Add price formattig to patron summary print The patron summary print lists the replacement prices and rental charges of items and totals them. With this patch they will be formatted according to the CurrencyFormat system preference. To test: - Find or create a patron with some checkouts - Make sure some items have replacement price set and some have a rental charge - "Print summary" from the account in staff - Verify that charges and prices in the checkouts table are formatted correctly - Toggle CurrencyFormat to different settings Signed-off-by: helene hickey Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 3c2cc8da26f7a907c0b51f928ffb100eefbfa692) Signed-off-by: Martin Renvoize commit 7c881b32b5f7bfca6ccb17b8ddc8045ad37a3524 Author: Katrin Fischer Date: Mon Jan 14 05:41:48 2019 +0000 Bug 17347: Ignore whitespace before and after on renewing When an item is checked out, Koha ignores whitespace at the beginning and the end of the entered barcode. This makes life easier, if a barcode is C&P from another page. This patch makes the renewal page behave the same. To test: - Checkout an item - Renew the item from the renew tab or renewal page entering the barcode with leading and trailing whitespace - "Barcode not found" - Apply patch - Try again - Barcode should be found now Signed-off-by: Owen Leonard Signed-off-by: Devinim Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 0e220869f5a3327eee8f9426d648fbcaaa0fd7fa) Signed-off-by: Martin Renvoize commit a69fd8912496c5d7335e0e4d8f113d2b2aeb7b61 Author: Pasi Kallinen Date: Tue Nov 27 11:53:32 2018 +0200 Bug 21885: Calendar to-date starts before end-date When adding new holidays to the calendar, you pick the start date, and then the end date, but the end date calendar will start from current date, not from the picked start date. Sometimes this means many extra clicks to pick an end date. Make the end date calendar start from the beginning date by default. Test plan: 1) Go to the tools -> calendar 2) Pick a start date somewhere in the future, and then open the end date calendar. Notice how it starts before the start date of the date range. 3) Apply patch. 4) Pick a start date in the future. The end date calendar should automatically default to the same date. 5) Change the start date a day backwards, note how the end date does not change. 6) Change the start date after the end date, note how the end date adjusts, so it is not in the past. Signed-off-by: Pasi Kallinen Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 0939d44c22cda569faf4c0c60fd67de04097b34d) Signed-off-by: Martin Renvoize commit fa4ed5e67744019d013a9374002ffde3956153c3 Author: Tomas Cohen Arazi Date: Wed Jan 30 09:44:21 2019 -0300 Bug 22235: (follow-up) Make koha-remove stop SIP server if required Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 5bb04247477dce80fbacf9993be3164518c03df6) Signed-off-by: Martin Renvoize commit 38c960a6ef49ce8f95c5320fafcd4f334b24f81a Author: Tomas Cohen Arazi Date: Wed Jan 30 09:37:47 2019 -0300 Bug 22235: Make maintenance scripts use koha-sip instead of koha-*-sip This patch makes all maintenance scripts use **koha-sip** instead of the old **koha-*-sip** scripts. To test: - Run: $ perl misc4dev/cp_debian_files.pl $ sudo service koha-common stop => SUCCESS: No errors and the SIP-related sevices are stopped $ sudo service koha-common start => SUCCESS: No errors and the SIP-related services are started $ sudo service koha-common restart => SUCCESS: No erros and SIP-related services are running $ sudo koha-create --create-db test $ sudo koha-sip --enable test $ sudo koha-sip --start test $ sudo koha-disable test => SUCCESS: No errors, instance disabled, no SIP running for test - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit c0e6051ac5bd0190a6491ecc853614a156014d88) Signed-off-by: Martin Renvoize commit 84052899398043f8dc29df0f6631ce7e5fd04f50 Author: Tomas Cohen Arazi Date: Wed Jan 30 09:12:36 2019 -0300 Bug 18562: Tab completion in bash This patch adds the fancy tab completion in bash. To test: - Run: $ source debian/koha-common.bash-completion $ sudo koha-sip - Play with all the options => SUCCESS: The combinations make sense (e.g. only SIP-enabled instances are completed for --start, --stop, --restart, -v and --verbose are not offered if the other one is already in there, --enable only applies to SIP-disabled instances, etc). - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 74b6a659e5ec831e99beaad2f9ce6dad6409a3a0) Signed-off-by: Martin Renvoize commit 8f18b5499c1a5698c6ecca18566cb4ef38442379 Author: Tomas Cohen Arazi Date: Wed Jan 30 09:12:25 2019 -0300 Bug 18562: Add manpage for koha-sip This patch adds the manpage for koha-sip. To test: - Apply this patch - Run: $ kshell k$ prove xt/verify-debian-docbook.t => SUCCESS: Tests pass! - Run: $ misc4dev/cp_debian_files.pl $ man koha-sip => SUCCESS: The man page shows correctly. - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 713f873626404e7904bebd0b97dee1d9f67745fc) Signed-off-by: Martin Renvoize commit c9ca18549ca06c7443ee354b0aa74e56a020acb5 Author: Tomas Cohen Arazi Date: Wed Jan 30 08:42:53 2019 -0300 Bug 18562: Add koha-sip maintenance script This patch introduces a single script to handle all actions on SIP servers for Koha instances. It is intended to be a replacement for: - koha-start-sip - koha-stop-sip - koha-enable-sip It adds a function called is_sip_running to koha-functions.sh. To test: - Apply this patch - Run: $ misc4dev/cp_debian_files.pl $ sudo koha-sip --enable kohadev $ sudo koha-sip --start kohadev $ sudo koha-sip --status kohadev => SUCCESS: The SIP server is running for kohadev - Run: $ sudo koha-sip --restart --verbose kohadev $ sudo koha-sip --status kohadev => SUCCESS: The SIP server is running for kohadev - Run: $ sudo koha-sip --stop kohadev $ sudo koha-sip --status kohadev => SUCCESS: The SIP server is not running for kohadev - Play with other combinations like enabling an already enabled instance, etc. Remember you need to remove the /etc/koha/sites/kohadev/SIPconfig.xml file so it is considered disabled. - Sign off :-D Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 6ec979057b2b4f10fe469d2655fa0fcb47af1cb7) Signed-off-by: Martin Renvoize commit 981670c68cb3d12b30c410c12ed6488f5a555117 Author: Liz Rea Date: Thu Jan 31 22:41:29 2019 +0000 Bug 22282: Fix PDF issue when exporting PDF in French format. Fixing up QA comments, keeping 1st instance and removing the 2nd. Original test plan by Christophe Croullebois. To test : Without the patch : 1? select in Acquisitions preferences/OrderPdfFormat French 3-page 2? restart plack if needed 3? In acqui/basketgroup.pl select closed tab 4? Click on "Export as PDF" button 5? You should see a blank page saying "Internal Server Error" With the patch : Do the same Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 0844f2c174c83ce3da11be07511730b0c220e5ad) Signed-off-by: Martin Renvoize commit 350a9e475fb32d9b6ca16db573f9a0577ea087be Author: Katrin Fischer Date: Mon Jan 14 12:47:25 2019 +0000 Bug 22110: Fix editing of adjustments for CurrencyFormat != US When using CurrencyFormat FR or CH the editing an amount behave badly. Example: changing displayed 1,00 to 1,11 would save as 1,00. At the moment Koha only understands decimal dot, not comma. So every time data is entered, we use decimal dot. 1) Add an adjustment to an invoice 2) Change system preference CurrencyFormat to FR or CH 3) Verify the amount displays with a decimal comma 4) Try changing the amount to something like 1,11 5) Save the amount 6) Verify it shows 1.00 7) Apply patch 8) Refresh the invoice page if necessary 9) Verify amount is now shown as 1.00 10) Repeat test, use 1.11 11) Verify it will be stored correctly. Signed-off-by: Mackey Johnstone Signed-off-by: mikael Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 619d97b91d075bd7d48c95102029a8d89269be6f) Signed-off-by: Martin Renvoize commit f64d0d9038a58abe360744200348950688e834cd Author: Nick Clemens Date: Wed Feb 6 12:49:58 2019 +0000 Bug 22278: Clear cache when creating new report groups or subgroups When a user adds a new group we create it, then fetch the groups from the cache. However, we aren't clearing the cache on creation. This patch fixes that To test: 0) Start a new report 1) Pick create for the group 2) Enter code and value 3) Save 4) You remain on the page and value and code are now empty (ok) 5) BUT: The pull down for the group remains "None" instead of reflecting the new group 6) Open a new tab and browse to reports - note the group exists and the report is in it 7) On original tab save report again, the group was not selected so is lost 8) Apply patch 9) Retest with a new report 10) Group is created, saved, and selected upon save 11) Subsequent edits include the new group 12) Test with subgroups as well Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ea36265697c85cfb1f7de0b2344ef8647dc31387) Signed-off-by: Martin Renvoize commit bf7524f0b1cebb68584eebf2d3acaec44126355d Author: Jose-Mario Monteiro-Santos Date: Thu Jan 17 16:41:58 2019 -0500 Bug 18723: Change dot into comma This fixes the regression that multiplies the amount entered by 100 when CurrencyFormat is set to FR. It replaces the last dot with a comma before dealing with the value of ActualCost and ReplacementCost. Test Plan: a)Replicate the issue: 0- Set CurrencyFormat to FR 1- Go to Acquisitions 2- Search for a Vendor 3- Click on "New basket" 4- Give basket a name and click "Save" 5- Click on "Add to basket" 6- Add an order through preferred method 7- In Accounting details, enter a vendor price with dot decimal (i.e. 19.44) 8- Save your order line 9- Click on "Close this basket" 10- Confirm closing of basket by clicking on "Yes, close" 11- Click on "Receive shipment" 12- Enter an invoice number and click "Next" 13- Click on "Receive" to the right of your order 14- In Accounting details, notice the Actual cost is written with a decimal dot. 15- Change the Actual cost, using a dot decimal (i.e 20.99) 16- Receive the order 17- Click on "Save" 18- In "Already received" notice the price is multiplied by 100 (i.e. 2099,00) 19- Click on "Cancel receipt" 20- Click on "Receive" to the right of your order 21- In Accounting details, change the Actual cost, using a comma decimal (i.e. 20,99) 22- Receive the order 23- Click on "Save" 24- In "Already received", notice the price is correct. b)Apply the patch c)Test the patch: 1- Click on "Cancel receipt" 2- Click on "Receive to the right of your order 3- Change the Actual cost/Replacement cost, using a dot decimal (21.99) 4- Receive the order 5- Click on "Save" 6- Notice that the Actual cost and the Replacement cost use commas 7- Change the Actual cost, using a comma decimal (21,99) 8- Click on "Save" 9- In "Already received", notice the price is still correct. Signed-off-by: Victor Grousset Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c7f47ea36a8992356c6c055a22891ea168cbdc9c) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 2 +- Koha/pdfformat/layout3pagesfr.pm | 2 +- acqui/finishreceive.pl | 10 ++ catalogue/moredetail.pl | 4 +- circ/renew.pl | 1 + debian/docs/koha-common.xml | 6 + debian/docs/{koha-zebra.xml => koha-sip.xml} | 35 +++-- debian/koha-common.bash-completion | 38 +++++ debian/koha-common.init | 9 +- debian/koha-common.install | 1 + debian/scripts/koha-disable | 2 +- debian/scripts/koha-functions.sh | 14 ++ debian/scripts/koha-remove | 4 + debian/scripts/{koha-zebra => koha-sip} | 146 ++++++++++++-------- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 4 +- .../prog/en/modules/catalogue/moredetail.tt | 5 +- .../prog/en/modules/circ/circulation.tt | 4 +- .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/ill/ill-requests.tt | 2 +- .../prog/en/modules/labels/spinelabel-print.tt | 2 +- .../prog/en/modules/members/moremember-print.tt | 8 +- .../prog/en/modules/tools/holidays.tt | 24 +++- members/summary-print.pl | 2 +- reports/guided_reports.pl | 8 +- t/db_dependent/Letters.t | 17 ++- 30 files changed, 254 insertions(+), 108 deletions(-) copy debian/docs/{koha-zebra.xml => koha-sip.xml} (61%) copy debian/scripts/{koha-zebra => koha-sip} (57%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 17:07:28 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 16:07:28 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.14-25-ge4fb7e3 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 e4fb7e3f23c657ea945e052b1711b84bcca29921 (commit) via 0fb7784e137920d3fa2218e2945c236f2cdb9da5 (commit) via 251fd804ff45a851a61c0b2d59d249c5acad01dc (commit) via 112d84a4cc693947853891741b09e1ad4bdfdeff (commit) via 3c23aae299179de1cbb368b634c720885831d46a (commit) via bbd5699f374bf86aa8c1ca20b80764506c8fa641 (commit) via 6903dc826090eb0bbd9035194e3304fff70faff0 (commit) from 5148262441002899fb18a2ec5ad5da1546f3f951 (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 e4fb7e3f23c657ea945e052b1711b84bcca29921 Author: helene hickey Date: Wed Jan 16 23:20:38 2019 +0000 Bug 21290: Updating documentation for ModItem To test: Review the patch and check it is now updated correctly Signed-off-by: David Nind Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 9a5bfee706f85bc5fd53a9c2d0616c2e1186379a) Signed-off-by: Martin Renvoize (cherry picked from commit e96eed9b841394353cc5c4484ddc608432e22d29) Signed-off-by: Jesse Maseto (cherry picked from commit 3ea009bcc33656e3644ff71cd1fae086bdf3a529) Signed-off-by: Fridolin Somers commit 0fb7784e137920d3fa2218e2945c236f2cdb9da5 Author: Jasmine Amohia Date: Wed Jan 16 20:53:40 2019 +0000 Bug 20679: Removed 'rows per page' from report print layout Test plan: 1. Create a report or view an existing report 2. Notice that 'Rows per page:' is visible 3. Print report (Ctrl+P) 4. Confirm that on printed report, 'Rows per page:' is no longer visible Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 65b64bcafacf983a101f263e554b6d7274567bb9) Signed-off-by: Martin Renvoize (cherry picked from commit ba8cd76c6239ed71246c26666f16f07f56b731b7) Signed-off-by: Jesse Maseto (cherry picked from commit cd7e62f06b2e494de2895bc276371062c6827795) Signed-off-by: Fridolin Somers commit 251fd804ff45a851a61c0b2d59d249c5acad01dc Author: Caroline Cyr La Rose Date: Tue Jan 8 09:28:35 2019 -0500 Bug 22083: Typo in circulation_batch_checkouts.tt There is a typo in circulation_batch_checkouts.tt that makes Koha skip a warning if the user cannot borrow due to circulation rules. This patch corrects this typo. To test: 1. In Administration > Global system preferences, 'Allow' BatchCheckouts and enter patron categories in BatchCheckoutsValidCategories 2. Go to Administration > Circulation and fines rules 3. Enter a rule where a certain category of patrons (that is in BatchCheckoutsValidCategories) cannot take out a particular item type 4. Search the catalog for an item of that item type 5. Copy the barcode 6. Go into patrons and find a patron of that category 7. Click on the Batch checkout tab 8. Paste the barcode in the box and click Check out 9. It should say 'Too many checked out' 10. Apply the patch 11. Try the check out again, it should show both warnings ('Too many checked out' and 'This patron can't check out this item per library circulation policy') Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 3ee95bd0213943b625ea5a35eb04e45835cf6f65) Signed-off-by: Martin Renvoize (cherry picked from commit 4c928041f1ee5ec4c21aab24dfd7f69399ae330f) Signed-off-by: Jesse Maseto (cherry picked from commit c641fb1b0840b30f189a16693ffe4306e009aaff) Signed-off-by: Fridolin Somers commit 112d84a4cc693947853891741b09e1ad4bdfdeff Author: Lucas Gass Date: Fri Jan 25 15:37:21 2019 +0000 Bug 22207: course reserves page does not have unique id Test plan: Go to cgi-bin/koha/opac-course-reserves.pl in the OPAC and make sure the body id is opac-course-reserves Signed-off-by: Owen Leonard Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 358adce2e75bdd317165c86a9b5064bc52d9e2ad) Signed-off-by: Martin Renvoize (cherry picked from commit a4345d8af3b6e30d21d7cd310dc144fd50d04b8e) Signed-off-by: Jesse Maseto (cherry picked from commit da0de43d4bd3ac3028f7d3032e028ee1228505a0) Signed-off-by: Fridolin Somers commit 3c23aae299179de1cbb368b634c720885831d46a Author: Nick Clemens Date: Mon Jan 28 11:32:55 2019 +0000 Bug 21877: (RM follow-up) Move space into conditional Signed-off-by: Nick Clemens (cherry picked from commit 5b4cbb1643aa20ada17c3f73df3e59dfc5a3dbd8) Signed-off-by: Martin Renvoize (cherry picked from commit 582a84a6c7328efe78bbacaad293e4e21e6785ca) Signed-off-by: Lucas Gass (cherry picked from commit a93fca9b201d37b5887444cf23b169ea2516f923) Signed-off-by: Fridolin Somers commit bbd5699f374bf86aa8c1ca20b80764506c8fa641 Author: Fridolin Somers Date: Tue Jan 22 09:45:02 2019 +0100 Bug 21877: Use AuthorisedValues.GetDescriptionByKohaField for notforloan in checkout Using only TT plugin for authorised value description is a better code. Test plan : Part 1: 1.1) On a catalog with items.notforloan defined with authorized values category NOT_LOAN 1.2) Define in NOT_LOAN an authorized values 1 with description 'at the beach' 1.3) Define in NOT_LOAN an authorized values 2 with description empty Part 2: 2.1) Set preference 'AllowNotForLoanOverride' to 'Don't allow' 2.2) Edit an item with notforloan=1 2.3) Checkout this item => You see 'Item not for loan (at the beach)' 2.4) Edit an item with notforloan=2 2.5) Checkout this item => You see 'Item not for loan' Part 3: 3.1) Set preference 'AllowNotForLoanOverride' to 'Allow' 3.2) Edit an item with notforloan=1 3.3) Checkout this item => You see 'Item is normally not for loan (at the beach)' 3.4) Edit an item with notforloan=2 3.5) Checkout this item => You see 'Item is normally not for loan' Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 36df53ad8d4987e938e478d934d553b73e7450f2) Signed-off-by: Martin Renvoize (cherry picked from commit 30895e2c561215fa7c094c9838021a0095a578ba) Signed-off-by: Lucas Gass (cherry picked from commit 11abf890e9b0d4843b5594060987028817104589) Signed-off-by: Fridolin Somers commit 6903dc826090eb0bbd9035194e3304fff70faff0 Author: Fridolin Somers Date: Tue Jan 22 09:47:22 2019 +0100 Bug 21877: Show authorized value description for withdrawn in checkout During checkout the withdrawn information is displayed in a message : "Item has been withdrawn". Like in other pages and like notforloan, we should display the withdrawn authorized value description. This patch adds this display. Add so that translation does not change. Also adds class 'co-withdrawn' (like in checkin 'ci-*' classes) to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Edit an item with withdrawn=1 5) Checkout this item => You see 'Item has been withdrawn (dropped in trash)' 6) Edit an item with withdrawn=2 7) Checkout this item => You see 'Item has been withdrawn' Signed-off-by: Pierre-Marc Thibault Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit cfd59672bb09c4766632de4c6f11cf9cf4bea3f9) Signed-off-by: Martin Renvoize (cherry picked from commit c22928630ac2c00501b2bb17d60a3b2ba99481c5) Signed-off-by: Lucas Gass (cherry picked from commit ea3972c08090619c462354cb1c37bdd2947bd0ad) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 3 +-- circ/circulation.pl | 4 +--- koha-tmpl/intranet-tmpl/prog/css/print.css | 1 + .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 14 +++++++++----- .../prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../bootstrap/en/modules/opac-course-reserves.tt | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 17:38:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 16:38:05 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-68-gf69a3ef 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, 18.05.x has been updated via f69a3ef8755b9e82f1912055e3049b47dd0becf9 (commit) via 626955bbfdcf66dce51ca93b6695e77927af2e2b (commit) via 2bc1e0f84fdd5e24d670e75603a7c692b71917cb (commit) via a59f0f707d3f40c4a4a64b26ad29be576ac9727b (commit) via b3b82d15b62693648ee702ab0253861f53cc106b (commit) via 1521585a4708db1107660d6bdfe833b30ee123b7 (commit) from 5dd2bed00cf4661cb9d1762415df649db7648e19 (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 f69a3ef8755b9e82f1912055e3049b47dd0becf9 Author: Lucas Gass Date: Tue Feb 12 00:39:57 2019 +0000 Bug 22132: Add RESTBasicAuth syspref - Revert This reverts commit 5b020c98163c9af74b60338d126887eb2fd7ec9f. Signed-off-by: Lucas Gass commit 626955bbfdcf66dce51ca93b6695e77927af2e2b Author: Lucas Gass Date: Tue Feb 12 00:39:19 2019 +0000 Bug 22132: Unit tests - Revert This reverts commit 2b12b70de4a117365cf76521be2119aa01a00957. Signed-off-by: Lucas Gass commit 2bc1e0f84fdd5e24d670e75603a7c692b71917cb Author: Lucas Gass Date: Tue Feb 12 00:38:41 2019 +0000 Bug 22132: Add Basic authentication to the API - Revert This reverts commit 2403b01021e66cae65e210426b644cc6a695ff5f. Signed-off-by: Lucas Gass commit a59f0f707d3f40c4a4a64b26ad29be576ac9727b Author: Lucas Gass Date: Tue Feb 12 00:37:34 2019 +0000 Bug 22132: (QA follow-up) Tests - use Mojo builtin for auth - Revert This reverts commit 7296f1d0bf76798ab914f45d65810e23194a565d. Signed-off-by: Lucas Gass commit b3b82d15b62693648ee702ab0253861f53cc106b Author: Lucas Gass Date: Tue Feb 12 00:36:46 2019 +0000 Bug 22132: (QA follow-up) set_password now expects a hashref - Revert This reverts commit c028f916747ee4b6618b76ff5a85db1f3ba9ff88. Signed-off-by: Lucas Gass commit 1521585a4708db1107660d6bdfe833b30ee123b7 Author: Lucas Gass Date: Tue Feb 12 00:35:50 2019 +0000 Bug 22132: DBRev 18.05.08.001 - Revert This reverts commit 5dd2bed00cf4661cb9d1762415df649db7648e19. Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/REST/V1/Auth.pm | 46 +--------- installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 15 ---- .../en/modules/admin/preferences/web_services.pref | 6 -- t/db_dependent/api/v1/auth_basic.t | 93 -------------------- 6 files changed, 3 insertions(+), 160 deletions(-) delete mode 100644 t/db_dependent/api/v1/auth_basic.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 18:18:46 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 17:18:46 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-70-ga69546f 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, 18.05.x has been updated via a69546fceaa69df0076689165599cfcd8e498dc9 (commit) via 12f0e63b3aa7c0386b2764d51472eac2b5379b06 (commit) from f69a3ef8755b9e82f1912055e3049b47dd0becf9 (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 a69546fceaa69df0076689165599cfcd8e498dc9 Author: Tomas Cohen Arazi Date: Thu Jan 24 14:29:09 2019 -0300 Bug 19816: Implement dateonly for rfc3339 format This patch implements the dateonly option for the rfc3339. This is described in the OpenAPI 2.0 specification [1]. The required output format is described on RFC 3339 [2], as 'full-date'. [1] https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#dataTypeFormat [2] https://tools.ietf.org/html/rfc3339#section-5.6 To test: - Apply the regression tests patch - Run: k$ prove t/DateUtils.t => FAIL: Tests fail because dateonly is not implemented - Apply this patch - Run: k$ prove t/DateUtils.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit b2dce05ddff8a047e7770ea241b1edd9b798212e) Signed-off-by: Martin Renvoize (cherry picked from commit dcc0478089f5fde72426d94810bed6430df73a34) Signed-off-by: Lucas Gass commit 12f0e63b3aa7c0386b2764d51472eac2b5379b06 Author: Tomas Cohen Arazi Date: Thu Jan 24 14:27:28 2019 -0300 Bug 19816: Regression tests This patch adds tests for the rfc3339 behaviour when dateonly => 1. To test: - Run: $ kshell k$ prove t/DateUtils.t => SUCCESS: Tests pass - Apply this patch - Run: k$ prove t/DateUtils.t => FAIL: dateonly is not implemented Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 7e69ab62a5ef3fbd350c6606d25b5ab6f6bc168e) Signed-off-by: Martin Renvoize (cherry picked from commit 41115fc79dfd16be62dd56e1946e0a2e08c6a2fc) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha/DateUtils.pm | 9 +++++++-- t/DateUtils.t | 5 ++++- 2 files changed, 11 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 18:21:48 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 17:21:48 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-71-g800e3ae 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, 18.05.x has been updated via 800e3ae8eb0cc58bea1f58690ba3683e730fa764 (commit) from a69546fceaa69df0076689165599cfcd8e498dc9 (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 800e3ae8eb0cc58bea1f58690ba3683e730fa764 Author: Fridolin Somers Date: Thu Jan 31 09:12:13 2019 +0100 Bug 22242: Javascript error in value builder cased by Select2 Same as Bug 17780 but in value builders. Select2 (Bug 13501) introduced divs and inputs that broke some assumptions about the expected HTML structure. This patch checks if input has name attribute, because some inputs in Select2 have not. It brakes value builders marc21_linking_section.tt and unimarc_field_4XX.tt. Test plan : 1) On a MARC21 database 2) Define 774$0 as a regular subfield 3) Define 774$4 with an authorised value category 4) Define 774$t with value builder marc21_linking_section 5) Create a new record 6) Use value builder in 774$t 7) Search for a record and click choose 8) Without patch : a popup window does not close and show a blank screen 9) With patch : popup windows get close and you see in field 774 $0 and $t field with values 10) Same tests with a UNIMARC database on field 461 with value builder unimarc_field_4XX.tt Signed-off-by: Owen Leonard Tested successfully with MARC21 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 3ca0234d34ac9708a8335cfa97805fb7498201bf) Signed-off-by: Martin Renvoize (cherry picked from commit 55b20ad1a7b8afa5c385bd3f9825014d40936ba1) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../en/modules/cataloguing/value_builder/marc21_linking_section.tt | 1 + .../prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt | 1 + 2 files changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 18:24:22 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 17:24:22 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-72-g91f25db 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, 18.05.x has been updated via 91f25db7b33e5c778ff62f0bdddd68bea6bf8691 (commit) from 800e3ae8eb0cc58bea1f58690ba3683e730fa764 (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 91f25db7b33e5c778ff62f0bdddd68bea6bf8691 Author: Marcel de Rooy Date: Wed Jan 30 15:37:10 2019 +0000 Bug 22236: Translation should generate tags with consistent attribute order When running misc/translator/translate, the order of attributes in the translated templates is not consistent and may vary. This is caused by the random order of hash keys in perl. This causes things like this in run 1: And this in run 2: As you can see, there is actually no difference apart from the order. When comparing the result of various translation runs, I would rather get rid of such noise and only see the real changes. The needed change is not trivial to find, but only requires a simple addition to a sort operation in tmpl_process3.pl. The current sort only makes sure that the '/' comes at the end. We should sort the names of the keys too when this value is 0 (just meaning: no end tag symbol). Test plan: [1] Run a translation without this patch and set a few templates aside. [2] Run a translation with this patch. [3] Run a compare (diff) on the templates copied in step 1. Verify that the only changes are found in the sort order of attributes in html tags. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit fb62e8d1fc8b210a5b23801b7b8faff3280bf638) Signed-off-by: Martin Renvoize (cherry picked from commit 150de6dfe7f7d18f5b61e45b0442802c2f61fe9f) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: misc/translator/tmpl_process3.pl | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 21:38:40 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 20:38:40 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-73-g60f8ca7 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, 18.05.x has been updated via 60f8ca789f713c3a5c7e3478bac7132165b9092d (commit) from 91f25db7b33e5c778ff62f0bdddd68bea6bf8691 (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 60f8ca789f713c3a5c7e3478bac7132165b9092d Author: Martin Renvoize Date: Fri Feb 1 09:55:54 2019 +0000 Bug 22254: Correction to datehandling in test Adding 13 months is not always the same as adding 1 month and then adding 12 months in DateTime maths. This patch rectified the test to match the correct behaviour in koha. Test plan. 1) Modify the test (around line 268) to test against the suspect leap date of 2019-01-31 and watch the test fail. 2) Apply the patch (which also adds this modification to test for such a leap date) and watch the test now pass. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 1da0ba48b6fdf38cfd3d3ea63ec076b15995610f) Signed-off-by: Martin Renvoize (cherry picked from commit 413f34ba244af3560861785f5aa74ab457f00b02) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Koha/Patrons.t | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 21:53:19 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 20:53:19 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-74-g3debb1e 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, 18.05.x has been updated via 3debb1e0dce18b668546171a7ae40f7599e8ec79 (commit) from 60f8ca789f713c3a5c7e3478bac7132165b9092d (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 3debb1e0dce18b668546171a7ae40f7599e8ec79 Author: Owen Leonard Date: Wed Oct 3 16:07:19 2018 +0000 Bug 16231: Correct permission handling in subscription edit This patch corrects the way subscription edit menu items are displayed according to the user's permissions settings. To test, apply the patch and log in to the staff client as a user who has permission to create, edit, and delete subscriptions. - Locate an subscription and view the details for it. - Confirm that each "Edit" menu item works correctly. - Repeat the process when logged in as a user with varying combinations of create, edit, and delete permissions. - Test as a user limited by IndependentBranches. Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 7520ede89987a7a65301debdda46950a6364ebfd) Signed-off-by: Martin Renvoize (cherry picked from commit f2151c1bbc98003576606d8b1bd2cb2453e6925a) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/serials-toolbar.inc | 35 +++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 22:21:11 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 21:21:11 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-75-ge347ef1 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, 18.05.x has been updated via e347ef104a389d62eebb1fb9385865167e7235e8 (commit) from 3debb1e0dce18b668546171a7ae40f7599e8ec79 (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 e347ef104a389d62eebb1fb9385865167e7235e8 Author: Jonathan Druart Date: Tue Dec 11 10:13:42 2018 -0300 Bug 21907: Fix article requests count for non-superlibrarians The query generates "Column 'branchcode' in where clause is ambiguous" Test plan: 1 - Enable 'IndependentBranchesPatronModifications' and article requests 2 - Sign in as non-superlibrarian 3 - View plack log 4 - Refresh mainpage, see error in logs Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ab9e4ca6a46519ddc69ad76837407c0a4f0ed0cd) Signed-off-by: Martin Renvoize (cherry picked from commit 9c823701268d07feb149e219ece7c88d89d47732) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: mainpage.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 22:30:17 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 21:30:17 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-76-g708fcf8 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, 18.05.x has been updated via 708fcf8b4ccfa04681339920d1a1c9fb608c9d03 (commit) from e347ef104a389d62eebb1fb9385865167e7235e8 (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 708fcf8b4ccfa04681339920d1a1c9fb608c9d03 Author: Kyle M Hall Date: Thu Jan 10 14:32:22 2019 -0500 Bug 22097: CataloguingLog should be suppressed for item branch transfers Bug 18816 missed the fact that a branch transfer triggers ModItem and thus generates an action log line. We should not be creating those action logs, especially considering the transfers table itself already documents the transfer. Test Plan: 1) Enable CataloguingLog 2) Transfer an item to another branch 3) Note the new action log line created 4) Apply this patch 5) Create another item transfer 6) No new action log line should be created! Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit b3c25b64b868b56423c50b9df4fac4bb55947679) Signed-off-by: Martin Renvoize (cherry picked from commit 0f0218bc838bee7b55853a456334fd2518b5784c) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 22:34:14 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 21:34:14 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-77-g7ce9ac1 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, 18.05.x has been updated via 7ce9ac1f7deb6ab016256be3f068ffd342b84eef (commit) from 708fcf8b4ccfa04681339920d1a1c9fb608c9d03 (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 7ce9ac1f7deb6ab016256be3f068ffd342b84eef Author: Marcel de Rooy Date: Mon Nov 12 11:48:23 2018 +0100 Bug 21808: Field 711 is not handled correctly in showAuthor XSLT for relator term or code The test should check $4 or $e for fields ne 111,711. And should check $4 or $j for 111,711. Test plan: Edit a record, add a meeting in 711 without $4 but with $j. Without this patch the term is not visible, with this patch it is. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 6179f23dd8b4ed24add2e76c7b8e193372052201) Signed-off-by: Martin Renvoize (cherry picked from commit 9199083de8637d96148b873cc745c1a81fe78d01) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 23:39:45 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 22:39:45 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-78-g5675b95 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, 18.05.x has been updated via 5675b95d66c0d179c63bb75e90cd510d4367dc39 (commit) from 7ce9ac1f7deb6ab016256be3f068ffd342b84eef (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 5675b95d66c0d179c63bb75e90cd510d4367dc39 Author: Nick Clemens Date: Wed Feb 6 12:49:58 2019 +0000 Bug 22278: Clear cache when creating new report groups or subgroups When a user adds a new group we create it, then fetch the groups from the cache. However, we aren't clearing the cache on creation. This patch fixes that To test: 0) Start a new report 1) Pick create for the group 2) Enter code and value 3) Save 4) You remain on the page and value and code are now empty (ok) 5) BUT: The pull down for the group remains "None" instead of reflecting the new group 6) Open a new tab and browse to reports - note the group exists and the report is in it 7) On original tab save report again, the group was not selected so is lost 8) Apply patch 9) Retest with a new report 10) Group is created, saved, and selected upon save 11) Subsequent edits include the new group 12) Test with subgroups as well Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ea36265697c85cfb1f7de0b2344ef8647dc31387) Signed-off-by: Martin Renvoize (cherry picked from commit f64d0d9038a58abe360744200348950688e834cd) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: reports/guided_reports.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 23:44:06 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 22:44:06 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-79-g25111a3 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, 18.05.x has been updated via 25111a3182504b712d60f9b39097bdda00c78632 (commit) from 5675b95d66c0d179c63bb75e90cd510d4367dc39 (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 25111a3182504b712d60f9b39097bdda00c78632 Author: Liz Rea Date: Thu Jan 31 22:41:29 2019 +0000 Bug 22282: Fix PDF issue when exporting PDF in French format. Fixing up QA comments, keeping 1st instance and removing the 2nd. Original test plan by Christophe Croullebois. To test : Without the patch : 1? select in Acquisitions preferences/OrderPdfFormat French 3-page 2? restart plack if needed 3? In acqui/basketgroup.pl select closed tab 4? Click on "Export as PDF" button 5? You should see a blank page saying "Internal Server Error" With the patch : Do the same Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 0844f2c174c83ce3da11be07511730b0c220e5ad) Signed-off-by: Martin Renvoize (cherry picked from commit 981670c68cb3d12b30c410c12ed6488f5a555117) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha/pdfformat/layout3pagesfr.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 12 23:53:05 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 22:53:05 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-80-gf52c6cc 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, 18.05.x has been updated via f52c6cc83f68bdab9b81165d6b76b164a031c82e (commit) from 25111a3182504b712d60f9b39097bdda00c78632 (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 f52c6cc83f68bdab9b81165d6b76b164a031c82e Author: Pasi Kallinen Date: Tue Nov 27 11:53:32 2018 +0200 Bug 21885: Calendar to-date starts before end-date When adding new holidays to the calendar, you pick the start date, and then the end date, but the end date calendar will start from current date, not from the picked start date. Sometimes this means many extra clicks to pick an end date. Make the end date calendar start from the beginning date by default. Test plan: 1) Go to the tools -> calendar 2) Pick a start date somewhere in the future, and then open the end date calendar. Notice how it starts before the start date of the date range. 3) Apply patch. 4) Pick a start date in the future. The end date calendar should automatically default to the same date. 5) Change the start date a day backwards, note how the end date does not change. 6) Change the start date after the end date, note how the end date adjusts, so it is not in the past. Signed-off-by: Pasi Kallinen Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 0939d44c22cda569faf4c0c60fd67de04097b34d) Signed-off-by: Martin Renvoize (cherry picked from commit a69fd8912496c5d7335e0e4d8f113d2b2aeb7b61) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/holidays.tt | 24 +++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 13 00:00:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Feb 2019 23:00:23 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-81-g3c9af06 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, 18.05.x has been updated via 3c9af06611d0642ab96d51ca1c249a8e14a52805 (commit) from f52c6cc83f68bdab9b81165d6b76b164a031c82e (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 3c9af06611d0642ab96d51ca1c249a8e14a52805 Author: Katrin Fischer Date: Mon Jan 14 05:41:48 2019 +0000 Bug 17347: Ignore whitespace before and after on renewing When an item is checked out, Koha ignores whitespace at the beginning and the end of the entered barcode. This makes life easier, if a barcode is C&P from another page. This patch makes the renewal page behave the same. To test: - Checkout an item - Renew the item from the renew tab or renewal page entering the barcode with leading and trailing whitespace - "Barcode not found" - Apply patch - Try again - Barcode should be found now Signed-off-by: Owen Leonard Signed-off-by: Devinim Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 0e220869f5a3327eee8f9426d648fbcaaa0fd7fa) Signed-off-by: Martin Renvoize (cherry picked from commit 7c881b32b5f7bfca6ccb17b8ddc8045ad37a3524) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: circ/renew.pl | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 13 01:02:45 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 13 Feb 2019 00:02:45 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-82-g1212be7 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, 18.05.x has been updated via 1212be7e4999d05d31e3e9b627e4312c641c50ab (commit) from 3c9af06611d0642ab96d51ca1c249a8e14a52805 (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 1212be7e4999d05d31e3e9b627e4312c641c50ab Author: Katrin Fischer Date: Sun Jan 13 11:15:27 2019 +0100 Bug 22120: Add price formattig to patron summary print The patron summary print lists the replacement prices and rental charges of items and totals them. With this patch they will be formatted according to the CurrencyFormat system preference. To test: - Find or create a patron with some checkouts - Make sure some items have replacement price set and some have a rental charge - "Print summary" from the account in staff - Verify that charges and prices in the checkouts table are formatted correctly - Toggle CurrencyFormat to different settings Signed-off-by: helene hickey Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 3c2cc8da26f7a907c0b51f928ffb100eefbfa692) Signed-off-by: Martin Renvoize (cherry picked from commit 3638172077c95f0cba2f0e190f245e598e4b004d) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/moremember-print.tt | 18 +++++++++--------- members/summary-print.pl | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 15 00:14:36 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Feb 2019 23:14:36 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-83-gc627ae1 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, 18.05.x has been updated via c627ae18102f05931ddc97974144812a55731753 (commit) from 1212be7e4999d05d31e3e9b627e4312c641c50ab (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 c627ae18102f05931ddc97974144812a55731753 Author: Katrin Fischer Date: Sun Jan 13 10:06:22 2019 +0100 Bug 22119: Add price formatting in more places in circulation This adds some missing Price filters to some places in circulation. To check verify the amount are displayed according to setting of CurrencyFormat (use FR or CH for seeing a change) Use a patron account with no pending fines at the beginning for all tests. 1) - Switch RentalFeesCheckoutConfirmation to "Ask" - Check out an item with a rental charge - Verify message is formatted correctly: Rental charge for this item: ... 2) - Switch RentalsInNoissuesCharge to "Don't include" - Make sure patron has only Rental fines on their account - Check out another item - Verify message is formatted correctly: The patron has unpaid charges for holds, rentals etc ... 3) - Switch BatchCheckouts to "Allow" - Add the patron category of your test patron to BatchCheckoutsValidCategories - Checkout any item - Verify the message in the information column is formatted correctly: The patron has unpaid charges for holds, rentals etc of ... Signed-off-by: Jasmine Amohia Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit dc6be66e2b2ec5917d7bec020d4e94c40baa9f6c) Signed-off-by: Martin Renvoize (cherry picked from commit 26c59980fe123fc6033098ae374f57c4afd53aca) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- .../prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 15 00:24:08 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Feb 2019 23:24:08 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-86-g81ae463 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, 18.05.x has been updated via 81ae463c1e7b67bff388ec0f4b33e0d9dd9a3139 (commit) via 5493a99486b4c3398f440d36c417d62e315fd5eb (commit) via f7bcb149d57cf55ff075d6f41cbecbb310218c9e (commit) from c627ae18102f05931ddc97974144812a55731753 (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 81ae463c1e7b67bff388ec0f4b33e0d9dd9a3139 Author: Kyle M Hall Date: Mon Feb 11 07:15:11 2019 -0500 Bug 21829: (QA follow-up) - Update the number of unit tests Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit f3f5b98fd909f9e13aa4e45a16dc275ef4ee8489) Signed-off-by: Martin Renvoize (cherry picked from commit 60b1a4f83611414a042651bea757dc7e96fde6f9) Signed-off-by: Lucas Gass commit 5493a99486b4c3398f440d36c417d62e315fd5eb Author: Jonathan Druart Date: Wed Nov 14 09:38:01 2018 -0300 Bug 21829: Correctly format dateexpiry in notices (date only) dateexpiry is a date, we should not display the time part in notice. Test plan: Create a notice with borrowers.dateexpiry, generate this notice. The value should be displayed without the time part Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 5b160af2a051dc3693f04dabf320d0995cf26160) Signed-off-by: Martin Renvoize (cherry picked from commit ecb86a84c13e4e5661f4c6683b7755c21d607bbe) Signed-off-by: Lucas Gass commit f7bcb149d57cf55ff075d6f41cbecbb310218c9e Author: Jonathan Druart Date: Wed Nov 14 09:37:58 2018 -0300 Bug 21829: Add tests for dateexpiry format in notices Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 04e121a741a442f5b557e11864eb69be9d0c3ded) Signed-off-by: Martin Renvoize (cherry picked from commit 1106c0fa595c8378807bc955b29c2f83c2af5ba9) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 2 +- t/db_dependent/Letters.t | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 15 00:29:45 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Feb 2019 23:29:45 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-87-g03bdf5d 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, 18.05.x has been updated via 03bdf5de73a9efcd30de507ff1d7f078f1605d4a (commit) from 81ae463c1e7b67bff388ec0f4b33e0d9dd9a3139 (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 03bdf5de73a9efcd30de507ff1d7f078f1605d4a Author: Jasmine Amohia Date: Wed Jan 16 01:37:22 2019 +0000 Bug 21840: Fixed some typos in the templates intranet-tmpl/prog/en/modules/ill/ill-requests.tt:13 Bibliograpic record ID --> Bibliographic record ID intranet-tmpl/prog/en/modules/acqui/basket.tt:547 Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first --> ... with this order. Cancel holds first intranet-tmpl/prog/en/modules/acqui/parcel.tt Can't cancel order, ([% loop_order.holds_on_order | html %]) holds are linked with this order cancel holds first --> ... with this order. Cancel holds first intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt:32 Print this slabel --> Print this label Test plan: 1. Check that the fixes in the patch are correct Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 7a58d0215907c05b0b82944141f6f4d4595c3979) Signed-off-by: Martin Renvoize (cherry picked from commit a6945032dab677dbba47c66f3116ba6a34d3ff0e) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 15 00:32:59 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Feb 2019 23:32:59 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.08-88-g3947327 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, 18.05.x has been updated via 3947327b65dc25a5430271c8ef2bd9b792a35df9 (commit) from 03bdf5de73a9efcd30de507ff1d7f078f1605d4a (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 3947327b65dc25a5430271c8ef2bd9b792a35df9 Author: Katrin Fischer Date: Tue Feb 5 00:42:34 2019 +0100 Bug 21441: Fix wrong reference to a 'holds' table on system information tab It looks like a typo snuck in on the about page, listing a holds table instead of reserves. To test: - Manually create the same PK (reserve_id) in reserves and old_reserves - Verify that the message on about > system information now correctly lists those tables (not holds and old_reserves) Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit cfea47cb064362bbb1fc93769be4b7df3a8e2fae) Signed-off-by: Martin Renvoize (cherry picked from commit d7c112bc0ecc380fa8621842bc02ff30d8e3c68c) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 15 10:03:08 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Feb 2019 09:03:08 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.14-29-g1d5424c 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 1d5424c954b8ba3b889b86eb2236d2cb53ed5b3d (commit) via 3ae9aa63db3f337886a5c1437c70a50ac1aab6c5 (commit) via 0c01c67027890b46512f495535ea077cb772c31c (commit) via 8c6f6b88481ddbf2e179dc60b05844d72af6164b (commit) from e4fb7e3f23c657ea945e052b1711b84bcca29921 (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 1d5424c954b8ba3b889b86eb2236d2cb53ed5b3d Author: Katrin Fischer Date: Mon Jan 14 05:41:48 2019 +0000 Bug 17347: Ignore whitespace before and after on renewing When an item is checked out, Koha ignores whitespace at the beginning and the end of the entered barcode. This makes life easier, if a barcode is C&P from another page. This patch makes the renewal page behave the same. To test: - Checkout an item - Renew the item from the renew tab or renewal page entering the barcode with leading and trailing whitespace - "Barcode not found" - Apply patch - Try again - Barcode should be found now Signed-off-by: Owen Leonard Signed-off-by: Devinim Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 0e220869f5a3327eee8f9426d648fbcaaa0fd7fa) Signed-off-by: Martin Renvoize (cherry picked from commit 7c881b32b5f7bfca6ccb17b8ddc8045ad37a3524) Signed-off-by: Lucas Gass (cherry picked from commit 3c9af06611d0642ab96d51ca1c249a8e14a52805) Signed-off-by: Fridolin Somers commit 3ae9aa63db3f337886a5c1437c70a50ac1aab6c5 Author: Liz Rea Date: Thu Jan 31 22:41:29 2019 +0000 Bug 22282: Fix PDF issue when exporting PDF in French format. Fixing up QA comments, keeping 1st instance and removing the 2nd. Original test plan by Christophe Croullebois. To test : Without the patch : 1? select in Acquisitions preferences/OrderPdfFormat French 3-page 2? restart plack if needed 3? In acqui/basketgroup.pl select closed tab 4? Click on "Export as PDF" button 5? You should see a blank page saying "Internal Server Error" With the patch : Do the same Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 0844f2c174c83ce3da11be07511730b0c220e5ad) Signed-off-by: Martin Renvoize (cherry picked from commit 981670c68cb3d12b30c410c12ed6488f5a555117) Signed-off-by: Lucas Gass (cherry picked from commit 25111a3182504b712d60f9b39097bdda00c78632) Signed-off-by: Fridolin Somers commit 0c01c67027890b46512f495535ea077cb772c31c Author: Marcel de Rooy Date: Mon Nov 12 11:48:23 2018 +0100 Bug 21808: Field 711 is not handled correctly in showAuthor XSLT for relator term or code The test should check $4 or $e for fields ne 111,711. And should check $4 or $j for 111,711. Test plan: Edit a record, add a meeting in 711 without $4 but with $j. Without this patch the term is not visible, with this patch it is. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 6179f23dd8b4ed24add2e76c7b8e193372052201) Signed-off-by: Martin Renvoize (cherry picked from commit 9199083de8637d96148b873cc745c1a81fe78d01) Signed-off-by: Lucas Gass (cherry picked from commit 7ce9ac1f7deb6ab016256be3f068ffd342b84eef) Signed-off-by: Fridolin Somers commit 8c6f6b88481ddbf2e179dc60b05844d72af6164b Author: Fridolin Somers Date: Thu Jan 31 09:12:13 2019 +0100 Bug 22242: Javascript error in value builder cased by Select2 Same as Bug 17780 but in value builders. Select2 (Bug 13501) introduced divs and inputs that broke some assumptions about the expected HTML structure. This patch checks if input has name attribute, because some inputs in Select2 have not. It brakes value builders marc21_linking_section.tt and unimarc_field_4XX.tt. Test plan : 1) On a MARC21 database 2) Define 774$0 as a regular subfield 3) Define 774$4 with an authorised value category 4) Define 774$t with value builder marc21_linking_section 5) Create a new record 6) Use value builder in 774$t 7) Search for a record and click choose 8) Without patch : a popup window does not close and show a blank screen 9) With patch : popup windows get close and you see in field 774 $0 and $t field with values 10) Same tests with a UNIMARC database on field 461 with value builder unimarc_field_4XX.tt Signed-off-by: Owen Leonard Tested successfully with MARC21 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 3ca0234d34ac9708a8335cfa97805fb7498201bf) Signed-off-by: Martin Renvoize (cherry picked from commit 55b20ad1a7b8afa5c385bd3f9825014d40936ba1) Signed-off-by: Lucas Gass (cherry picked from commit 800e3ae8eb0cc58bea1f58690ba3683e730fa764) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: Koha/pdfformat/layout3pagesfr.pm | 2 +- circ/renew.pl | 1 + .../en/modules/cataloguing/value_builder/marc21_linking_section.tt | 1 + .../prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 15 19:59:37 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Feb 2019 18:59:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-459-gae85590 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 ae85590a323c468e1ffbe566fe1f916a2901b56b (commit) via a5ceb74102ef664dfa5cde20b049c924b1600c0b (commit) via 2cf573ab347da9e0f570dbf05961c38d3b0f7aaa (commit) via 60347dcc0724ad354cfabb89ca024dfa269e62e5 (commit) via daf47da8cd9c94829ff49ec2041d39b1510ae6da (commit) via 1fe43199b642fa575fd93131e1390c55d4631e52 (commit) via f2746dd8fb1c4557ae56db4769a07fe663576ddc (commit) via 4e139a237b874df5fcd2169abba75eb3745239f5 (commit) via 39d2885d1330afe825e1881f5fc8033d459f6006 (commit) via 040c5439c020c34702d1161f12bdc3792d5172f4 (commit) via c5bba9f00230baf333647c32d17c9135a6560caa (commit) via b379bba255e32d6fcd7f8b053e58c2bc23491926 (commit) via ef248b82d7de8be112b312351f09cfb4baa3199f (commit) via 6aadbcc4be65185a56a79980bea54bc4d74fe356 (commit) via b7b4694666657f57aaf61d091ed34c9f754a11e3 (commit) via 012200fbc0e3684be312cad055dc583c30a1131d (commit) via c3b41cb12465249cc87ed8866855e06e61842872 (commit) via 50fd86d42fa76b3840c61ea004d026d4810bc4dc (commit) via 5324268e099ead7a6864d16bae0f051444a1d34e (commit) via 0da1090d3a21f9ee596500477504be476bed8af7 (commit) via 12fe392d26fda1559f5690a71330a93ffc72a6b7 (commit) via 7266d50dd2725c87acf889aa7d6a211999ca1c47 (commit) via 2c6d39452af2364463b509d7d18526714bc17b3f (commit) via 1f23384475214cf291afe081aaa2ef6d18767ed8 (commit) via 11b9bb3da9b250ca6fa23792775685037330599e (commit) via 0daa02a961be828d5c38b6933c91ee79853f95c5 (commit) via c2bec690b593511df82f3fd70537174afe8fa5f6 (commit) from 66f3a72a01ba5238a9bba39a3b9cb659dbb47a42 (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 ae85590a323c468e1ffbe566fe1f916a2901b56b Author: Katrin Fischer Date: Tue Feb 5 21:29:13 2019 +0000 Bug 22171: Fix shipping cost display on invoice When not 0 the shipping cost on the invoice would display with a lot of numbers after the comma. This fixed it to display with only 2. To test: - Make sure you have an invoice with shipping cost set (example: 5.00) - Open the invoice for editing (invoice.pl) - Verify the shipping cost displays with too many decimals (5.000000) - Apply patch - Verify now the shipping cost displays correctly (5.00) Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit a5ceb74102ef664dfa5cde20b049c924b1600c0b Author: Katrin Fischer Date: Tue Feb 5 22:10:01 2019 +0000 Bug 21710: Fix typo in atributes in installer Adds the missing t to some atributes in the web installer files. To test: Easiest to verify by looking at the patches, changes appear in comments and the text shown by the nb-NO and English web installer. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 2cf573ab347da9e0f570dbf05961c38d3b0f7aaa Author: Katrin Fischer Date: Tue Feb 5 22:12:03 2019 +0000 Bug 22299: Fix typo in option of import_patrons.pl Fix typo in 'p|preserve-extended-atributes' option of the import_patrons.pl script. To test: - Use the script to import patron data. - Verify behaviour is the same with and without the patch concerning the preserve-extended_at(t)tributes option Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 60347dcc0724ad354cfabb89ca024dfa269e62e5 Author: Katrin Fischer Date: Sun Feb 10 01:36:20 2019 +0100 Bug 20544: Wrong comment database documentation on itemnotes Fixes the comments in kohastructure.sql to state the right MARC21 fields for itemnotes (public and internal). To test: - Create a new Koha database and make sure it still installs - Read the patch and check comments are correct Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit daf47da8cd9c94829ff49ec2041d39b1510ae6da Author: Katrin Fischer Date: Sun Feb 10 01:48:46 2019 +0100 Bug 20174: Remove xml_sax.pl target from Makefile.pl There appears to be no xml_sax.pl in Koha, so the reference should be removed. Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 1fe43199b642fa575fd93131e1390c55d4631e52 Author: Katrin Fischer Date: Mon Feb 4 06:30:51 2019 +0000 Bug 8387: Hide headings in tools when user has no permissions for any listed below The headings for each column on the tools page will show, even if the user has no permission for any tool below it. This patch tries to correct this. To test: - Try various combinations of tool permissions - On the tools module start page and for the tools sidebar visible on the left on a tool's page: - Make sure headings don't show when you have no permissions for any of the tools listed below - Make sure headings show correctly if you have one or many of the tools permissions needed Signed-off-by: Owen Leonard The qa tool gives some warnings but I think they can be considered false positives. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit f2746dd8fb1c4557ae56db4769a07fe663576ddc Author: Katrin Fischer Date: Wed Feb 6 11:43:52 2019 +0000 Bug 18939: Acquisition statistics - Fix wrong template variable name for collection filter The template variable was wrong, so the filter never submitted the collection code for the query. Before: After: To test: - Go to Reports > Statistics wizards > Acquisitions - Pick a row and column - Compare results with and without collection filter - Verify the table is always the same - Apply patch - Repeat comparison, verify the filter works now https://bugs.koha-community.org/show_bug.cgi?id=18393 Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 4e139a237b874df5fcd2169abba75eb3745239f5 Author: Katrin Fischer Date: Fri Jan 4 11:42:08 2019 +0000 Bug 10676: Add unit tests - GetItemsInfo To test: prove t/db_dependent/Items.t Signed-off-by: Pierre-Marc Thibault Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 39d2885d1330afe825e1881f5fc8033d459f6006 Author: Katrin Fischer Date: Fri Jan 4 10:11:03 2019 +0000 Bug 10676: Fix behaviour of OpacHiddenItems for items.restricted The numerical restricted value was overwritten in GetItemsInfo with the description. So OpacHiddenItems would only work for restricted using the description, not the numerical value of the authorised value like for other similar status fields. This changes GetItemsInfo to use a separate variable for the description, as it's already done for notforloan and changes the template files where the variable is used accordingly. To test - Before applying patch - Configure OpacHiddenItems with: restricted: [1] - Find a record with more than one item and mark one of the items as "Restricted Access" (assume standard sample data - check authorised value if status doesn't exist) - Verify the item is still shown in OPAC. - Apply patch - Verify that the item is now hidden - Verify that the status still displays nicely in the staff detail page - Delete OpacHiddenItems - Verify that the status is showing nicely in the OPAC detail page Signed-off-by: Pierre-Marc Thibault Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 040c5439c020c34702d1161f12bdc3792d5172f4 Author: Owen Leonard Date: Thu Feb 7 13:11:35 2019 +0000 Bug 22287: Correct new charts CSS This patch reverts some changes to reports CSS from Bug 22168 which were unnecessary and which adversely affected the report add/edit form styling. To test, apply the patch and clear your browser cache if necessary. Go to Reports -> Saved reports and repeat the test plan for Bug 22168: - Run a report which returns more than one column. - On the report results page, click the "Create chart" button. The chart settings form should appear in a modal window. - Click the "Draw" button. The modal should disappear and the chart should be shown. Then test the process for adding or editing an SQL report. The form should be styled in a way consistent with other forms in the staff client. Signed-off-by: Mika?l Olangcay Brisebois Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit c5bba9f00230baf333647c32d17c9135a6560caa Author: Nick Clemens Date: Fri Feb 15 16:02:43 2019 +0000 Bug 10659: Compiled CSS Signed-off-by: Nick Clemens commit b379bba255e32d6fcd7f8b053e58c2bc23491926 Author: Owen Leonard Date: Mon Feb 11 13:35:12 2019 +0000 Bug 10659: (follow-up) Ensure zero rating shows correctly This patch makes a minor markup addition to ensure that a title with no rating shows no stars. Also changed: Minor addition to search results JS to prevent unwanted scrolling if the user clicks a star in a star rating. Signed-off-by: Nick Clemens commit ef248b82d7de8be112b312351f09cfb4baa3199f Author: Owen Leonard Date: Wed Nov 28 16:58:48 2018 +0000 Bug 10659: Upgrade jQuery star ratings plugin This patch replaces our current jQuery star ratings plugin with a newer plugin which will be compatible with newer versions of jQuery: http://antenna.io/demo/jquery-bar-rating/examples/ To test you should have one or more records in your catalog with star ratings. - Apply the patch and set the OpacStarRatings system preference to "results and details" - Perform a search in the catalog which will return one or more titles which have ratings. - Confirm that the ratings appear correctly and the ratings are read-only. - Open the "normal" detail page for that record. - Confirm that the star rating appears correctly. - Test setting and re-setting your star rating. Confirm that it is saved. - Confirm that the "cancel rating" link appears when you have a rating set, and that it disappears after you click it. - Test that the "only details" and disabled options of the OpacStarRatings preference work as they should. - Confirm that information about the plugin appears on the About page in the staff client, replacing the old star ratings plugin information. Signed-off-by: Pierre-Marc Thibault Signed-off-by: Nick Clemens commit 6aadbcc4be65185a56a79980bea54bc4d74fe356 Author: Tomas Cohen Arazi Date: Tue Jan 29 11:29:06 2019 -0300 Bug 22227: Make GET /cities staff only This patch removes the possibility to access the city objects without privileged access (minimum permissions == catalogue). It does so by adding the required permissions to the spec. The tests are adjusted. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/api/v1/cities.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit b7b4694666657f57aaf61d091ed34c9f754a11e3 Author: Magnus Enger Date: Mon Feb 11 11:07:21 2019 +0100 Bug 12488: Make bulkmarcimport.pl -d use DELETE instead of TRUNCATE On MySQL >= 5.5 bulkmarcimport.pl with the -d (delete) switch gives an error like "Cannot truncate a table referenced in a foreign key constraint". This patch proposes to replace the offending TRUNCATE with DELETE. Auto incerement counters are reset to 1 to preserve the functionality from TRUNCATE. To test: - Make sure you havae a test database with some records and items - Run bulkmarcimport.pl with the -d switch - Observe the error described above - Apply this patch - Run bulkmarcimport.pl with the -d switch again - Observe the lack of an error - Verify that the newly imported records and items have biblionumber and itemnumbers starting with 1 Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 012200fbc0e3684be312cad055dc583c30a1131d Author: Marcel de Rooy Date: Fri Feb 15 10:06:33 2019 +0000 Bug 19832: (QA follow-up) Remove obsolete pending_queue call Only use of $pending was removed in the former patch. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit c3b41cb12465249cc87ed8866855e06e61842872 Author: Nick Clemens Date: Wed Jan 16 13:19:45 2019 +0000 Bug 19832: Don't fill holds in SIP/Transaction/Checkout.pm AddIssue already checks for holds in the item being issued and deals with them The sip code, additionally, does not consider that multiple holds per bib is allowed To test: 0 - Apply only first patch (unit tests) 1 - Place two holds for a patron on a bib 2 - Checkout that item via sip_cli_emulator 3 - Note all holds are cancelled/filled 4 - prove -v t/db_dependent/SIP/Transaction.t 5 - it fails 6 - Apply second patch 7 - prove tests, all green 8 - Place two holds on a single bib for one patron again 9 - Checkout the item via sip_cli_emulator 10 - Only one holds is filled Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 50fd86d42fa76b3840c61ea004d026d4810bc4dc Author: Nick Clemens Date: Wed Jan 16 13:19:31 2019 +0000 Bug 19832: Unit tests Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Amended: maxissueqty => 10. Replaced dot by comma. Signed-off-by: Nick Clemens commit 5324268e099ead7a6864d16bae0f051444a1d34e Author: Nick Clemens Date: Thu Jan 3 20:52:15 2019 +0000 Bug 22067: Return if no patron passed to can_see_patron_infos To test: 1 - Find an adult patron 2 - Add a child to their account 3 - Delete the parent from the db 4 - Attempt to edit the child record 5 - Apply patch 6 - Repeat 7 - Note you can edit the child account 8 - Note guarantor id is not a link Signed-off-by: Maryse Simard Signed-off-by: Marcel de Rooy No blocker for me, but we are a bit hiding that guarantorid probably should be a foreign key cleared to NULL at deletion time. Signed-off-by: Nick Clemens commit 0da1090d3a21f9ee596500477504be476bed8af7 Author: Fridolin Somers Date: Wed Feb 6 16:10:07 2019 +0100 Bug 22140: Larger unit test for get_hostitemnumbers_of Add syspref EasyAnalyticalRecords impact in unit test for get_hostitemnumbers_of Test plan : Run t/db_dependent/Items.t Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 12fe392d26fda1559f5690a71330a93ffc72a6b7 Author: Fridolin Somers Date: Wed Feb 6 15:03:01 2019 +0100 Bug 22140: Use of EasyAnalyticalRecords pref is get_hostitemnumbers_of Like Bug 20702 defined GetHostItemsInfo does nothing if EasyAnalyticalRecords pref is disabled, get_hostitemnumbers_of must be dependant on this pref too. Test plan : 1) Build an analytical record with 773$0 and $9 2) Enable EasyAnalyticalRecords 4) Place an hold on the record 5) => You see the linked item 6) Disable EasyAnalyticalRecords 7) Place an hold on the record 8) => You dont see the linked item Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 7266d50dd2725c87acf889aa7d6a211999ca1c47 Author: Fridolin Somers Date: Wed Jan 16 13:32:35 2019 +0100 Bug 22140: Use of EasyAnalyticalRecords pref in search Like Bug 20702 defined GetHostItemsInfo does nothing if EasyAnalyticalRecords pref is disabled, there are other places where code must be dependant on this pref. Test plan : 1) Build an analitical record with 773$0 and $9 2) Enable EasyAnalyticalRecords 3) Don't apply patch 4) Go to OPAC 5) Perform a search that displays the record, check there is the linked item 6) Open record detail page, check there is the linked item 7) Apply patch and redo 5) and 6) 8) Disable EasyAnalyticalRecords 9) redo 5) and 6), you should not see the linked item Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 2c6d39452af2364463b509d7d18526714bc17b3f Author: Nick Clemens Date: Fri Feb 15 13:17:45 2019 +0000 Bug 13515: DBRev 18.12.00.014 Signed-off-by: Nick Clemens commit 1f23384475214cf291afe081aaa2ef6d18767ed8 Author: Jonathan Druart Date: Thu Feb 14 17:19:08 2019 -0300 Bug 13515: Fix constraint name before deleting it Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 11b9bb3da9b250ca6fa23792775685037330599e Author: Alex Arnaud Date: Wed Dec 26 17:44:39 2018 +0100 Bug 13515: Add unit tests Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 0daa02a961be828d5c38b6933c91ee79853f95c5 Author: Jonathan Druart Date: Tue Dec 18 12:43:00 2018 -0300 Bug 13515: Add a foreign key constraint to messages.borrowernumber This patch adds a missing foreign key constraint to mesages.borrowernumber. To create it sucessfully the entries from the messages table that are not linked with an existing patron will be removed. Test plan: 0/ Do not apply the patch 1/ Add messages to different patrons 2/ Delete one of the patron's record 3/ Have a look at the messages table and notice that the messages for the deleted patron's record still appear 4/ Apply the patch and execute the update DB entry 5/ Have a look again at the messages table and notice that the messages for the deleted patron's record have been removed 6/ Delete a patron that have messages 7/ Notice that now the messages are deleted when the patron's record is deleted Signed-off-by: Nazl? ?etin Signed-off-by: Alex Arnaud Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit c2bec690b593511df82f3fd70537174afe8fa5f6 Author: Jonathan Druart Date: Thu Feb 14 15:00:30 2019 -0300 Bug 22301: (bug 11373 follow-up) Do not format amounts in inputs on_edition flag must be set when the Price plugin is used on inputs. Prices currently need to all be displayed with decimal dot in input fields. Test plan: Trying to pay 9,55. Go into the input field and change 9 to 5. Without this patch Koha will turn it into 555.00. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 10 +- C4/SIP/ILS/Transaction/Checkout.pm | 10 - C4/Search.pm | 45 +-- Koha.pm | 2 +- Koha/Patron.pm | 1 + Koha/Schema/Result/Borrower.pm | 19 +- Koha/Schema/Result/Message.pm | 22 +- Makefile.PL | 1 - api/v1/swagger/paths/cities.json | 10 + .../data/mysql/en/optional/patron_atributes.txt | 2 +- installer/data/mysql/kohastructure.sql | 11 +- .../mysql/nb-NO/2-Valgfritt/patron_attributes.txt | 2 +- .../data/mysql/uk-UA/optional/patron_atributes.sql | 2 +- installer/data/mysql/updatedatabase.pl | 18 + koha-tmpl/intranet-tmpl/prog/css/reports.css | 16 +- .../intranet-tmpl/prog/en/includes/tools-menu.inc | 18 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/members/paycollect.tt | 8 +- .../prog/en/modules/reports/acquisitions_stats.tt | 2 +- .../prog/en/modules/tools/tools-home.tt | 29 +- .../opac-tmpl/bootstrap/css/jquery.rating.css | 14 - koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 86 +++++ .../bootstrap/en/includes/item-status.inc | 10 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 105 +++--- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 35 +- .../bootstrap/images}/spinner-small.gif | Bin 1849 -> 1849 bytes .../bootstrap/lib/jquery/plugins/jquery.rating.js | 392 -------------------- .../lib/jquery/plugins/jquery.barrating.min.js | 2 + misc/import_patrons.pl | 6 +- misc/migration_tools/bulkmarcimport.pl | 9 +- opac/opac-detail.pl | 31 +- t/db_dependent/Items.t | 55 ++- t/db_dependent/Patron/Messages.t | 50 +++ t/db_dependent/SIP/Transaction.t | 68 +++- t/db_dependent/api/v1/cities.t | 5 +- 38 files changed, 516 insertions(+), 592 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/jquery.rating.css copy koha-tmpl/{intranet-tmpl/prog/img => opac-tmpl/bootstrap/images}/spinner-small.gif (100%) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.rating.js create mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/jquery.barrating.min.js create mode 100644 t/db_dependent/Patron/Messages.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 19 15:10:11 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Feb 2019 14:10:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.11.00-495-g9ce71f3 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 9ce71f34ee1e106a3d1b36533e9a86b1d2c7ad01 (commit) via 1513c97b59a9faafeca2c5147b5cc65c4d2fd37c (commit) via 5b0eb51c8066abbd645731593572277ca5b46715 (commit) via 719153455c8c58fb8b1a8e9123acef5052dbd462 (commit) via e55d16f0da01dc474dc2f4541926c1daf609aff0 (commit) via d220725694302f187b3ff92c0eedda583919b735 (commit) via 209570f89d050f22fa90eed6a8a70ad9eb56e8a2 (commit) via 83dc5896e5afe0509d2732bba08f8e3f9d69f69d (commit) via 1ce4730d374c57e5e6f9abffe1bff112a8485cc5 (commit) via 89c9df6ad5869b709e45947f29ff4588d893f05c (commit) via 408062a2bd0158d99690222c3be9963599858042 (commit) via 5fbe1d71050cec607056b6c1916f65b837937c56 (commit) via fc9b78277aacd20ce7a4f305ab0faeed8139c633 (commit) via 4b8dfad8a6a7667a06658461ce8764eff56ef838 (commit) via b04a3e4b5df97018436c72b68fe50014f6fcee5a (commit) via 473a2d90d6eb1b814e66de0fc3a59882fed04c83 (commit) via e7a1a3444b2d9a1c616766aeb38f34009f2e9527 (commit) via acb455f151ac737613857c58e64a600d760a59e0 (commit) via 5ea9fb91632d712a6f70f4a3382ba96b4db74f69 (commit) via 940c5c0add3065d35f776a3a19ba87d936e84a0f (commit) via 02aa348f653a46cae671f5949a27a205bd5cb4fa (commit) via 562eaa154b9efa20431133db04823c4d36be742d (commit) via 0718416ff1ca70a25bc12fa3b677fdeafd7854c8 (commit) via 311f5f38c328267244481c8e5419be01e7d0aa12 (commit) via 145f578d267427fd7b0936918d988be1febe658c (commit) via 99ad829f991a30cd044995f3e93d52fc9b87dc1d (commit) via 96456cadc28e7e4b442da76adb2c9b1ece5a68f1 (commit) via 47839084fb788d2d5339842dfb5c6029984f2928 (commit) via fd9ff6a4f012399fc8408aa25ab1185d8308ea45 (commit) via 8a2d5fab95ae2db5adf8cca16524b7a231680dd3 (commit) via 112286ead4b3b2ba3f49b50b8ef4270d9dd7824c (commit) via d000b4202fc7d8d1e80467c8c9890bd71d96cef0 (commit) via a27a6e6d729cd3b6be0251c1c6bda5a763fea6bc (commit) via 83fe95d0c5d404a2ffc6ed35e822ff0f5ee8b6e6 (commit) via fcc17549bee1d1f9d85815a5bab24ba4ffaac7b3 (commit) via b225ffc559d22e7a373b92bf25a3a4162dc21be2 (commit) from ae85590a323c468e1ffbe566fe1f916a2901b56b (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 9ce71f34ee1e106a3d1b36533e9a86b1d2c7ad01 Author: Martin Renvoize Date: Mon Feb 11 17:45:51 2019 +0000 Bug 19164: (QA follow-up) Minor whitespace cleanup Signed-off-by: Nick Clemens commit 1513c97b59a9faafeca2c5147b5cc65c4d2fd37c Author: Jon Knight Date: Mon Feb 11 15:50:30 2019 +0000 Bug 19164: Add MARC modification template support to misc/stage-file.pl. https://bugs.koha-community.org/show_bug.cgi?id=19164 Bug 19164 - Allow MARC modification templates to be used in staged MARC imports Patch checks for duplicate MARC modificiation templates and if only one is found that matches the name given on the command line, submits the batch staging of the input files using that template. Test plan: 1) In the staff web client got to "Home ? Tools ? MARC modification templates" and create a MARC Modification Template called "Test Bug 19164". Set the action to be "Copy field 999$l to 998$l using RegEx s/NASH/FLASH/ if 999$l matches NASH" 2) Download the test MARC record from this bug into a file called marc1.mrc into your koha dev user's home directory. 3) Run misc/stage_file.pl with the command line: misc/stage_file.pl --file ~/marc1.mrc --add-items --marcmodtemplate "Test Bug 19164" --item-action replace --comment "testing MARC mod templates on batch staging" 4) In the staff client, go to Home ? Tools ? Manage staged MARC records and check that the file is visible and in status "Staged" 5) Click on the filename to bring up details of the staged batch, and then click on "Basic Christianity. Stott, John R. W. (0802811892)". Note that there is a 998$l field with the value "FLASH" that has been created using the MARC Modification Template. Signed-off-by: Mackey Johnstone Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 5b0eb51c8066abbd645731593572277ca5b46715 Author: Mark Tompsett Date: Sat Feb 18 19:50:32 2017 -0500 Bug 18143: Silence ods MARC framework export flood Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit 719153455c8c58fb8b1a8e9123acef5052dbd462 Author: Mark Tompsett Date: Sat Feb 18 19:21:59 2017 -0500 Bug 18143: Silence XML MARC Framework export flood TEST PLAN --------- 1) Log in to staff client 2) Click Koha administration 3) Click MARC bibliographic framework 4) export default as xml 5) Read the error log -- it's floody and export is default framework 6) export another framework as xml 7) Read the error log -- it's floody and export is the correct framework 8) apply the patch 9) repeat steps 4-7 -- expected frameworks exported, and no flooding. 10) run koha qa test tools Signed-off-by: Pierre-Marc Thibault Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens commit e55d16f0da01dc474dc2f4541926c1daf609aff0 Author: Owen Leonard Date: Thu Nov 29 17:53:37 2018 +0000 Bug 20102: Remove attribute "text/css" for