From gitmaster at git.koha-community.org Thu Sep 1 20:34:37 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 01 Sep 2016 18:34:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-562-g49df1cc 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 49df1cc10f45c1e7d9b15808a302df2a67dbb876 (commit) via 49af4e0ddf7ffa666ee055b80c7c4a66a995629d (commit) from 53631f9ffdc86c1afbcc3108ac3ddf1f73fef40e (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 49df1cc10f45c1e7d9b15808a302df2a67dbb876 Author: Kyle M Hall Date: Tue Jul 26 15:00:58 2016 +0000 Bug 16942 [QA Followup] - Add unit test Signed-off-by: Katrin Fischer Signed-off-by: Jesse Maseto Signed-off-by: Kyle M Hall commit 49af4e0ddf7ffa666ee055b80c7c4a66a995629d Author: Kyle M Hall Date: Tue Jul 19 16:57:25 2016 +0000 Bug 16942 - Confirm hold results in ugly error Confirming a hold to set it to waiting will result in an DBIC error in master. Test Plan: 1) Attempt to check in an item on hold and confirm the hold 2) Note the error 3) Apply this patch 4) Repeat step 1 5) Note there is no error! Signed-off-by: Mirko Tietgen https://bugs.koha-community.org/show_bug.cgi?id=14942 Signed-off-by: Katrin Fischer Signed-off-by: Jesse Maseto Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 10 +++++++++- C4/Reserves.pm | 2 +- t/db_dependent/Letters/TemplateToolkit.t | 19 ++++++++++++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 15:25:59 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 13:25:59 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-569-g0646478 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 0646478be01a63fa0b6dc666f23a915ceefd5619 (commit) via f2da856d754119ee40014f4b83c046e5dc4ce5a0 (commit) via 1fc17eacc5418a3dcde25aa45d82adb825034fad (commit) via 985265c0be182342374f50d95493ec3d50bdd5e0 (commit) via 00a50a9400fd606fdaed59574d0ae5bdf8fe3f2a (commit) via cac40ca7027f9701d4f820481c3b1a577ca3eb61 (commit) via ac1286dacdf92239ee91bf7932356adca7c486d2 (commit) from 49df1cc10f45c1e7d9b15808a302df2a67dbb876 (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 0646478be01a63fa0b6dc666f23a915ceefd5619 Author: Kyle M Hall Date: Fri Sep 2 12:25:59 2016 +0000 Bug 14868 - Update swagger.min.json Signed-off-by: Kyle M Hall commit f2da856d754119ee40014f4b83c046e5dc4ce5a0 Author: Tomas Cohen Arazi Date: Wed Aug 31 20:21:12 2016 -0300 Bug 14868: (QA followup) POD fixes To make the QA scripts happy, the POD needed a fix, and also keys applied to a hashref needs to be avoided. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Kyle M Hall commit 1fc17eacc5418a3dcde25aa45d82adb825034fad Author: Tomas Cohen Arazi Date: Wed Aug 31 20:11:05 2016 -0300 Bug 14868: (QA followup) Change permission check order This patch changes the permission check order because haspermission is the smaller check, and going through the patron/user and its guaranteed before checking if it is (say) a staff member or even a superlibrarian doesn't seem right. Bonus: Remove unneeded C4::Auth import in Patron.pm Signed-off-by: Tomas Cohen Arazi Signed-off-by: Benjamin Rokseth Signed-off-by: Kyle M Hall commit 985265c0be182342374f50d95493ec3d50bdd5e0 Author: Lari Taskula Date: Tue Aug 23 15:38:44 2016 +0300 Bug 14868: Display required permissions in permission error response When user does not have required permissions to use API operation, it would be useful to let them know which permissions he is missing. Since they are now defined in Swagger, we can easily render them into the response. To test: 1. Use a patron without any permissions 2. Make GET request to http://yourlib/api/v1/patrons 3. Observe permission error and see that required_permissions are displayed. 4. Run t/db_dependent/api/v1/patrons.t Signed-off-by: Benjamin Rokseth Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 00a50a9400fd606fdaed59574d0ae5bdf8fe3f2a Author: Lari Taskula Date: Thu Aug 11 14:45:16 2016 +0300 Bug 14868: Use x-koha-authorization in current routes To test: 1. Run t/db_dependent/api/v1/holds.t 2. Run t/db_dependent/api/v1/patrons.t Signed-off-by: Benjamin Rokseth Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit cac40ca7027f9701d4f820481c3b1a577ca3eb61 Author: Lari Taskula Date: Fri Jun 17 11:43:52 2016 +0300 Bug 14868: Give users possibility to request their own object Allow access to user's own objects even if they do not have required permissions. This will be very useful in many cases where an user wants to request their own object, for example renewing their checkouts or placing a hold for themselves. First, this patch renames "x-koha-permission" to "x-koha-authorization" in order to describe the new functionality better. Second, we can now add two extra parameters under "x-koha-authorization": - "allow-owner"; Allows the owner of object to access it (without permission) - "allow-guarantor"; Allows guarantor of the owner of object to access it (without permission) Third, since permission checking is outside of actual controller, we need a way to find out ownership from different types of parameters, e.g. checkout_id from /checkouts/{checkout_id}, borrowernumber from /patrons/{borrowernumber} etc. A solution is to match the parameter with a subroutine that is designed to verify the ownership for that object. See the new subroutines in Koha::REST::V1. To use this functionality you will simply define it in Swagger: "/patrons/{borrowernumber}": { "get": { ..., "x-koha-authorization": { "allow-owner": true, "permissions": { "borrowers": "1" } } } } If a parameter that is not yet defined in Koha::REST::V1::check_object_ownership, you also need to define it and implement a subroutine that determines ownership. Tests are provided in a following patch that adds this functionality for current API operations. Signed-off-by: Benjamin Rokseth Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit ac1286dacdf92239ee91bf7932356adca7c486d2 Author: Olli-Antti Kivilahti Date: Mon Sep 14 15:20:20 2015 +0300 Bug 14868: Swagger2-driven Permission checking Define 'x-koha-permission' for the Swagger2 Operation Object, to automatically authorize against the required permissions. This way we immediately tell the API consumer in the Swagger2-definition, which permissions are needed to access defined resources. Also we don't need to maintain permissions in multiple locations and we can build a smart testing framework to help a lot in creating tests for the new REST API. Signed-off-by: Benjamin Rokseth Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha/REST/V1.pm | 238 ++++++++++++++++++++++++++++--- Koha/REST/V1/Patron.pm | 11 -- api/v1/swagger/paths/holds.json | 25 ++++ api/v1/swagger/paths/patrons.json | 12 ++ api/v1/swagger/swagger.json | 1 + api/v1/swagger/swagger.min.json | 2 +- t/db_dependent/api/v1/holds.t | 280 +++++++++++++++++++++++++++++-------- t/db_dependent/api/v1/patrons.t | 58 +++++++- 8 files changed, 527 insertions(+), 100 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:46:43 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:46:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-570-g6f5e2f8 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 6f5e2f8a865ebe07d4745171dda86c2cbb0e6fe1 (commit) from 0646478be01a63fa0b6dc666f23a915ceefd5619 (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 6f5e2f8a865ebe07d4745171dda86c2cbb0e6fe1 Author: Jonathan Druart Date: Fri Aug 12 11:36:06 2016 +0100 Bug 17116: Fix CSRF in import_borrowers.pl If an attacker can get an authenticated Koha user to visit their page with the url below, they can change patrons' information The exploit can be simulated triggering /tools/import_borrowers.pl?uploadborrowers=42 In that case it won't do anything wrong, but it you POST a valid file, it could. Test plan: Trigger the url above => Without this patch, you will the result page => With this patch, you will get the "Wrong CSRF token" error. Regression test: Import a valid file from the import patron form, everything should go fine. Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/import_borrowers.tt | 5 ++++- tools/import_borrowers.pl | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:49:16 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:49:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-571-gbff08b9 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 bff08b9962318f6eca873693936e369456f428e5 (commit) from 6f5e2f8a865ebe07d4745171dda86c2cbb0e6fe1 (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 bff08b9962318f6eca873693936e369456f428e5 Author: Jonathan Druart Date: Fri Aug 19 14:36:23 2016 +0100 Bug 17048: Fix pagination offset for authority searches At the intranet, the pagination has been broken by bug 12478 (Elastic Search). There was a confusion between the offset and the page number. At the OPAC, it is broken since bug 2735 which has mimicked the intranet script. Test plan: Search for a term which will return more than 1 page of results. Click on the second page => Without this patch, the first result of the second page is the second result of the first page => With this patch applied, the offset will be corrected Signed-off-by: Aleisha Amohia Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: authorities/authorities-home.pl | 4 ++-- opac/opac-authorities-home.pl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:50:57 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:50:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-573-g30a0df4 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 30a0df493dc35e3aa9186f3b3c4c212d3b396a65 (commit) via 596ddef3c33f675f9daad675512fb119f80a23fa (commit) from bff08b9962318f6eca873693936e369456f428e5 (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 30a0df493dc35e3aa9186f3b3c4c212d3b396a65 Author: Kyle M Hall Date: Fri Jun 24 15:18:04 2016 +0000 Bug 11144 [QA Followup] - Let each script run in sequence even if one fails Signed-off-by: Marcel de Rooy Tested the A;B;C variant here. If A fails, B will run. Since we can safely assume that A (or B) will not fail on a daily basis, this seems to be better than running them in the wrong order every day. As the comments on Bugzilla show, several people support this improved (reordered) scheme and look forward to improved error handling on another report (obviously not that simple). Signed-off-by: Kyle M Hall commit 596ddef3c33f675f9daad675512fb119f80a23fa Author: Katrin Fischer Date: Tue Jun 9 23:13:15 2015 +0200 Bug 11144: Fix sequence of cronjobs: automatic renewal - fines - overdue notices The patch changes the sequence of cronjobs in the crontab example file and in the cron.daily file of the packages. This is why: 1) Renew automatically ... only when we can't renew, we want to 2) Calculate fines ... once the fine are calculated and charged we can print the amount into the 3) Overdue notices Before the change it could happen that you'd charge for an item, that would then be renewed. Or that you'd try to print fine amounts into the overdue notices, when they would only be charged moments later. To test: - configure your system so you have items that should - be charged with fines - renew automatically - configure your crontabs according to the example file or switch the cron.daily in your package installation with the new one - configure your overdue notices so that one should be generated <> - Wait for the cronjobs or schedule them to run earlier - Verify all is well and as it should be Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: debian/koha-common.cron.daily | 4 ++-- misc/cronjobs/crontab.example | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:53:30 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:53:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-574-gb239aa9 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 b239aa988a1e5475236257d9af67417372d45923 (commit) from 30a0df493dc35e3aa9186f3b3c4c212d3b396a65 (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 b239aa988a1e5475236257d9af67417372d45923 Author: Chris Cormack Date: Wed Aug 24 12:53:23 2016 +1200 Bug 17177 - about.pl references a module that doesn't exist To test 1/ Go to the about page, notice error 2/ Apply patch 3/ Notice error gone Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: about.pl | 1 - 1 file changed, 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:54:42 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:54:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-575-geee1f59 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 eee1f59db3488508768df5c553d3b444588fb1b7 (commit) from b239aa988a1e5475236257d9af67417372d45923 (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 eee1f59db3488508768df5c553d3b444588fb1b7 Author: Kyle M Hall Date: Fri Sep 2 13:54:47 2016 +0000 Revert Bug 17177 - This bug was for 3.20.x only This reverts commit b239aa988a1e5475236257d9af67417372d45923. ----------------------------------------------------------------------- Summary of changes: about.pl | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:55:30 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:55:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-579-ge31de61 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 e31de618ddfb6f627d93a6bd5cffcdce570dfc4d (commit) via 58b62864766c1e1edf9a5787ebe161a38916ea95 (commit) via e023f838683f32f93516b33ce36780bd2669de12 (commit) via 4ecb11eaa1e69a461f34ecd4875071d2c7c69e3f (commit) from eee1f59db3488508768df5c553d3b444588fb1b7 (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 e31de618ddfb6f627d93a6bd5cffcdce570dfc4d Author: Jonathan Druart Date: Thu Jul 7 18:07:32 2016 +0100 Bug 16686: Add test for Koha::Item::Transfer[s] and Koha::Item->get_transfer Signed-off-by: Marc Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit 58b62864766c1e1edf9a5787ebe161a38916ea95 Author: Jonathan Druart Date: Thu Jul 7 18:06:57 2016 +0100 Bug 16686: Add Koha::Object based class for Koha::Item::Transfer[s] Signed-off-by: Marc Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit e023f838683f32f93516b33ce36780bd2669de12 Author: Jonathan Druart Date: Thu Jul 7 18:04:27 2016 +0100 Bug 16686: Rename the transfer method to get_transfer Signed-off-by: Marc Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit 4ecb11eaa1e69a461f34ecd4875071d2c7c69e3f Author: Jonathan Druart Date: Sun Jul 3 15:32:47 2016 +0100 Bug 16686: Fix "Item in transit from since" in Holds tab POC, tests needed. Alternative patch works for me. Signed-off-by: Marc V?ron Signed-off-by: Marc Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha/Item.pm | 16 ++++ Koha/{City.pm => Item/Transfer.pm} | 6 +- Koha/{SearchFields.pm => Item/Transfers.pm} | 10 +-- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 5 +- t/db_dependent/Koha/Item/Transfers.t | 69 ++++++++++++++++ t/db_dependent/Koha/Items.t | 82 ++++++++++++++++++++ 6 files changed, 178 insertions(+), 10 deletions(-) copy Koha/{City.pm => Item/Transfer.pm} (88%) copy Koha/{SearchFields.pm => Item/Transfers.pm} (84%) create mode 100644 t/db_dependent/Koha/Item/Transfers.t create mode 100644 t/db_dependent/Koha/Items.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:56:21 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:56:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-580-ga308215 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 a3082158e46cf643c99721052268e762e7050868 (commit) from e31de618ddfb6f627d93a6bd5cffcdce570dfc4d (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 a3082158e46cf643c99721052268e762e7050868 Author: Jonathan Druart Date: Thu May 5 15:25:50 2016 +0100 Bug 16449: Remove "no method selected" warning from unimarc_field_4XX Because of bug 14828, the unimarc_field_4XX now raises a warning: "No method selected!" There are no need to select an item type on this page, the default (all) is always selected. Test plan: Link the unimarc_field_4XX value builder with on of the subfield Edit a record, click on the value builder icon Note the warning without the patch and that it's gone with the patch applied NOTE: Code fix that I derived was identical. Ran prove t/db_dependent/FrameworkPlugin.t to confirm it works. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt | 4 ---- 1 file changed, 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:57:29 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:57:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-582-g1133d31 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 1133d318c422d7fdfa4b1b093988e373ebb71222 (commit) via 2be60d395fe2062b503c0ae0cf96f7b0428881b7 (commit) from a3082158e46cf643c99721052268e762e7050868 (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 1133d318c422d7fdfa4b1b093988e373ebb71222 Author: Mirko Tietgen Date: Tue Aug 30 20:20:17 2016 +0200 Bug 17223 Follow-up: updated control file This is the control file change for the master branch triggered by the first patch. Signed-off-by: Kyle M Hall commit 2be60d395fe2062b503c0ae0cf96f7b0428881b7 Author: Marcel de Rooy Date: Tue Aug 30 15:52:16 2016 +0200 Bug 17223: Add Cache::Memcached to PerlDependencies Test plan: Check about page, perl modules. Signed-off-by: Mirko Tietgen Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 5 +++++ debian/control | 2 ++ 2 files changed, 7 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 16:59:36 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 14:59:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-584-gff51ec0 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 ff51ec00833dcd26af762d872075ab927921fe21 (commit) via b043eac50c024e9e2f5a79f6a0dc92d78a82efc8 (commit) from 1133d318c422d7fdfa4b1b093988e373ebb71222 (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 ff51ec00833dcd26af762d872075ab927921fe21 Author: Jonathan Druart Date: Fri Aug 26 12:33:32 2016 +0000 Bug 17201: (bug 16431 follow-up2) Remove occurrence of marcfromkohafield I really don't know how these tests passed before 16431, the mapping was not complete. Test plan: prove t/db_dependent/Search.t should return green Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit b043eac50c024e9e2f5a79f6a0dc92d78a82efc8 Author: Jonathan Druart Date: Fri Aug 26 13:32:00 2016 +0100 Bug 17201: (bug 16431 follow-up) Remove occurrence of marcfromkohafield I am not sure this code is called so I don't know how to test it. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha/MetadataRecord.pm | 10 +++-- t/db_dependent/Search.t | 111 +++++++++++++++++++---------------------------- 2 files changed, 50 insertions(+), 71 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:01:23 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:01:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-585-g58661d9 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 58661d9b4be3398c24bbac8147a2d0b3f1f95d45 (commit) from ff51ec00833dcd26af762d872075ab927921fe21 (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 58661d9b4be3398c24bbac8147a2d0b3f1f95d45 Author: Jonathan Druart Date: Fri Aug 19 16:09:55 2016 +0100 Bug 17118: (follow-up 15381) Fix regression when clearing a linked authority Changes made on bug 15381 assumed that the authid was always set. But if the user wants to clear the field of the authority, the script is called with authid=0 (FIXME...) To fix this issue, it's better to move the new calls to Koha::Authorities->find($authid)->authtypecode and Koha::Authority::Types->find($authtypecode); at the correct place Test plan: 1. Edit a record which has a field linked to an authority record (100a for instance). 2. Click the link which triggers the tag editor. A pop-up window should be displayed. 3. In the pop-up window, click the "Clear field" button. => Without this patch A second pop-up window opens and displays an error: Can't call method "authtypecode" on an undefined value at /authorities/blinddetail-biblio-search.pl line 61. => With this patch applied the field is correctly cleared. Signed-off-by: Aleisha Amohia Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: authorities/blinddetail-biblio-search.pl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:03:12 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:03:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-586-ga2a56ca 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 a2a56ca441f33fb3772b89b85b0b40873b60e4e6 (commit) from 58661d9b4be3398c24bbac8147a2d0b3f1f95d45 (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 a2a56ca441f33fb3772b89b85b0b40873b60e4e6 Author: Owen Leonard Date: Tue Jul 12 09:24:59 2016 -0400 Bug 16903 - Multiple class attributes on catalog search tab cat-search.inc contains an element with two class attributes, which is invalid. This patch corrects it. To test, apply the patch and view any page which uses the cat-search include file to display the header search boxes. For instance, the bibliographic detail page. In the header, the "Search the catalog" box should be selected, and any text you type in the box should be carried over when you switch to different search tabs. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:04:53 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:04:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-588-gbfc72c9 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 bfc72c91849b75a7ab4349f5d6a6798f3c6d0814 (commit) via 1fe9c40da4e71bde460133ee6248503ce1025999 (commit) from a2a56ca441f33fb3772b89b85b0b40873b60e4e6 (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 bfc72c91849b75a7ab4349f5d6a6798f3c6d0814 Author: Jonathan Druart Date: Mon Aug 22 13:48:59 2016 +0100 Bug 17157: Same for "More" Here I decided to redirect to the mainpage. Works as dexcribed. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 1fe9c40da4e71bde460133ee6248503ce1025999 Author: Jonathan Druart Date: Mon Aug 22 13:36:39 2016 +0100 Bug 17157: Fix middle click on "Search" drowndown menu If you save an item and right click on "Search" or "More" you will get a software error: Can't call method "fields" on an undefined value at /usr/share/koha/intranet/cgi-bin/cataloguing/additem.pl line 742 You will now be redirected to the adv search form. Wors as described. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:10:13 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:10:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-589-g8850540 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 8850540deafc471b9b356e35ae67780a51829271 (commit) from bfc72c91849b75a7ab4349f5d6a6798f3c6d0814 (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 8850540deafc471b9b356e35ae67780a51829271 Author: Owen Leonard Date: Fri Aug 19 10:08:38 2016 -0400 Bug 13921 - XSLT Literary Formats Not Showing This patch adds some missing literary formats to the staff client and OPAC's search results XSLT display. To test you must have DisplayOPACiconsXSLT and DisplayIconsXSLT system preferences enabled. XSLTResultsDisplay and OPACXSLTResultsDisplay should be set to 'default.' Perform searches in the staff client and the OPAC and confirm that the following literary forms (defined in 008 position 33) display correctly: Not fiction; Fiction; Dramas; Essays; Novels; Humor, satires, etc.; Letters; Short stories; Mixed forms; Poetry; Speeches. Signed-off-by: Aleisha Amohia Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/xslt/MARC21slim2intranetResults.xsl | 34 ++++++++++---------- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 34 ++++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:19:11 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:19:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-590-ga5b0aa2 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 a5b0aa20e553d7444778b2ca3d90c6e067d6fce1 (commit) from 8850540deafc471b9b356e35ae67780a51829271 (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 a5b0aa20e553d7444778b2ca3d90c6e067d6fce1 Author: Owen Leonard Date: Thu Aug 18 11:58:42 2016 -0400 Bug 11019 - Require some fields when adding authorized value category This patch modifies the form for adding an authorized value so that the category is a required fields. Previously a new authorized value category could be saved with no data. To test, apply the patch and go to Administration -> Authorized values. - Click the "New category" button. - Click the save button without filling in the category. You should be prevented from submitting the form. - Verify that filling in the required field allows the form to be submitted. - Perform the same test when editing an existing authorized value. Signed-off-by: Aleisha Amohia Signed-off-by: Jonathan Druart Follow-up for QA: Allow a blank authorised value to be created. Signed-off-by: Katrin Fischer Amended test plan. Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:19:33 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:19:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-591-gf17b491 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 f17b491f357267aa037480593158b13c426051ab (commit) from a5b0aa20e553d7444778b2ca3d90c6e067d6fce1 (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 f17b491f357267aa037480593158b13c426051ab Author: Owen Leonard Date: Thu Aug 25 14:06:11 2016 -0400 Bug 17200 - Badly formatted "hold for" patron name on catalog detail page This patch adds a space between first name and surname on the bibliographic detail page when there is "hold for" information in the status column of the holdings table. To test, apply the patch locate a title in the staff client catalog which has one or more confirmed holds on it. Verify that the patron's name in the "status" column of the holdings table looks correct, with a space between first and last name. Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:20:27 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:20:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-592-g1c87129 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 1c87129971ddcd4289c42083a6005638b0d5370d (commit) from f17b491f357267aa037480593158b13c426051ab (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 1c87129971ddcd4289c42083a6005638b0d5370d Author: Jacek Ablewicz Date: Wed Aug 17 18:42:37 2016 +0200 Bug 17142 - Don't show library group selection in advanced search if groups are not defined Even if library groups/search domains are not defined in the system, (empty) select for "Groups of libraries" under "Location and availability" section in OPAC advanced search is still visible; it shouldn't. Side effect of Bug 15295 - 'searchdomainloop' variable in the template is now an object, it needs a different kind of statement (.count) for checking if it's empty or not. To test: 1) apply patch 2) when there are no groups of libraries defined in Administration -> Libraries and Groups, "Groups of libraries" selection should be no longer visible in OPAC adavanced search page 3) add library group or two: "Groups of libraries" selection should reappear. Signed-off-by: Aleisha Amohia Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:20:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:20:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-594-g547b5f9 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 547b5f95f62a00e360c5cac4e416d30365429fcb (commit) via 50abf24ff04aae0c9010411fa6e98561c2ccc66f (commit) from 1c87129971ddcd4289c42083a6005638b0d5370d (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 547b5f95f62a00e360c5cac4e416d30365429fcb Author: Jonathan Druart Date: Tue Aug 16 09:18:19 2016 +0100 Bug 7045: Update default value placeholders for existing installs Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 50abf24ff04aae0c9010411fa6e98561c2ccc66f Author: Jonathan Druart Date: Tue Aug 16 09:09:53 2016 +0100 Bug 7045: Use <> for default value placeholders When adding a biblio, the default value of a MARC subfield defined in the frameworks can be used as placeholders to set the current date or the surname of the logged in user (use cases?). The different placeholders are 'YYYY', 'MM', 'DD', 'user'. When adding an item, same behavior except that 'user' is not replaced. This patch makes behaviors consistent between the 2 editors and surrounds placeholders with << >> We will now have: <>, <>, <
> and <> Test plan: Define default values for biblio and item subfields. Create a bibliographic record and attach it an item. The default values should be used and replaced if you used placeholders. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: cataloguing/addbiblio.pl | 21 ++++++++++++--------- cataloguing/additem.pl | 17 +++++++++++------ installer/data/mysql/atomicupdate/bug_7045.sql | 4 ++++ 3 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_7045.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:21:16 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:21:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-595-g762415a 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 762415a2ff18e5a1b783f8eff2275e7d47216343 (commit) from 547b5f95f62a00e360c5cac4e416d30365429fcb (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 762415a2ff18e5a1b783f8eff2275e7d47216343 Author: Jonathan Druart Date: Sat Jul 9 13:13:35 2016 +0100 Bug 16886: Make the 'Upload patron images' tool plack safe Some vars are accessed from subroutine, but defined with my. It causes at least the 2 followings errors: Variable "$filetype" is not available at /home/koha/src/tools/picture-upload.pl line 240. Variable "$uploadfilename" is not available at /home/koha/src/tools/picture-upload.pl line 241. To avoid that, they are now declared with our. Test plan: Upload image for a patron and confirm that you get a "Result" table and the errors do not longer appear in the logs. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: tools/picture-upload.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:22:41 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:22:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-596-g2cf1e97 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 2cf1e97e5cb6531f0d1d504dda35a836d86466c2 (commit) from 762415a2ff18e5a1b783f8eff2275e7d47216343 (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 2cf1e97e5cb6531f0d1d504dda35a836d86466c2 Author: Jonathan Druart Date: Mon Aug 15 15:45:38 2016 +0100 Bug 17128: Make summary-print.pl plack safe $borrowernumber is used in build_issue_data but not correctly defined (Variable "$borrowernumber" is not available) That may cause wrong charge displayed in the summary slip. Test plan: - Set rental charge for an item type - Define a rental discount for that item type in the circ rules - check in an item matching this rule Without this patch the charge displayed in the summary slip won't be calculated with the discount With this patch applied, the warning in the logs will no longer appear and the values will be correctly calculated. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: members/summary-print.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:43:28 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:43:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-597-g3f585d4 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 3f585d44e8f5f04b47a9f949dc6dcd8a1b3cbf7a (commit) from 2cf1e97e5cb6531f0d1d504dda35a836d86466c2 (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 3f585d44e8f5f04b47a9f949dc6dcd8a1b3cbf7a Author: Jonathan Druart Date: Fri Aug 19 12:43:24 2016 +0100 Bug 16990: Display branch names instead of code in patron mod requests To test: - change your homebranch in the OPAC, submit - change patron modification request in the staff client - Verify that it shows the old and new branch name instead of the code Signed-off-by: Aleisha Amohia Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 17:45:27 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 15:45:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-598-g77b03f1 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 77b03f1e8b2afe0e9063b06785a0eb468fb029ed (commit) from 3f585d44e8f5f04b47a9f949dc6dcd8a1b3cbf7a (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 77b03f1e8b2afe0e9063b06785a0eb468fb029ed Author: Holger Mei?ner Date: Thu Aug 11 11:22:00 2016 +0200 Bug 14434: Display "Not renewable (on hold)" in OPAC This patch makes the OPAC display "Not renewable (on hold)" when a hold is placed. Test plan: 1) Do not apply patch. 2) Issue an item with automatic renewal. 3) Issue an item with manual renewal. 4) Place a hold on both items. 5) Log in as patron and note that the column "Renew" says "Automatic renewal (x of y renewals remaining)" for the auto renewed item and "(On hold) for the other item. 6) Apply patch. 7) Refresh OPAC and note that now "Not renewable (on hold)" is displayed for both items. 8) Cancel the holds, then log in as patron again and confirm that the correct renewal conditions are displayed. Sponsored-by: Hochschule f?r Gesundheit (hsg), Germany Signed-off-by: Hector Castro Works as advertised Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:47:39 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:47:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-600-gd0d8bd1 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 d0d8bd18225483c3c28ba9e0bd368301c6835a66 (commit) via cb72420b4672ec41ebaeb9a51b6387e6f8bb5313 (commit) from 77b03f1e8b2afe0e9063b06785a0eb468fb029ed (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 d0d8bd18225483c3c28ba9e0bd368301c6835a66 Author: Magnus Enger Date: Wed Aug 31 10:47:43 2016 +0200 Bug 17228 - Make two versions of SIPconfig.xml identical Several bugs have made changes to etc/SIPconfig.xml but not updated debian/templates/SIPconfig.xml. This means that an admin using the Debian packages who enables SIP2 for a site and looks at /etc/koha/sites//SIPconfig.xml will not see an up-to-date version of that file, with the risk of missing possible config opportunities. Since debian/templates/SIPconfig.xml contains no placeholders or other magic stuff related to the Debian packaging, this patch simply copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml To test: diff etc/SIPconfig.xml debian/templates/SIPconfig.xml There should be no difference between the files Signed-off-by: Claire Gravely Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit cb72420b4672ec41ebaeb9a51b6387e6f8bb5313 Author: Magnus Enger Date: Wed Aug 31 10:45:32 2016 +0200 Bug 17228 - Fix whitespace in etc/SIPconfig.xml Remove trailing whitespace and replace tabs with 4 spaces. Signed-off-by: Claire Gravely Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: debian/templates/SIPconfig.xml | 49 +++++++++++++++++++++++++--------------- etc/SIPconfig.xml | 36 ++++++++++++++--------------- 2 files changed, 49 insertions(+), 36 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:48:37 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:48:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-601-gaf49b42 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 af49b42219c6c2fb2f2a52cfb229d37b20b79e84 (commit) from d0d8bd18225483c3c28ba9e0bd368301c6835a66 (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 af49b42219c6c2fb2f2a52cfb229d37b20b79e84 Author: Colin Campbell Date: Wed Aug 17 17:30:55 2016 +0100 Bug 17141: Call config method to retrieve logdir Incorrect method call is causing runtime error and not retrieving the correct logdir value Change retrieves the value correctly To test: 1) Run edi_cron.pl, notice error 2) Apply patch and run edi_cron.pl again, should work as expected Signed-off-by: Aleisha Amohia Signed-off-by: Jonathan Druart Note: I did not test but changes make sense. Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: misc/cronjobs/edi_cron.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:49:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:49:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-603-g931ed0e 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 931ed0ec9bbad4baa18547d361e2bed52140b637 (commit) via e67fc1806cbcb9fbe038b67ad0862f3f163a4313 (commit) from af49b42219c6c2fb2f2a52cfb229d37b20b79e84 (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 931ed0ec9bbad4baa18547d361e2bed52140b637 Author: Jonathan Druart Date: Tue Aug 23 14:17:53 2016 +0100 Bug 16464: Add FIXME Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit e67fc1806cbcb9fbe038b67ad0862f3f163a4313 Author: Owen Leonard Date: Tue Aug 9 09:49:33 2016 -0400 Bug 16464 - If a patron has been discharged, show a message in the OPAC This patch adds a message to the patron home page in the OPAC to be shown if the user is restricted because of a discharge. To test, apply the patch and log into the OPAC as a patron who has been discharged. - You should see a message which says so, including a link to the discharge notice. - Log in to the OPAC as a patron with a manual restriction and confirm that the correct notice is displayed. Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 14 ++++++++++---- opac/opac-discharge.pl | 2 ++ opac/opac-user.pl | 8 ++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:49:26 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:49:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-604-gead7b93 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 ead7b938d8da426798eb7337aa1b623fa545da5c (commit) from 931ed0ec9bbad4baa18547d361e2bed52140b637 (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 ead7b938d8da426798eb7337aa1b623fa545da5c Author: Owen Leonard Date: Thu Aug 18 13:08:33 2016 -0400 Bug 14612 - Overdue notice triggers should show branchname instead of branchcode This patch adds the Branches template plugin to the overdue notice triggers template so that the library name can be shown instead of the branchcode. Also changed: Updated page title to match the name used in tools menus. To test, apply the patch and go to Tools -> Overdue notice/status triggers. - Select a library. - When the page reloads, the 'Defining overdue actions for...' and 'Rules for overdue actions: ' headings should show the library name instead of the branchcode. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:49:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:49:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-606-g377feb9 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 377feb9cdf5b4d490dee7640b50c374e28f4550f (commit) via 28ad0ab51321955878082d363be2210589a8261f (commit) from ead7b938d8da426798eb7337aa1b623fa545da5c (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 377feb9cdf5b4d490dee7640b50c374e28f4550f Author: Marcel de Rooy Date: Wed Aug 17 15:14:12 2016 +0200 Bug 16809: Follow-up for scalarizing biblionumber Still resolves another multi_param warning. Test plan: Look at your logs before and after this patch when saving a biblio record (you may have to start plack again). If your biblionumber is mapped to 999c, you should no longer have a warn about line 2563 (disclaimer: line numbers are subject to change). Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 28ad0ab51321955878082d363be2210589a8261f Author: Mark Tompsett Date: Fri Jun 24 11:29:19 2016 -0400 Bug 16809: Silence authority warnings C4::Biblio::TransformHtmlToMarc Most of the floodiness is caused by accessing the cgi parameters in a context which is hard to determine. By purposefully saving the value to a scalar variable and using the variable, the issue disappears, and it will likely be a tiny tad faster as variable access is faster than multiple function calls. TEST PLAN --------- 1) Back up your intranet error log -- for example: cp ~/koha-dev/var/log/koha-error-log ~/koha-error-log.backup 2) Blank your intranet error log -- for example: echo > ~/koha-dev/var/log/koha-error-log 3) Log into your staff client 4) Click 'Authorities' 5) Click 'New from Z39.50' 5) Type 'Seuss' into 'Name (any):' and press enter 6) Click 'Import' beside the first link 7) Click 'Save' 8) Check your koha-error-log -- floody! 9) Apply patch 10) repeat steps 2-8 -- blank! 11) restore your intranet error log -- for example: mv ~/koha-error-log.backup ~/koha-dev/var/log/koha-error-log 12) run koha qa test tools Signed-off-by: Marcel de Rooy Tested with addbiblio.pl. I would have preferred the scalar option in terms of simpler code, but this works too. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:50:23 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:50:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-607-gadd9015 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 add90157eb859143dc782fded4b00a47a39d8abe (commit) from 377feb9cdf5b4d490dee7640b50c374e28f4550f (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 add90157eb859143dc782fded4b00a47a39d8abe Author: Andreas Roussos Date: Wed Aug 24 17:10:29 2016 +0300 Bug 17185: Staff client shows "Lists that include this title:" even if item is not in a list In the staff client, the text "Lists that include this title:" is always shown, regardless of whether the item is in a list or not. This patch fixes that. Test plan: 1) Log in to staff client. 2) Go to biblio details view: /cgi-bin/koha/catalogue/detail.pl?biblionumber=X Confirm that "Lists that include this title:" is shown even if the item is not in a list. 3) Apply the patch. 4) Repeat step 2. Confirm that the patch works, i.e. "Lists that include this title:" is only shown for biblios that are actually in a list. Signed-off-by: Marcel de Rooy Only applies to non-XSLT view. Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:53:45 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:53:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-608-gea13ea0 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 ea13ea00830a8061842fa13b6110e0a4e75aa444 (commit) from add90157eb859143dc782fded4b00a47a39d8abe (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 ea13ea00830a8061842fa13b6110e0a4e75aa444 Author: Aleisha Amohia Date: Wed Aug 24 00:16:43 2016 +0000 Bug 17175: Typo in patron card images error message To test: 1) Go to Tools -> Patron Card Creator -> New Image 2) Click Upload without attaching anything 3) Notice typo 4) Apply patch and refresh page (resend information if prompted) 5) Notice typo fixed Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:54:05 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:54:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-609-gbf053f3 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 bf053f3bfb82b2e70fe09a132add5283cbbd110e (commit) from ea13ea00830a8061842fa13b6110e0a4e75aa444 (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 bf053f3bfb82b2e70fe09a132add5283cbbd110e Author: Marc V?ron Date: Thu Aug 18 20:42:44 2016 +0200 Bug 17149 - EDI accounts: Add missing '>' to breadcrumb To verify: Breadcrumb on "EDI accounts" pages reads Home > Administration EDI accounts > Modify account instead of: Home > Administration > EDI accounts > Modify account To test: - Apply patch - Add, edit and delete an EDI account - Verify that breadcrumb displays properly Signed-off-by: Aleisha Amohia Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:54:57 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:54:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-610-g11315ef 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 11315ef090948b22d0cb424e4119011eff8f5036 (commit) from bf053f3bfb82b2e70fe09a132add5283cbbd110e (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 11315ef090948b22d0cb424e4119011eff8f5036 Author: Magnus Enger Date: Sat Jul 23 20:31:11 2016 +0200 Bug 5456 - Create a link to opac-ics.pl opac-ics.pl was added to Koha back in 2007, but there has not been a link to it from anywhere. This patch adds the link from the main view on /cgi-bin/koha/opac-user.pl, and makes some changes to opac-ics.pl itself. Changes to opac-ics.pl: - Update the code to use date and time for when a loan is due - Use dt_from_string to turn a MySQL time and date into a DateTime - Add a timestamp and a UID (these were reported as necessary by a couple of iCal validators) - Remove DTEND from events, since we now have time as well as date for when a loan is due - For loans that are overdue, set the DTSTART to now(), to avoid creating calendar events in the past - Use a template to generate text strings, to make them translatable To test: - Apply the patch - Make sure you have at least a couple of loans, including one overdue - Go to /cgi-bin/koha/opac-user.pl and click on the link labeled "Download as iCal/.ics file" - Inspect the file in a text editor and/or view the result in a calendar appplication. Make sure the data makes sense. - Sign off and go thee merrily on thine way. Update 2016-07-25 - Force date_due to UTC to avoid problematic timezone info like this: DTSTART:TZID=Europe/Zurich:20160724T235900 - Remove quotes from summary and description Followed test plan, koha.ics file successfully imported to Thunderbird calendar Signed-off-by: Marc Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/bootstrap/en/modules/opac-ics.tt | 8 +++ .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 1 + opac/opac-ics.pl | 66 +++++++++++--------- 3 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ics.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 18:59:39 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 16:59:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-615-gd0f850b 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 d0f850b51a28afa6ae5ca41a54f43feea972c8d3 (commit) via 8513c24c33876a5dfcecf5950dfd74fb0dd63b67 (commit) via 3badc57c9339e37e5d6ec660ff0b323614ab045d (commit) via 3e541866cdd00389dc3f28a401911ebd4f5699e9 (commit) via aa5bf4d3cc0e4d57b958e665ad1c6efa8a76a9fb (commit) from 11315ef090948b22d0cb424e4119011eff8f5036 (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 d0f850b51a28afa6ae5ca41a54f43feea972c8d3 Author: Marcel de Rooy Date: Tue Jul 12 14:40:35 2016 +0200 Bug 10407: [QA Follow-up] Hashref process_batch params As requested by Mark Tompsett. Hope this guarantees a signoff now.. Note: For consistency four additional parameters were needed to no longer use file level vars in this subroutine. Test plan: Import a file with stage_file.pl. Signed-off-by: Marcel de Rooy Imported a marc file and a marcxml file with stage_file.pl. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 8513c24c33876a5dfcecf5950dfd74fb0dd63b67 Author: Marcel de Rooy Date: Fri Jul 8 13:17:36 2016 +0200 Bug 10407: Add two subtests to t/ImportBatch.t Creates a few simple tests for the two new subroutines in ImportBatch.pm. Test plan: Run t/ImportBatch.t. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 3badc57c9339e37e5d6ec660ff0b323614ab045d Author: Marcel de Rooy Date: Thu Jul 7 14:13:16 2016 +0200 Bug 10407: Add marcxml import (follow-up) This patch makes the following changes: [1] Based on the groundwork of the former patch, add call to RecordsFromMARCXMLFile in stage-marc-import. Use format param. [2] Add format to the template. Use file extension to determine. If you use .xml or .marcxml as extension, MARCXML is selected. [3] In stage-marc-import.tt mark UTF-8 encoding as UTF-8 not as utf8. [4] BatchStageMarcRecords: do not call plugin if you have no records. [5] RecordsFromISO2709File: also return errors in an array. [6] In misc/stage_file.pl also use UTF-8. Handling of errors from [5]. Test plan: [1] Import an empty file as MARC or MARCXML (with Tools/Stage..import). [2] Import an non-empty file with invalid contents as MARC or MARCXML. [3] Export a few records with Tools/Export as MARC and MARCXML. [4] Import these two files. Check selected format versus file extension. [5] Import a MARCXML file with misc/stage_file.pl. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 3e541866cdd00389dc3f28a401911ebd4f5699e9 Author: Marcel de Rooy Date: Fri Jul 8 08:34:00 2016 +0200 Bug 10407: Resolve warnings from child process After the staging job finishes, the child tries to print results to STDOUT (which is closed). This creates warnings like: stage-marc-import.pl: binmode() on closed filehandle STDOUT at C4/Templates.pm line 120. stage-marc-import.pl: Filehandle STDOUT reopened as FH only for input at /usr/lib/perl5/Template/Provider.pm line 964. Resolving it is simple: the child should exit after marking the job as finished. Test plan: Import a marc file. Observe that you do no longer have such warnings. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit aa5bf4d3cc0e4d57b958e665ad1c6efa8a76a9fb Author: Olli-Antti Kivilahti Date: Fri Apr 17 20:12:49 2015 +0300 Bug 10407: Allow MARCXML records to be imported via GUI (groundwork) Patch from Olli, manual rebase by Marcel (July 7, 2016). Signed-off-by: Marcel de Rooy Needs follow-up. Test plan in the third patch. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 80 ++++++++++++++++--- .../prog/en/modules/tools/stage-marc-import.tt | 13 +++- misc/stage_file.pl | 81 ++++++++++++-------- t/ImportBatch.t | 80 ++++++++++++++++++- tools/stage-marc-import.pl | 30 ++++---- 5 files changed, 221 insertions(+), 63 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 19:00:15 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 17:00:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-618-g8d02469 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 8d02469abfc6160d473ff486b59ea5c7adb83990 (commit) via 219c0eac8cb89008219947a3ff0f78a1a3f5f407 (commit) via c1d75885a6df4cc1317d3c0d95b59478613f28a8 (commit) from d0f850b51a28afa6ae5ca41a54f43feea972c8d3 (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 8d02469abfc6160d473ff486b59ea5c7adb83990 Author: Jacek Ablewicz Date: Fri Aug 12 11:42:48 2016 +0200 Bug 10848 - [QA Followup] Add missing branch option and fix pattern for copyrightdate - HTML5 input pattern for copyrightdate was not taking into an account the database field type, which is smallint(5) - added title="..." for the year field so the acceptable date format should be displayed as a hint/tooltip in the browser - added an missing option for configuring branch/library as mandatory Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 219c0eac8cb89008219947a3ff0f78a1a3f5f407 Author: Jacek Ablewicz Date: Fri Aug 5 11:01:25 2016 +0200 Bug 10848 - Allow configuration of mandatory/required fields on the suggestion form in OPAC - part 2 Add 'OPACSuggestionMandatoryFields' syspref definition plus an atomic DB update for the new preference. Signed-off-by: barbara johnson Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit c1d75885a6df4cc1317d3c0d95b59478613f28a8 Author: Jacek Ablewicz Date: Fri Aug 5 10:47:11 2016 +0200 Bug 10848 - Allow configuration of mandatory/required fields on the suggestion form in OPAC This patch adds a configuration option which allows to define which fields should be mandatory for a patron purchase suggestion form in OPAC. Test plan: 1/ Apply patch. 2/ Play with the new OPACSuggestionMandatoryFields system preference (select some fields as manadatory, select all, deselect all, try to submit some suggestions with mandatory fields filled and/or not filled etc.) to ensure that required fields (and only required fields) are enforced in the browser to be filled. 3/ With all options deselected, 'Title' field should still be mandatory (by default). Signed-off-by: barbara johnson Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: ...8-add_OPACSuggestionMandatoryFields_syspref.sql | 1 + .../prog/en/modules/admin/preferences/opac.pref | 16 +++++++ .../bootstrap/en/modules/opac-suggestions.tt | 45 ++++++++++---------- opac/opac-suggestions.pl | 8 ++++ 4 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_10848-add_OPACSuggestionMandatoryFields_syspref.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 19:04:16 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 17:04:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-619-g33557a2 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 33557a28477258f489207ad8825e14d07d7e6b99 (commit) from 8d02469abfc6160d473ff486b59ea5c7adb83990 (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 33557a28477258f489207ad8825e14d07d7e6b99 Author: Kyle M Hall Date: Fri Sep 2 16:04:09 2016 +0000 Bug 7045 - DBRev 16.06.00.016 Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_7045.sql | 4 ---- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_7045.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 19:09:18 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 17:09:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-620-gaef7779 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 aef77798a98ed89ebf2200a23b7bfc17760d77e2 (commit) from 33557a28477258f489207ad8825e14d07d7e6b99 (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 aef77798a98ed89ebf2200a23b7bfc17760d77e2 Author: Kyle M Hall Date: Fri Sep 2 16:09:23 2016 +0000 Bug 7045 - DBRev 16.06.00.017 Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- .../bug_10848-add_OPACSuggestionMandatoryFields_syspref.sql | 1 - installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_10848-add_OPACSuggestionMandatoryFields_syspref.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 19:16:46 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 17:16:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-622-gb26abb0 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 b26abb0d526c68c9f94d9b919b80935f9ce0046d (commit) via 872892b03cbc4de4e2be1c33e2e07b0bf72883a3 (commit) from aef77798a98ed89ebf2200a23b7bfc17760d77e2 (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 b26abb0d526c68c9f94d9b919b80935f9ce0046d Author: Kyle M Hall Date: Wed Jul 20 15:58:20 2016 +0000 Bug 11360 [QA Followup] - Fix styles and button order Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 872892b03cbc4de4e2be1c33e2e07b0bf72883a3 Author: Kyle M Hall Date: Wed Nov 18 18:53:03 2015 +0000 Bug 11360 - Disable barcode field and submit button when a hold is found At the moment when scanning in returns, it can be easy to miss a hold trap due to the fact that the barcode and submit are still active and the barcode field is focused on. A librarian who is focused on scanning can easily scan another item and pass over the form, which is equivalent to clicking the "ignore" button. Test Plan: 1) Apply this patch 2) Trap a hold, note the new modal 3) Check the hold in a second time 4) Note the new modal 5) For each modal, test each button Signed-off-by: Christopher Brannon Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/circ/returns.tt | 245 ++++++++++++++++---- 1 file changed, 198 insertions(+), 47 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 19:18:31 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 17:18:31 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-623-gc4a0be0 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 c4a0be0a68916718d5e4c1daee011630bd02fb25 (commit) from b26abb0d526c68c9f94d9b919b80935f9ce0046d (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 c4a0be0a68916718d5e4c1daee011630bd02fb25 Author: Kyle M Hall Date: Fri Sep 2 16:18:38 2016 +0000 Bug 10848 - Fix DBRev description Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 2 19:24:30 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Sep 2016 17:24:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-628-g8a7a953 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 8a7a953e5b6c03da01963b47eb963bab73643245 (commit) via 0ad9dbb1d78cb418ef16f39b3f370c67065b5f51 (commit) via 59c964f3644fa56f1ce08a54af898f7c17f42d8c (commit) via ab14e051b8828fbebdd724f906d3505275021364 (commit) via d15dac15c877da994b5d0a55131c1038cbb5670a (commit) from c4a0be0a68916718d5e4c1daee011630bd02fb25 (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 8a7a953e5b6c03da01963b47eb963bab73643245 Author: Julian Maurice Date: Fri Aug 19 15:26:11 2016 +0200 Bug 13501: Fix behavior of 'Delete subfield' button on select2 controls Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 0ad9dbb1d78cb418ef16f39b3f370c67065b5f51 Author: Julian Maurice Date: Fri Aug 19 13:48:13 2016 +0200 Bug 13501: Highlight select2 control if field is required and value is missing Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 59c964f3644fa56f1ce08a54af898f7c17f42d8c Author: Julian Maurice Date: Fri Oct 30 13:49:56 2015 +0100 Bug 13501: Move "Required" and checkbox after input/select Signed-off-by: Aleisha Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit ab14e051b8828fbebdd724f906d3505275021364 Author: Julian Maurice Date: Fri Oct 30 13:45:13 2015 +0100 Bug 13501: Indentation fix (batchMod-edit.tt) Signed-off-by: Aleisha Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit d15dac15c877da994b5d0a55131c1038cbb5670a Author: Julian Maurice Date: Tue Dec 30 14:40:44 2014 +0100 Bug 13501: Add JS library select2 3.5.4 use it on cataloguing and batch items edit pages Signed-off-by: Aleisha Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../css/select2-spinner.gif} | Bin 1849 -> 1849 bytes .../intranet-tmpl/lib/select2/css/select2.min.css | 1 + .../intranet-tmpl/lib/select2/css/select2.png | Bin 0 -> 613 bytes .../intranet-tmpl/lib/select2/js/select2.min.js | 23 +++++ koha-tmpl/intranet-tmpl/prog/css/select2.css | 8 ++ .../intranet-tmpl/prog/en/includes/select2.inc | 52 ++++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 + .../prog/en/modules/cataloguing/addbiblio.tt | 8 ++ .../prog/en/modules/cataloguing/additem.tt | 8 ++ .../prog/en/modules/tools/batchMod-edit.tt | 100 +++++++++++--------- koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 2 + 11 files changed, 161 insertions(+), 43 deletions(-) copy koha-tmpl/intranet-tmpl/lib/{jquery/plugins/themes/classic/throbber.gif => select2/css/select2-spinner.gif} (100%) create mode 100644 koha-tmpl/intranet-tmpl/lib/select2/css/select2.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/select2/css/select2.png create mode 100644 koha-tmpl/intranet-tmpl/lib/select2/js/select2.min.js create mode 100644 koha-tmpl/intranet-tmpl/prog/css/select2.css create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Sep 3 03:16:57 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 03 Sep 2016 01:16:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-629-g3a2048e 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 3a2048eeff57548a7d9b557b0e94d36d1c58e6ef (commit) from 8a7a953e5b6c03da01963b47eb963bab73643245 (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 3a2048eeff57548a7d9b557b0e94d36d1c58e6ef Author: Kyle M Hall Date: Sat Sep 3 00:17:20 2016 +0000 Bug 11360 - Fix merge conflict Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/circ/returns.tt | 58 ++------------------ 1 file changed, 4 insertions(+), 54 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 6 12:36:45 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 06 Sep 2016 10:36:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-646-g514282d 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 514282d04c4494ca5eee02b18c775db74a6bbb91 (commit) via c2645c0ef83d88b36ed45d6a0b82053191c9b1ce (commit) via 6a5377533ffad409f6fa47e13b82641a01485c10 (commit) via 32857ba014c2f9f64d67fc6b163f025403c920dc (commit) via e1775fe1d5ffae3411d64c4d69fca75ad5641293 (commit) via 8e22663fcd5da34df9529e5f3b2526784f7a2c96 (commit) via 0867d492192419e80caf2716f15ce1af6447a6f4 (commit) via 648a53a373270606207714b23f9bcbc108dcc29f (commit) via f3316db4dfff955c940e63e31f186bf3b2a02297 (commit) via e1b1a67fddaea0eba80a42bf04e7fef7be0d322d (commit) via 8e338c3ae1d1f69210c9b9a2209db1c7afc1e44a (commit) via 6e76e342cb6ac6036738d79418ff068ad84346cc (commit) via bc39f0392bbebaad4c083f81308f652a325be042 (commit) via abeed5b5f1f2ac4dd657842c03a7a36d425a1949 (commit) via 24740fb2fafc20c27aafae760ad4eca1c14a85df (commit) via e53cf965424ce283cd520ff1adb93a05eecec921 (commit) via e825b081d9d9f77fcbabc6e1ef259b31edff7c61 (commit) from 3a2048eeff57548a7d9b557b0e94d36d1c58e6ef (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 514282d04c4494ca5eee02b18c775db74a6bbb91 Author: Kyle M Hall Date: Tue Sep 6 09:37:14 2016 +0000 Bug 16573 - Update Schema Signed-off-by: Kyle M Hall commit c2645c0ef83d88b36ed45d6a0b82053191c9b1ce Author: Kyle M Hall Date: Sat Sep 3 00:26:03 2016 +0000 Bug 14695 [QA Followup] - Fix issues found by QA script commit 6a5377533ffad409f6fa47e13b82641a01485c10 Author: Kyle M Hall Date: Fri Sep 2 10:34:57 2016 +0000 Bug 14695 [QA Followup] - Unit Tests commit 32857ba014c2f9f64d67fc6b163f025403c920dc Author: Kyle M Hall Date: Thu Jun 16 11:53:28 2016 +0000 Bug 14695 [QA Followup] - Tell librarian if item doesn't allow or forces item level holds in the OPAC commit e1775fe1d5ffae3411d64c4d69fca75ad5641293 Author: Kyle M Hall Date: Fri Apr 29 17:34:48 2016 +0000 Bug 14695 [QA Followup] - Disable "Holds to place (count)" unless "Hold next available item" is checked Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit 8e22663fcd5da34df9529e5f3b2526784f7a2c96 Author: Julian Maurice Date: Tue Apr 19 12:06:44 2016 +0200 Bug 14695: Fix typo in template Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit 0867d492192419e80caf2716f15ce1af6447a6f4 Author: Kyle M Hall Date: Mon Apr 18 14:18:07 2016 +0000 Bug 14695 [QA Followup] - Fix method names 'type' to '_type' Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit 648a53a373270606207714b23f9bcbc108dcc29f Author: Alex Arnaud Date: Thu Jan 28 10:41:27 2016 +0100 Bug 14695 - Don't use holds_to_place_count when checking an item. This fix the following bug: If you select 2 in "Holds to place (count)" and finally check an item, so you get 2 holds for the same item. Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit f3316db4dfff955c940e63e31f186bf3b2a02297 Author: Alex Arnaud Date: Wed Jan 27 16:48:02 2016 +0100 Bug 14695 - Warn librarian if max_holds_per_record is reached Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit e1b1a67fddaea0eba80a42bf04e7fef7be0d322d Author: Kyle M Hall Date: Fri Jan 22 15:25:20 2016 +0000 Bug 14695 [QA Followup] - Fix clearing of all holds by patron at checkout Signed-off-by: Nick Clemens Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit 8e338c3ae1d1f69210c9b9a2209db1c7afc1e44a Author: Kyle M Hall Date: Tue Jan 19 17:49:44 2016 +0000 Bug 14695 [QA Followup] - Make existing unit tests pass * Removes tests no longer needed * Updates rules to work with existing tests * Fixes code issues revealed by unit tests Signed-off-by: Nick Clemens Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit 6e76e342cb6ac6036738d79418ff068ad84346cc Author: Kyle M Hall Date: Tue Jan 19 17:10:29 2016 +0000 Bug 14695 [QA Followup] - Filling one hold fills all of them Signed-off-by: Nick Clemens Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit bc39f0392bbebaad4c083f81308f652a325be042 Author: Kyle M Hall Date: Tue Dec 29 19:14:19 2015 +0000 Bug 14695 - Add ability to place multiple item holds on a given record per patron Signed-off-by: Nick Clemens Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit abeed5b5f1f2ac4dd657842c03a7a36d425a1949 Author: Kyle M Hall Date: Mon Dec 28 17:11:46 2015 +0000 Bug 14695 - Tidy C4::Reserves::CanItemBeReserved Signed-off-by: Nick Clemens Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit 24740fb2fafc20c27aafae760ad4eca1c14a85df Author: Kyle M Hall Date: Tue Dec 29 19:13:51 2015 +0000 Bug 14695 - Add new circulation rule Signed-off-by: Nick Clemens Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit e53cf965424ce283cd520ff1adb93a05eecec921 Author: Kyle M Hall Date: Tue Dec 29 19:13:25 2015 +0000 Bug 14695 - Update DB Schema file Signed-off-by: Nick Clemens Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth commit e825b081d9d9f77fcbabc6e1ef259b31edff7c61 Author: Kyle M Hall Date: Tue Dec 29 19:11:47 2015 +0000 Bug 14695 - Update database Signed-off-by: Nick Clemens Signed-off-by: Jason M. Burds Signed-off-by: Benjamin Rokseth ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 40 ++- C4/Reserves.pm | 378 +++++++++++--------- Koha/Holds.pm | 33 ++ Koha/{Patrons.pm => Old/Hold.pm} | 21 +- Koha/{Biblios.pm => Old/Holds.pm} | 14 +- Koha/Schema/Result/Issuingrule.pm | 14 +- Koha/Schema/Result/Virtualshelve.pm | 10 +- admin/smart-rules.pl | 2 + circ/returns.pl | 10 +- installer/data/mysql/atomicupdate/bug_7710.sql | 1 + installer/data/mysql/kohastructure.sql | 1 + .../prog/en/modules/admin/smart-rules.tt | 4 + .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 + .../prog/en/modules/reserve/request.tt | 147 ++++++-- opac/opac-reserve.pl | 44 +-- reserve/placerequest.pl | 59 +-- reserve/request.pl | 84 +++-- t/db_dependent/Holds.t | 24 +- t/db_dependent/Reserves.t | 10 +- t/db_dependent/Reserves/MultiplePerRecord.t | 280 +++++++++++++++ 20 files changed, 826 insertions(+), 352 deletions(-) copy Koha/{Patrons.pm => Old/Hold.pm} (81%) copy Koha/{Biblios.pm => Old/Holds.pm} (79%) create mode 100644 installer/data/mysql/atomicupdate/bug_7710.sql create mode 100755 t/db_dependent/Reserves/MultiplePerRecord.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 13:38:03 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 11:38:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-658-g1ebb3c3 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 1ebb3c386631359c5265a2bd31503c97bf2c4982 (commit) via 8814b79bd74d1967fc1d10368b3ae401719ccb80 (commit) via 6b1a9db08a9ecda1e62c11fcc1aada96933141e2 (commit) via 99fd6d31ce120a6c2d0c4c1399ef9d1140cc9d9a (commit) via 06628b95575c859edf21858ac0f043eed294e650 (commit) via 4fc3750f9a16d65d93fd24b9fbb93dc05b3a1824 (commit) via b537ba198c7c8565db446b79153c6727b8864aef (commit) via 658f603511e119fbcfa3d2581c804d0a0edd985f (commit) via 55cdfd2da3fae609643a16d40af6905f867dead2 (commit) via f75322070182ec67076137b80173523fd3215173 (commit) via 9d1dbb96cb751632b8959c99a51ab75031ed2294 (commit) via ba9b55d5ca56231c887cc3d818071f72e390a8a7 (commit) from 514282d04c4494ca5eee02b18c775db74a6bbb91 (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 1ebb3c386631359c5265a2bd31503c97bf2c4982 Author: Tomas Cohen Arazi Date: Wed Sep 7 11:37:24 2016 -0300 Bug 11921: (QA followup) Remove remaining unused var This patch removes an occurence of an unused var in Context.pm and also prevents a warning if memcached_servers is not set: Use of uninitialized value in split at /home/vagrant/kohaclone/Koha/Cache.pm line 91. t also tidies small things. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 8814b79bd74d1967fc1d10368b3ae401719ccb80 Author: Jonathan Druart Date: Tue Sep 6 15:20:28 2016 +0100 Bug 11921: Fix logic in C4::Context->new to init the config Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 6b1a9db08a9ecda1e62c11fcc1aada96933141e2 Author: Jonathan Druart Date: Tue Sep 6 15:20:25 2016 +0100 Bug 11921: C4::Context->memcached does no longer exist Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 99fd6d31ce120a6c2d0c4c1399ef9d1140cc9d9a Author: Jonathan Druart Date: Thu Jun 23 06:33:23 2016 +0100 Bug 11921: Update remaining occurrences of ->ismemcached TODO: Would be better to provide a better way to know if memcache is correctly set Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 06628b95575c859edf21858ac0f043eed294e650 Author: Jonathan Druart Date: Thu Jun 23 05:12:39 2016 +0100 Bug 11921: Restore memcached infos to koha-conf - Koha::Config Move C4::Context->read_config_file to Koha::Config That permits to reuse it from Koha::Cache without needing C4::Context (and introduce a circular deps). TODO: Add decent POD to Koha::Config Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 4fc3750f9a16d65d93fd24b9fbb93dc05b3a1824 Author: Jonathan Druart Date: Wed Jun 22 16:53:32 2016 +0100 Bug 11921: Restore memcached infos to koha-conf MEMCACHED_SERVERS and MEMCACHED_NAMESPACE should be moved back to koha-conf instead of an ENV var to let command line scripts use the cache mechanism. TODO: - Add the entries to koha-conf.xml - Remove occurrences of MEMCACHED_SERVERS in package, apache and plack files Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit b537ba198c7c8565db446b79153c6727b8864aef Author: Jonathan Druart Date: Wed Sep 7 12:03:00 2016 +0100 Bug 17189: Use Koha::Caches instead of Koha::Cache in Koha::MetaSearcher Signed-off-by: Tomas Cohen Arazi https://bugs.koha-community.org/show_bug.cgi?id=11921 Signed-off-by: Kyle M Hall commit 658f603511e119fbcfa3d2581c804d0a0edd985f Author: Jonathan Druart Date: Wed Sep 7 11:58:05 2016 +0100 Bug 17189: Replace occurrences of 'use Koha::Cache' Signed-off-by: Tomas Cohen Arazi https://bugs.koha-community.org/show_bug.cgi?id=11921 Signed-off-by: Kyle M Hall commit 55cdfd2da3fae609643a16d40af6905f867dead2 Author: Jonathan Druart Date: Wed Sep 7 11:43:32 2016 +0100 Bug 17189: Use delete to flush a L1 cache namespace Signed-off-by: Jacek Ablewicz Signed-off-by: Tomas Cohen Arazi https://bugs.koha-community.org/show_bug.cgi?id=11921 Signed-off-by: Kyle M Hall commit f75322070182ec67076137b80173523fd3215173 Author: Jonathan Druart Date: Wed Jun 22 16:02:08 2016 +0100 Bug 17189: Add the ability to define several memcached namespaces - replace existing occurrences s/Koha::Cache->get_instance/Koha::Caches->get_instance Signed-off-by: Jacek Ablewicz Signed-off-by: Tomas Cohen Arazi https://bugs.koha-community.org/show_bug.cgi?id=11921 Signed-off-by: Kyle M Hall commit 9d1dbb96cb751632b8959c99a51ab75031ed2294 Author: Jonathan Druart Date: Wed Jun 22 16:01:46 2016 +0100 Bug 17189: Add the ability to define several memcached namespaces - Koha::Caches We need to define several namespaces for our cache system. For instance sysprefs, koha conf (koha-conf.xml) and unit tests should be defined in a separate namespace. This will permit to - launch the tests without interfering with other cache values - and flush the sysprefs cache without flushing all other values To do so, we need to store different Koha::Cache objects at a package level. That's why this patch adds a new Koha::Caches module. FIXME: There is an architecture problem here: the L1 cache should be defined in Koha::Cache Signed-off-by: Jacek Ablewicz Signed-off-by: Tomas Cohen Arazi https://bugs.koha-community.org/show_bug.cgi?id=11921 Signed-off-by: Kyle M Hall commit ba9b55d5ca56231c887cc3d818071f72e390a8a7 Author: Jonathan Druart Date: Wed Jun 22 16:10:23 2016 +0100 Bug 17189: Add the ability to define several memcached namespaces - tests Signed-off-by: Jacek Ablewicz Signed-off-by: Tomas Cohen Arazi https://bugs.koha-community.org/show_bug.cgi?id=11921 Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 6 +- C4/Biblio.pm | 6 +- C4/Calendar.pm | 16 +-- C4/Context.pm | 162 ++++------------------ C4/External/OverDrive.pm | 4 +- C4/Items.pm | 2 +- C4/Koha.pm | 4 +- C4/Utils/DataTables/ColumnsSettings.pm | 4 +- Koha/Cache.pm | 67 ++++----- Koha/{Template/Plugin/ItemTypes.pm => Caches.pm} | 31 ++--- Koha/Calendar.pm | 6 +- Koha/Config.pm | 71 ++++++++++ Koha/MetaSearcher.pm | 5 +- Koha/Template/Plugin/Cache.pm | 2 +- admin/biblio_framework.pl | 4 +- admin/koha2marclinks.pl | 2 +- admin/marc_subfields_structure.pl | 2 +- admin/marctagstructure.pl | 4 +- debian/templates/plack.psgi | 4 +- misc/plack/koha.psgi | 4 +- opac/svc/report | 4 +- reports/guided_reports.pl | 3 +- svc/report | 4 +- t/Cache.t | 27 +++- t/Calendar.t | 4 +- t/db_dependent/Filter_MARC_ViewPolicy.t | 4 +- t/db_dependent/Items.t | 4 +- tools/newHolidays.pl | 4 +- 28 files changed, 222 insertions(+), 238 deletions(-) copy Koha/{Template/Plugin/ItemTypes.pm => Caches.pm} (57%) create mode 100644 Koha/Config.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 14:54:44 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 12:54:44 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-665-g39487d6 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 39487d634ecb2fbfe5819852ef295cdd3d214737 (commit) via ea275693348b7d7e7a230de1cdbd3cf3a0ecb826 (commit) via cadf5aea814636ccccd85fcc38aa30f751d779c0 (commit) via b1c703ac5c10b40b4dd275904dc44bbafadebd5e (commit) via 6cbae9c3cb0cb3675dc2620e149eace979a78e01 (commit) via dd8352bb8b4718393f25038086d0128c9671e970 (commit) via 16f74b546e2eafa3e887aa33000954052156a5d2 (commit) from 1ebb3c386631359c5265a2bd31503c97bf2c4982 (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 39487d634ecb2fbfe5819852ef295cdd3d214737 Author: Tomas Cohen Arazi Date: Tue Aug 30 12:44:14 2016 -0300 Bug 11592: (QA followup) Add missing framework code to ViewPolicy filter calls This patch adds the frameworkcode option param, using each record's frameworkcode as expected by the filter. Otherwise the ViewPolicy filter falls back to the default framework. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall commit ea275693348b7d7e7a230de1cdbd3cf3a0ecb826 Author: Tomas Cohen Arazi Date: Mon Aug 22 11:00:41 2016 -0300 Bug 11592: (QA followup) Simplify code Koha::RecordProcessor and the defined filters are supposed to bring us joy and happiness. Let's keep the code compact, simple and clean. This patch removes record cloning all over the place. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall commit cadf5aea814636ccccd85fcc38aa30f751d779c0 Author: Mark Tompsett Date: Wed Apr 20 21:49:41 2016 -0400 Bug 11592: MARCView and ISBD followup There are still some leaks, but it is not as a result of the filter, but rather a result of poorly written template files. Bug fixing template files is beyond the scope of this set of patches. TEST PLAN --------- 1) Backup your DB 2) run the following SQL on your DB. > UPDATE marc_subfield_structure set hidden=-8; -- this should set EVERYTHING to hidden across the board. 3) In staff client, set OPACXSLTDetailsDisplay to blank 4) In OPAC, view any detail. -- Normal view may mostly leak values still. -- MARC view may leak values. -- ISBD view may leak values. 5) In staff client, set OPACXSLTDetailsDisplay to default 6) In OPAC, view any detail. -- same issues as step 4 -- 'View Plain' may leak too. 7) 'Save record' -> 'Dublin Core' 8) Apply this patch 9) run koha qa test tools -- should be fine 10) prove -v t/db_dependent/Filter_MARC_ViewPolicy.t -- should pass -- this proves Koha/Filter/MARC/ViewPolicy.pm tweaks too 11) In OPAC, view any detail. -- Normal view: -- Material type comes from the LEADER field. -- Lists this is on will still display -- 'Tags from this library' will still display -- Item information in table will still display (THIS IS BEYOND SCOPE) -- MARC view: -- Record number is leaked (THIS IS BEYOND SCOPE) -- 'View plain' leaks LEADER field. -- ISBD view may leak field headings, but not values. (THIS IS BEYOND SCOPE) 12) In staff client, set OPACXSLTDetailsDisplay to blank 13) In OPAC, view any detail. -- same kind of output as step 10 14) 'Save record' -> BIBTEXT -- Should be next to nothing leaked. 15) 'Save record' -> Dublin Core -- Should be the same or less leaked between the two versions. -- (XML FILTERING IS BEYOND SCOPE) 16) In the staff client, go view the same record. -- it should be mostly hidden in ISBD View. 17) run the following SQL on your DB. > UPDATE marc_subfield_structure set hidden=1; -- this should set EVERYTHING to hidden in OPAC, but not the STAFF across the board. 18) Refresh the staff ISBD page -- values should reappear. 19) View the ISBD details in the OPAC -- values should still be hidden. 20) Check out the OPAC Cart and List -- while the intermediate pages may still leak the download links should leak very minimally. -- (CARTS AND LISTS ARE BEYOND SCOPE, THOUGH THE INTRANET ISBD AND SOME CART/LIST STUFF WERE FIXED BECAUSE OF THE GetISBDView REFACTOR) Expectations: Before Patch - all the OPAC Detail pages will display things After Patch - all the OPAC Detail pages will display much less, and hopefully nothing (though there are known limits). the ISBD detail page in the Staff client will be filtered as well based on STAFF settings. The saving/exporting should generate nearly empty files. Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit b1c703ac5c10b40b4dd275904dc44bbafadebd5e Author: Mark Tompsett Date: Wed Mar 9 14:39:08 2016 -0500 Bug 11592: Biblio tweak for MARCSUBJECT https://bugs.koha-community.org/show_bug.cgi?id=11592 Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 6cbae9c3cb0cb3675dc2620e149eace979a78e01 Author: Mark Tompsett Date: Fri Feb 19 11:02:59 2016 -0500 Bug 11592: Applying filtering to opac interface. Applying the filtering and then... Debugging opac/opac-detail.pl filtering Debugging opac/opac-ISBDdetail.pl more Debugging opac/opac-export.pl Tweak opac/opac-export.pl fix variable declarations, conditional assignments Debugging opac/opac-showmarc.pl https://bugs.koha-community.org/show_bug.cgi?id=11592 Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit dd8352bb8b4718393f25038086d0128c9671e970 Author: Mark Tompsett Date: Wed Mar 16 17:10:02 2016 -0400 Bug 11592: Add should_hide_marc method to filter Add should_hide_marc to ViewPolicy filter Add should_hide_marc tests to t/db_dependent/Filter_MARC_ViewPolicy.t Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 16f74b546e2eafa3e887aa33000954052156a5d2 Author: Mark Tompsett Date: Thu Jan 23 22:31:08 2014 -0500 Bug 11592: Updated License Text and use Modern::Perl Why not clean up the License Agreement stuff while the files are being changed? Used the current one found at: http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence Changed the strict and warning lines into just a Modern::Perl. Signed-off-by: Robin Sheat Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 25 ++++++++----- C4/XSLT.pm | 23 ++++++------ Koha/Filter/MARC/ViewPolicy.pm | 59 +++++++++++++++++++++++++++++++ catalogue/ISBDdetail.pl | 40 ++++++++++++++++----- opac/opac-ISBDdetail.pl | 24 ++++++++++--- opac/opac-MARCdetail.pl | 36 ++++++++++++------- opac/opac-basket.pl | 15 +++++--- opac/opac-detail.pl | 20 +++++++++-- opac/opac-downloadcart.pl | 19 ++++++++-- opac/opac-downloadshelf.pl | 20 ++++++++--- opac/opac-export.pl | 35 ++++++++++++++---- opac/opac-shelves.pl | 11 +++++- opac/opac-showmarc.pl | 40 +++++++++++++-------- t/db_dependent/Filter_MARC_ViewPolicy.t | 52 ++++++++++++++++++++------- 14 files changed, 324 insertions(+), 95 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 14:58:03 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 12:58:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-666-ga1fd726 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 a1fd726157c5857ecde1b66e79284f48142be7e5 (commit) from 39487d634ecb2fbfe5819852ef295cdd3d214737 (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 a1fd726157c5857ecde1b66e79284f48142be7e5 Author: Jacek Ablewicz Date: Thu Sep 1 18:13:50 2016 +0200 Bug 17072: 006 not filling in with existing values When you use the 006 builder to view the existing values in the 006 tag, Koha is not pulling these existing values into the builder window. Instead, Koha appears to be using defaults. To reproduce: 1. Open a record in the editor 2. Switch from BKS to another material type. 3. Change as many settings as possible. 4. Close plugin. 5. Reopen plugin - notice your selections are not shown. Trivial patch, heavilly inspired by Bug 9093. To test: 1. Apply patch 2. Ensure that issue described above is no longer reproductible Signed-off-by: Hector Castro Works as advertised Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: cataloguing/value_builder/marc21_field_006.pl | 14 +++++++++++++- .../cataloguing/value_builder/marc21_field_006.tt | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 15:02:25 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 13:02:25 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-667-g451fd67 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 451fd67dd15b967471983c7c8dc601e0d1f65228 (commit) from a1fd726157c5857ecde1b66e79284f48142be7e5 (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 451fd67dd15b967471983c7c8dc601e0d1f65228 Author: Hector Castro Date: Wed Aug 31 13:33:53 2016 -0600 Bug 17152: Do not copy value when duplicating a subfield When cataloguing, if you want to duplicate a subfield that is not empty, the new subfield is created with a copy of data in it. This is not the case when you duplicate an whole field. The new one is created with subfields but without data in it. Test plan: Add or edit a bibliographic record Fill a subfield Duplicate the subfield => Without this patch the value of the input will be copied => With this patch the new input will be emptied Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 15:03:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 13:03:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-677-geab75d0 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 eab75d0aa48759e8f2ec017b643e0ca6f985c937 (commit) via 61d819caef44700b2b1a85c9c27e47913a165a4f (commit) via 08653cca9bd9d5185293c56326ec35a6e875550c (commit) via db3df548b6a6385ea17d2db49f49f8d4c9f2969f (commit) via 26fdc96c5ea824b5529da846b63a8e4e62d486e8 (commit) via edd555df4dc40f9ee3f8625240564fcc65c2935f (commit) via 363e45a5eb89b25e47165bb815d6dc901744f977 (commit) via 2a3966946131992ceeb125be3a852b9893bfd708 (commit) via d53fb6db6a0cb0d239e7849c902a3dce4966c709 (commit) via f91ed3d8bf19533a4a92e67c0b1fe394e84e67bf (commit) from 451fd67dd15b967471983c7c8dc601e0d1f65228 (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 eab75d0aa48759e8f2ec017b643e0ca6f985c937 Author: Jonathan Druart Date: Tue Sep 6 12:58:31 2016 +0100 Bug 14060: Improve regex to limit year to 4 integers 01/01/01984 should not be considered as a valid date. Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit 61d819caef44700b2b1a85c9c27e47913a165a4f Author: Jonathan Druart Date: Mon Sep 5 09:16:02 2016 +0100 Bug 14060: Consider an empty string as a valid date Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit 08653cca9bd9d5185293c56326ec35a6e875550c Author: Jonathan Druart Date: Tue Aug 30 09:56:46 2016 +0100 Bug 14060: Add the datepicker class to dateofbirth Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit db3df548b6a6385ea17d2db49f49f8d4c9f2969f Author: Jonathan Druart Date: Tue Aug 30 09:54:55 2016 +0100 Bug 14060: Force leading zeros on date If a date does not contain leading zeros for day and month, the date will be refused. parseDate function considers 1/1/1990 as a valid date, but our perl code does not. We must refuse it. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit 26fdc96c5ea824b5529da846b63a8e4e62d486e8 Author: Jonathan Druart Date: Fri Aug 26 08:44:06 2016 +0100 Bug 14060: Display date format pattern instead of date format name Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit edd555df4dc40f9ee3f8625240564fcc65c2935f Author: Jonathan Druart Date: Mon Jan 4 11:03:43 2016 +0000 Bug 14060: Add support for dmydot Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit 363e45a5eb89b25e47165bb815d6dc901744f977 Author: Jonathan Druart Date: Tue Dec 1 17:33:15 2015 +0000 Bug 14060: Force the input to contain a valid date Before this patch, the user was still allowed to enter a valid date. Now, if the date is not valid, the input is emptied. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit 2a3966946131992ceeb125be3a852b9893bfd708 Author: Jonathan Druart Date: Mon Apr 27 10:42:51 2015 +0200 Bug 14060: Display the date format on the warning popup The date format is now displayed on the warning popup. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit d53fb6db6a0cb0d239e7849c902a3dce4966c709 Author: Jonathan Druart Date: Mon Apr 27 10:39:14 2015 +0200 Bug 14060: Add OnClose event on missing datepicker The "suspend until" inputs (hold list on circ/circulation.pl and members/moremember.pl) were not set in the same way. The minDate option should be set for both (bug 10703 removed it for circ/circulation.pl). This patch reintroduces the option and add the OnClose event on both. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall commit f91ed3d8bf19533a4a92e67c0b1fe394e84e67bf Author: Jonathan Druart Date: Fri Apr 24 15:36:34 2015 +0200 Bug 14060: Remove readonly attributes on date inputs In order to remove accessibility issues due to the readonly attributes on date inputs, this patch will remove them and introduce a javascript validation on them. This patch is not perfect for some reason: I didn't manage to force the user to select a valid date. One solution would be to reopen the datepicker plugin until a valid date is inserted. But it could be annoying for users (and for me: I did not manage to implement this solution). You will note that input is emptied if the date is not valid. This is a quick and efficient solution to prevent submitting invalid date and make Koha explodes. A proper solution would be to implement the check server side send a friendly message to the user. Test plan: For all inputs, try an invalid and a valid date. 1/ Debar a patron 2/ On the checkout tables (circulation and moremember), add a renewal due date (at the bottom of the tables) 3/ On the checkout page, specify a due date 4/ On the return page, specify a return date 5/ On the invoice page (acquisition module), enter a shipment and billing date 6/ On the invoice search page (invoices.pl) use filters shipment and billing dates 7/ On the offline circ page, specify a due date 8/ On the edit patron page (memberentry), add a debarment 9/ On the reserve page (reserve/request.pl), use the date inputs to suspend until a defined date 10/ Edit patrons in a batch (tools/modborrowers.pl) and use the registration and expiry date inputs Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/borrower_debarments.inc | 2 +- .../intranet-tmpl/prog/en/includes/calendar.inc | 64 +++++++++++++++++++- .../prog/en/includes/checkouts-table-footer.inc | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 4 +- .../prog/en/modules/acqui/invoices.tt | 4 +- .../prog/en/modules/circ/circulation.tt | 26 ++++++-- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 10 ++- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 8 ++- .../prog/en/modules/members/memberentrygen.tt | 4 +- .../prog/en/modules/members/moremember.tt | 15 +++-- .../prog/en/modules/reserve/request.tt | 6 +- .../prog/en/modules/tools/modborrowers.tt | 5 +- .../intranet-tmpl/prog/js/pages/circulation.js | 13 +++- 13 files changed, 132 insertions(+), 31 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 15:05:59 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 13:05:59 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-679-g20fcac2 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 20fcac24e8c798fb2fb79bf84ebe39c18161d9b0 (commit) via b1dc5092d82fd0952ce4e9b586842f5ccb7a4377 (commit) from eab75d0aa48759e8f2ec017b643e0ca6f985c937 (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 20fcac24e8c798fb2fb79bf84ebe39c18161d9b0 Author: Nick Clemens Date: Wed Sep 7 13:03:43 2016 +0000 Bug 17231 - (QA Followup) Nicer grep Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit b1dc5092d82fd0952ce4e9b586842f5ccb7a4377 Author: Nick Clemens Date: Wed Aug 31 17:37:56 2016 +0000 Bug 17231 - HTML5MediaYouTube should recognize youtu.be links from youtube as well at the full links To test: Enable HTML5MediaYouTube and ensure WWW::YouTube::Download is installed Add an 856$u to a record like: https://www.youtube.com/watch?v=tu0qtEwb9gE Verify you can see the embedded player Use the youtube shortened like (from the share button) like: https://youtu.be/tu0qtEwb9gE Verify you can see the embedded player Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/HTML5Media.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 15:07:06 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 13:07:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-680-g705097f 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 705097f938ba9334c21b3e6f006bd7c9ba38763c (commit) from 20fcac24e8c798fb2fb79bf84ebe39c18161d9b0 (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 705097f938ba9334c21b3e6f006bd7c9ba38763c Author: Aleisha Amohia Date: Wed Aug 24 21:24:45 2016 +0000 Bug 16035: MARC default bibliographic framework Export fix This patch makes sure that, if there is no framework code, $frameworkcode is set to 'default'. This fixes the format issue. Then, if $frameworkcode = default, an empty string (rather than null) is passed to the ExportFramework method, as the framework code in the DB for default codes is "". To test: 1) Go to Admin -> MARC Bibliographic framework 2) Try to export default framework in all formats, notice the file is only exported as .ods and is an empty file. Notice warns in intranet error log. 3) Apply patch and refresh page 4) Confirm exporting default framework works in all formats and spreadsheet has data 5) Notice warns in error log are gone 6) Confirm export still works for other frameworks Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: admin/import_export_framework.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 15:20:37 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 13:20:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-681-gc85292d 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 c85292db5a5f5ec661c6978c2a0841783061b223 (commit) from 705097f938ba9334c21b3e6f006bd7c9ba38763c (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 c85292db5a5f5ec661c6978c2a0841783061b223 Author: Kyle M Hall Date: Thu Sep 8 12:19:30 2016 +0000 Bug 17189 [QA Followup] - Missing $ on $key var for unsafe variant Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha/Cache.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 15:47:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 13:47:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-684-g7523ef8 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 7523ef878d432fccf905d68fa5e10fcd8ef30dcb (commit) via 408c7bf001d5b9b8c2ab9118a2f67b564e79e085 (commit) via 53ee852749c8d15cdddddbeaf12e88279792cfe6 (commit) from c85292db5a5f5ec661c6978c2a0841783061b223 (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 7523ef878d432fccf905d68fa5e10fcd8ef30dcb Author: Kyle M Hall Date: Thu Sep 8 12:47:25 2016 +0000 Bug 14695 - DBRev 16.06.00.018 Signed-off-by: Kyle M Hall commit 408c7bf001d5b9b8c2ab9118a2f67b564e79e085 Author: Kyle M Hall Date: Thu Sep 8 09:45:27 2016 +0000 Bug 14695 [QA Followup] * Add tests for CanItemBeReserved returns 'itemAlreadyOnHold' to t/db_dependent/Holds.t * Don't let GetReserveId explode * Use search instead of map * Remove instances of resbarcode * Fix badly formed li closing tag Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 53ee852749c8d15cdddddbeaf12e88279792cfe6 Author: Jonathan Druart Date: Wed Sep 7 14:20:00 2016 +0100 Bug 14695: Fix GetHardDueDate.t tests Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 2 ++ Koha.pm | 2 +- Koha/Holds.pm | 12 +++--------- installer/data/mysql/atomicupdate/bug_7710.sql | 1 - installer/data/mysql/updatedatabase.pl | 10 ++++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 -- .../intranet-tmpl/prog/en/modules/reserve/request.tt | 6 +++--- t/db_dependent/Circulation/GetHardDueDate.t | 3 +++ t/db_dependent/Holds.t | 15 ++++++++++++++- 9 files changed, 36 insertions(+), 17 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_7710.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 16:28:39 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 14:28:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-694-g9b8b181 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 9b8b18151d7773fe811742cdbf7998a15b70bf27 (commit) via a3a2dbb8cda01f9dc6fb3f3ed015998794869719 (commit) via 82c98ad23495f18af7cba32a3d02d1dd34cdda01 (commit) via 8a6e7b4a768fc78997bc533c380bfb4bba57cbf3 (commit) via 703bebe92368a23cc30a067cff1b5b7ae9e63b6e (commit) via cae4b980607be083e5e0fb163c4949c73d6347db (commit) via 6239bbd35f31bac5b9c98ab96bad9617c68b5de3 (commit) via a5a23bcebcb0cfce65b72f9ccef484e9d44fe33a (commit) via 6ee8dd3a597d08ccc5122473e55790d3f21d5163 (commit) via 3bb1578354e75ae160830a410340c6fbb9faaf3a (commit) from 7523ef878d432fccf905d68fa5e10fcd8ef30dcb (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 9b8b18151d7773fe811742cdbf7998a15b70bf27 Author: Jonathan Druart Date: Fri Aug 12 12:56:22 2016 +0100 Bug 15407: Uniformise calls in patron-attr-types Does not make sense to call first in list context and later in scalar context. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit a3a2dbb8cda01f9dc6fb3f3ed015998794869719 Author: Marcel de Rooy Date: Fri Aug 12 13:26:46 2016 +0200 Bug 15407: [QA Follow-up] Confusing cathash removed One of the patches removed %cathash. Some kind of silly remainder was left in a string. Just used as a text field to explain the filters used on borrowers_stats.pl. The filter name cathash is not really easy and also was confusing in relation to the variable. So just a string patch, replacing it with Patron category. NOTE: The output of borrowers_stats.pl with the filters listed, is not one of the most beautiful Koha screens. Furthermore, translatibility of these filters is still an issue to be handled on another report. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 82c98ad23495f18af7cba32a3d02d1dd34cdda01 Author: Jonathan Druart Date: Fri Aug 12 11:05:46 2016 +0100 Bug 15407: (follow-up) Koha::Patron::Categories - replace C4::Category->al Categories.GetName should not have been removed in the previous patch (merge conflict issue). Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 8a6e7b4a768fc78997bc533c380bfb4bba57cbf3 Author: Marcel de Rooy Date: Fri Aug 12 11:20:11 2016 +0200 Bug 15407: [QA Follow-up] Joubu, add your tests Trivial fix (yes again). Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 703bebe92368a23cc30a067cff1b5b7ae9e63b6e Author: Marcel de Rooy Date: Fri Aug 12 10:49:32 2016 +0200 Bug 15407: [QA Follow-up] Fix POD in reserves_stats.pl Trivial fix. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit cae4b980607be083e5e0fb163c4949c73d6347db Author: Jonathan Druart Date: Tue Dec 22 10:12:48 2015 +0000 Bug 15407: Koha::Patron::Categories - replace GetborCatFromCatType This unnecessary complicated subroutine returned an arrayref and an hashref of the patron categories available for the logged in user, for a given category_type, ordered by categorycode. This can now be done with the search_limited method. Test plan: - Same prerequisite as before For the following pages, you should not see patron categories limited to other libraries. They should be ordered as before this patch, by categorycode. - Add/edit a patron, change his/her patron category value. - On the 3 following reports: reports/bor_issues_top.pl reports/borrowers_out.pl reports/cat_issues_top.pl The display for these 3 reports are different than the 2 from the first patch (borrowers_stats.pl issues_avg_stats.pl): they are ordered by categorycode and the ones limited to other libraries are not displayed (should certainly be fixed). Note that the big part of this patch has already been tested before (update child related: CATCODE_MULTI). Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 6239bbd35f31bac5b9c98ab96bad9617c68b5de3 Author: Jonathan Druart Date: Mon Dec 21 17:27:08 2015 +0000 Bug 15407: Koha::Patron::Categories - replace GetBorrowercategoryList C4::Members::GetBorrowercategoryList returned all the patron categories, ordered by description. This can be done using the search method of the Koha::Patron::Categories module. Test plan: - Same prerequisite as before For the following pages, you should not see patron categories limited to other libraries. They should be ordered as before this patch, by description. - On the "patron attribute types" admin page (admin/patron-attr-types.pl). - On the "Batch patron deletion/anonymization" (tools/cleanborrowers.pl), the dropdown list should be filled correctly. - On the import patron tool - On the following report: reports/reserves_stats.pl Confirm that the patron categories are displayed and that the report still works as before. Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit a5a23bcebcb0cfce65b72f9ccef484e9d44fe33a Author: Jonathan Druart Date: Mon Dec 21 17:13:12 2015 +0000 Bug 15407: Koha::Patron::Categories - replace GetBorrowercategory The purpose of C4::Members::GetBorrowercategory was to return the patron category for a given categorycode. This can be done easily with the Koha::Patron::Categories->find method. Test plan: - Same prerequisite as before - Edit a guarantor and confirm the information will be updated for his/her guarantee(s). - Update a child to adult patron (Note: Should not we hide the patron categories limited to others libraries? If yes, it must be done on another bug report). There is a special behavior if there is only 1 adult category, the user does not need to select a category. So the same as before with only 1 adult patron category. - Import a patron with a category_code which does not exist. You should be warned. - Modify some patron using the batch patron modification tool. The patron category descriptions should correctly be displayed. Note that the overduerules page has already been tested in a previous patch. Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 6ee8dd3a597d08ccc5122473e55790d3f21d5163 Author: Jonathan Druart Date: Mon Dec 21 17:04:30 2015 +0000 Bug 15407: Koha::Patron::Categories - replace C4::Category->all The C4::Category module contained only 1 method to return the patron categories available for the logged in user. The new method Koha::Patron::Categories->search_limited does exactly the same thing (see tests) and must be used in place of it. Test plan: - Same prerequisite as before For the following pages, you should not see patron categories limited to other libraries. - On the 'Item circulation alerts' admin page (admin/item_circulation_alerts.pl), modify the settings for check-in and checkout (NOTE: Should not we display all patron categories on this page? If yes, it must be done in another bug report to ease backporting it). - Search for patrons in the admin (budget) and acquisition (order) module. - On the patron home page (search form in the header) Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 3bb1578354e75ae160830a410340c6fbb9faaf3a Author: Jonathan Druart Date: Mon Dec 21 15:04:45 2015 +0000 Bug 15407: Koha::Patron::Categories - remove sql queries in some pl and pm This patch replaces sql queries done in some pl script and in C4::Reports::Guided. Since we have now a Koha::Patron::Categories module, we should use it where it is possible. Test plan: - Prerequisite: Be sure you have several patron categories created, with different option enabled, and limit some to certain libraries. - On the 'Circulation and fine rules' admin page (admin/smart-rules.pl), all the patron categories should be displayed (even the ones limited to another library), ordered by description. Try to add/update existing rules. - On the overdue rules page (tools/overduerules.pl), all the patron categories with overduenoticerequired set should be displayed. Try to add/update existing rules. - On the following reports: reports/borrowers_stats.pl reports/issues_avg_stats.pl The patron categories should be displayed. Note that there is an inconsistency with these 2 reports: the patron categories limited to other libraries are displayed on them, when they are not on the other reports. This should certainly be fixed (on another bug report). Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Category.pm | 181 -------------------- C4/ItemCirculationAlertPreference.pm | 4 +- C4/Members.pm | 111 ------------ C4/Reports/Guided.pm | 3 +- Koha/Patron/Categories.pm | 13 ++ Koha/Template/Plugin/Categories.pm | 20 +-- acqui/add_user_search.pl | 6 +- admin/add_user_search.pl | 6 +- admin/item_circulation_alerts.pl | 6 +- admin/patron-attr-types.pl | 9 +- admin/smart-rules.pl | 13 +- circ/circulation.pl | 7 +- debian/templates/plack.psgi | 1 - .../prog/en/includes/patron-search.inc | 10 +- .../prog/en/modules/admin/smart-rules.tt | 8 +- .../prog/en/modules/members/member.tt | 4 +- .../prog/en/modules/members/update-child.tt | 69 ++++---- .../prog/en/modules/reports/bor_issues_top.tt | 6 +- .../prog/en/modules/reports/borrowers_out.tt | 6 +- .../prog/en/modules/reports/borrowers_stats.tt | 15 +- .../prog/en/modules/reports/cat_issues_top.tt | 6 +- .../prog/en/modules/reports/issues_avg_stats.tt | 4 +- .../modules/reports/issues_by_borrower_category.tt | 4 +- members/boraccount.pl | 9 +- members/guarantor_search.pl | 6 +- members/mancredit.pl | 9 +- members/maninvoice.pl | 9 +- members/member-flags.pl | 9 +- members/member-password.pl | 11 +- members/member.pl | 1 - members/memberentry.pl | 53 +++--- members/members-home.pl | 5 +- members/members-update-do.pl | 1 - members/members-update.pl | 1 - members/moremember.pl | 9 +- members/nl-search.pl | 7 +- members/pay.pl | 14 +- members/paycollect.pl | 14 +- members/printfeercpt.pl | 8 +- members/printinvoice.pl | 9 +- members/readingrec.pl | 9 +- members/update-child.pl | 31 ++-- misc/plack/koha.psgi | 3 +- patroncards/add_user_search.pl | 6 +- reports/bor_issues_top.pl | 19 +- reports/borrowers_out.pl | 15 +- reports/borrowers_stats.pl | 35 ++-- reports/cat_issues_top.pl | 16 +- reports/guided_reports.pl | 12 +- reports/issues_avg_stats.pl | 24 +-- reports/issues_by_borrower_category.plugin | 15 +- reports/issues_stats.pl | 28 +-- reports/reserves_stats.pl | 16 +- serials/add_user_search.pl | 6 +- t/db_dependent/Category.t | 62 ------- t/db_dependent/Circulation/CheckIfIssuedToPatron.t | 1 - t/db_dependent/Circulation/GetIssues.t | 6 +- t/db_dependent/Koha/Patron/Categories.t | 29 +++- t/db_dependent/Members/GetAllIssues.t | 1 - t/db_dependent/Members/GetOverdues.t | 1 - t/db_dependent/Members/GetPendingIssues.t | 1 - t/db_dependent/Members/IssueSlip.t | 1 - t/db_dependent/Ratings.t | 4 +- t/db_dependent/Reserves.t | 3 +- t/db_dependent/Utils/Datatables_Members.t | 3 +- t/db_dependent/Utils/Datatables_Virtualshelves.t | 3 +- tools/cleanborrowers.pl | 5 +- tools/import_borrowers.pl | 7 +- tools/modborrowers.pl | 12 +- tools/overduerules.pl | 35 ++-- 70 files changed, 357 insertions(+), 739 deletions(-) delete mode 100644 C4/Category.pm delete mode 100755 t/db_dependent/Category.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 8 18:19:33 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Sep 2016 16:19:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v16.05.00-707-g28a4d14 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 28a4d1414a49ac0313b3171c0e7b38fbadc530f1 (commit) via 62f4186f881e8eb08373d51e06c45769b41856b5 (commit) via 632c78c073cc7f658442252e9d69cd689bcb2730 (commit) via 0079ca7c72403059ca89f564cd6814c6dfb4312a (commit) via f435d83c0c5283f49cf4089b17c298860e6168ac (commit) via f1e5d61b461b1569399742bd491996f672ba293b (commit) via 9d49e0d2c874292b553d7e0e0a878cd48ee75e09 (commit) via c840c9383558db8ebabfb9b84efccf72904ac061 (commit) via 6b95cb48b30a3e128d7b41ef1756efc12cd823ba (commit) via df97814f3034a3d5015546c4eca21f08ae951e37 (commit) via 79f4afe26a54061eb74d97e4753f6b73cb9e703e (commit) via 9b9803b69c8bde879768ccfa3cc4688ef46b7799 (commit) via 19a977dc7b779173c4a3e96b6b06dc35db663601 (commit) from 9b8b18151d7773fe811742cdbf7998a15b70bf27 (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 28a4d1414a49ac0313b3171c0e7b38fbadc530f1 Author: Marcel de Rooy Date: Wed Aug 31 14:20:34 2016 +0200 Bug 15758: [QA Follow-up] Final touch? From qa tools: reports/cat_issues_top.pl: pod: =over on line 39 without closing =back Note: qa tools does also report "options_for_libraries: not found" on two template includes. Considering this as a false alarm, since the block is defined in another include loaded in doc-head-open. [1] koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc [2] koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc Found a template where a USE Branches was missing: koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Easy to spot since the libraries combo was empty. Tried to find similar occurrences with few greps, but couldn't find any. I did find duplicate USE Branches though in: koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt This patch removes them. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 62f4186f881e8eb08373d51e06c45769b41856b5 Author: Jonathan Druart Date: Fri Aug 26 14:05:42 2016 +0100 Bug 15758: Fix variable name, it's a branchcode Signed-off-by: Kyle M Hall commit 632c78c073cc7f658442252e9d69cd689bcb2730 Author: Marcel de Rooy Date: Fri Aug 26 13:22:31 2016 +0200 Bug 15758: [QA Follow-up] Corrections related to GetBranches [1] C4/Search A call to Koha::Libraries is added to routine pazGetRecords, but the results of that call are not used. So removing it again. [2] catalogue/itemsearch.pl Although A=>B=>C=>D works, we'd better use here A=>B, C=>D. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 0079ca7c72403059ca89f564cd6814c6dfb4312a Author: Marcel de Rooy Date: Fri Aug 26 09:02:04 2016 +0200 Bug 15758: [QA Follow-up] Some corrections related to GetBranchName [1] Acquisition.pm The lines filling $row in GetBasketGroupAsCSV may have side-effects when the library name is not found. This change restores former behavior. Just theoretically more safe. Note that it also contained a typo: $row->{deliveryplace} should have been $row->{$place}. [2] Auth.pm checkauth: $branchname = Koha::Libraries->find($branchcode)->branchname; Should normally be fine, but I rather have an empty string here than crashing on "Can't call method branchname on undefined value". Same for sub check_api_auth. Note that this holds for a larger number of calls, but I am adding a check here because it is checkauth. Also removed a duplicate use Koha::Libraries-statement. [3] Search.pm Also removed a duplicate use statement for Libraries. [4] svc/holds Added an (explicit) use statement for Koha::Libraries. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit f435d83c0c5283f49cf4089b17c298860e6168ac Author: Marcel de Rooy Date: Fri Aug 26 08:01:07 2016 +0200 Bug 15758: [QA Follow-up] Remove onlymine from Plugin/Branches.pm Hard to miss that one: Template process failed: plugin error - Bareword "C4::Branch::onlymine" not allowed while "strict subs" in use at Koha/Template/Plugin/Branches.pm line 59. Compilation failed in require at /usr/lib/perl5/Template/Plugins.pm line 206. Removed OnlyMine from Plugin/Branches. Replaced by a template var in cleanborrowers; it was used only once. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit f1e5d61b461b1569399742bd491996f672ba293b Author: Jonathan Druart Date: Mon Feb 8 17:17:31 2016 +0000 Bug 15758: Koha::Libraries - Do not select an option if selected is defined This will certainly need a few more tweaks. Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall commit 9d49e0d2c874292b553d7e0e0a878cd48ee75e09 Author: Jonathan Druart Date: Mon Feb 8 15:20:18 2016 +0000 Bug 15758: Koha::Libraries - Add tests for the Branches TT plugin Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall commit c840c9383558db8ebabfb9b84efccf72904ac061 Author: Jonathan Druart Date: Fri Feb 5 12:34:08 2016 +0000 Bug 15758: Koha::Libraries - Ultimate duel for C4::Branch Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall commit 6b95cb48b30a3e128d7b41ef1756efc12cd823ba Author: Jonathan Druart Date: Fri Feb 5 12:30:29 2016 +0000 Bug 15758: Koha::Libraries - Move onlymine to C4::Context::only_my_library Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall commit df97814f3034a3d5015546c4eca21f08ae951e37 Author: Jonathan Druart Date: Thu Feb 4 15:24:23 2016 +0000 Bug 15758: Koha::Libraries - Remove GetBranches Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall commit 79f4afe26a54061eb74d97e4753f6b73cb9e703e Author: Jonathan Druart Date: Thu Feb 4 15:24:12 2016 +0000 Bug 15758: Koha::Libraries - Move mybranch to C4::Context Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall commit 9b9803b69c8bde879768ccfa3cc4688ef46b7799 Author: Jonathan Druart Date: Wed Feb 3 15:58:08 2016 +0000 Bug 15758: Koha::Libraries - Remove GetBranchesLoop Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall commit 19a977dc7b779173c4a3e96b6b06dc35db663601 Author: Jonathan Druart Date: Tue Feb 2 17:28:30 2016 +0000 Bug 15758: Koha::Libraries - Remove GetBranchName This is the fourth and last patch set to remove C4::Branch. The real purpose of this patch is to standardise and refactor some code which is related to the libraries selection/display. Its unconfessed purpose is to remove the C4::Branch package. Before this patch set, only 6 subroutines still existed in the C4::Branch package: - GetBranchName - GetBranchesLoop - mybranch - onlymine - GetBranches - GetBranch GetBranchName basically returns the branchname for a given branchcode. The branchname is only used for a display purpose and we don't need to retrieve it in package or pl scripts (unless for a few exceptions). We have a `Branches` template plugin with a `GetName` method which does exactly this job. To achieve this removal, we will use this template plugin and delete the GetBranchName from pl and pm files. The `Branches.all()` will now select the library of the logged in user if no `selected` parameter has been passed. This new behavior could cause regressions, for instance there are some places where we do not want an option preselected (batch item modification for instance), keep that in mind when testing. GetBranchesLoop took 3 parameters: $branch and $onlymine. The first one was used to set a "selected" flag, for a display purpose: select an option in the libraries dropdown lists. The second one was useless: If not passed or set to 0, the `C4::Branch::onlymine` subroutine was called. This onlymine flag was use to know if the logged in user was able to see other libraries infos. A patron can see the infos from other libraries if IndependentBranches is not set OR if he has the superlibrarian permission. Prior to this patch set, the "onlymine test" was done on different places (neworderempty.pl, additem.pl, holidays.pl, etc.), including the Branches TT plugin. In this patch set, this test is only done on one place (C4::Context::only_my_library, code moved from C4::Branch::onlymine). To accomplish the same job as this subroutine, we just need to call the `Branches.all()` method from the `Branches` TT plugin. It already accepts a `selected` parameter to set a flag on the option to select. To avoid the repetitive [% IF selected %]