From gitmaster at git.koha-community.org Mon Jul 2 09:02:43 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 07:02:43 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.07-14-g3a6a870 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.11.x has been updated via 3a6a8707c593d063d488e96470fad5492dfd4e84 (commit) via 9f59f945073334daff0339c0e24a7e8641de9e6b (commit) via e2fbce6c719eaa4dbfffe0eb7ed0dd6a142df96d (commit) via 7a14e9d6e477c0c3904df099e11afbf15fdee701 (commit) via ffd7365d86edc2dd0f9a00921d6640450f09fdfb (commit) from d62c83a2416e603e2d2508aa58aa6efb72964024 (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 3a6a8707c593d063d488e96470fad5492dfd4e84 Author: Alex Buckley Date: Thu May 24 10:10:05 2018 +0000 Bug 18521: Fix key binding in the header Moving the conditional block [% IF (CAN_user_circulate_circulate_remaining_permissions ) %] block up the checkin-search.inc file above the CAN_user_catalogue IF conditional block fixes this bug. Test plan: 1. Go to the circ home page and confirm the following keyboard shortcuts work: Alt+q = goes to search catalog Alt+w = goes to renew 2. Go to returns.pl and confirm the following keyboard shortcuts work: Alt+q = goes to renew Alt+w = goes to search catalog 3. Apply patch 4. Restart apache2, memchached and plack 5. Confirm on the returns.pl the following keyboard shortcuts work: Alt+q = goes to search catalog Alt+w = goes to renew Sponsored-By: Catalyst IT Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 5c6c65476838d701b1f44199407efbade349967b) Signed-off-by: Fridolin Somers commit 9f59f945073334daff0339c0e24a7e8641de9e6b Author: Martin Renvoize Date: Thu Jun 21 08:28:08 2018 +0100 Bug 20879: Fix regression in shibboleth when ldap enabled Signed-off-by: Nick Clemens Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit c528c05f303d1d4c99680ebf61fb78a79b92bedf) Signed-off-by: Fridolin Somers commit e2fbce6c719eaa4dbfffe0eb7ed0dd6a142df96d Author: Colin Campbell Date: Fri Jun 22 15:02:01 2018 +0100 Bug 20972: Add a testcase for bug 20972 Ensure all 10 characters of ISBN are preserved And that ISBNs and EANs are correctly identidied in the PIA segment Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 82ce10dd2817e99aa138d87287d903e5c7539a0a) Signed-off-by: Fridolin Somers commit 7a14e9d6e477c0c3904df099e11afbf15fdee701 Author: xljoha Date: Thu Jun 21 09:58:55 2018 +0200 Bug 20972: If ISBN has 10 numbers only the first 9 numbers are used If ISBN has 10 numbers only the first 9 numbers are being added to the Edifact-message (PIA+5+3540556753:IB') This is caused by wrong positioning of capturing parentheses in a regular expression. Sponsored-by: Gothenburg University Library Signed-off-by: Colin Campbell Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit b9bd93e9205d4b8344a77214fefb8efe2c84792e) Signed-off-by: Fridolin Somers commit ffd7365d86edc2dd0f9a00921d6640450f09fdfb Author: Owen Leonard Date: Mon Jun 4 14:40:03 2018 +0000 Bug 20876: The form_serialized_itype cookie is not used and should be removed This patch removes references to a form_serialized_itype cookie which appears in the code as part of the process of storing information used in the generation of the "Return to the last advanced search" link. To test, apply the patch and perform an advanced search in the OPAC using several search options including a limit by item type. From the search results page, follow the "Return to the last advanced search" link. The advanced search form should appear with all the search options you submitted before. Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 3b9a81e394c4f47433b3f0057b9b819549f583b8) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 2 +- Koha/Edifact/Order.pm | 2 +- .../prog/en/includes/checkin-search.inc | 21 ++++++++++---------- .../bootstrap/en/includes/opac-bottom.inc | 1 - .../bootstrap/en/modules/opac-advsearch.tt | 1 - t/Ediorder.t | 13 +++++++++++- 6 files changed, 25 insertions(+), 15 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 09:28:31 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 07:28:31 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-25-gd874e52 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via d874e52cdc6bcb20ee12885b9ecec0f339d315db (commit) via 3afc24c776a30fc510c23177548b8b26fd44c4c7 (commit) from d064c25f593e49565bf0899da6bb712ddc447d39 (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 d874e52cdc6bcb20ee12885b9ecec0f339d315db Author: Jonathan Druart Date: Tue Jun 26 12:37:19 2018 -0300 Bug 20998: Simplify the conditional statement Signed-off-by: Jonathan Druart Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 3afc24c776a30fc510c23177548b8b26fd44c4c7 Author: Nick Clemens Date: Tue Jun 26 15:02:02 2018 +0000 Bug 20998: Only perform quicksearch if patron found with cardnumber This patch makes sure we have a patron before we try to access their branchcode and allows search to work To recreate: 1 - Enable 'IndependentBranches' 2 - Setup a patron with all permissions, but not a superlibrarian 3 - Login to staff client as that patron 4 - Click 'Patrons' in the toolbar and try a search 5 - Internal server error 6 - Apply patch 7 - Try the search again 8 - Success! Signed-off-by: Jonathan Druart Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: members/member.pl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 09:31:40 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 07:31:40 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-26-g5f03b21 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 5f03b21cf3a7141dc0f2ae2b1922505d55d4cd34 (commit) from d874e52cdc6bcb20ee12885b9ecec0f339d315db (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 5f03b21cf3a7141dc0f2ae2b1922505d55d4cd34 Author: Josef Moravec Date: Fri Jun 8 09:43:13 2018 +0000 Bug 20903: Remove unnecessary category code parameters Test plan: 0) Do no apply the patch 1) Have only one adults patrons category defined 2) Add a fine to child patron and pay it 3) Try to print the payment receipt (file printfeercpt.pl) 4) You see only ISE 5) Apply the patch 6) Try the printing again 7) Now you should see right receipt Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: members/printfeercpt.pl | 6 ------ 1 file changed, 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 09:35:07 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 07:35:07 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-28-g73f37b3 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 73f37b3a561efe61832bde372ffc42fb9dd47f54 (commit) via 5bb6b6581c9385d693194338db3e7865d2c28409 (commit) from 5f03b21cf3a7141dc0f2ae2b1922505d55d4cd34 (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 73f37b3a561efe61832bde372ffc42fb9dd47f54 Author: Julian Maurice Date: Mon Jun 25 14:58:17 2018 +0200 Bug 16653: (QA follow-up) Avoid a warning and remove unused variables Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 5bb6b6581c9385d693194338db3e7865d2c28409 Author: Jonathan Druart Date: Thu Jun 7 11:47:46 2018 -0300 Bug 16653: Display number of checkouts when exporting 'Most-circulated items' as CSV reports/cat_issues_top.pl does not export "Count of checkouts" column as CSV To replicate: 1/ Make sure that test instance has circulation in a given date range 2/ Go to Home ? Reports ? Most-circulated items 3/ Select a date range 4/ Select 'To screen into the browser' radio button, click submit. 5/ Note that Columns 'Rank/Biblioitemnumbers', 'Global' and 'Count of checkouts' appear in screen output. 6/ Click the browser's back button 7/ Change output to 'To a file', click submit. Without this patch: the columns "100/", "Global" and "Total" are exported to the CSV file. "100/" contains the rank, "Global" is still global, and the "Total" column is empty. With this patch patch applied, the last column is filled and the "Total" line is removed (This script is really dirty) Signed-off-by: Pierre-Luc Lapointe (Yes it is) Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: reports/cat_issues_top.pl | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 10:20:08 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 08:20:08 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-29-g737702f Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 737702f9756f89f6f75b2a3323e03738234fa143 (commit) from 73f37b3a561efe61832bde372ffc42fb9dd47f54 (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 737702f9756f89f6f75b2a3323e03738234fa143 Author: Nick Clemens Date: Thu Jun 7 14:03:11 2018 +0000 Bug 20893: batchRebuildItemsTables.pl has incorrect parameter To test: 1 - run batchRebuildItemsTables.pl with a valid biblionumber perl /usr/share/koha/bin/batchRebuildItemsTables.pl --where biblio.biblionumber=38483 -c 2 - Note it says 'undefined biblionumber 3 - Apply patch 4 - Do it again 5 - It works! Signed-off-by: Katrin Fischer Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: misc/batchRebuildItemsTables.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 10:23:23 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 08:23:23 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-30-g9d96e21 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 9d96e2142140b8184e77da038fde51c0f7000c87 (commit) from 737702f9756f89f6f75b2a3323e03738234fa143 (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 9d96e2142140b8184e77da038fde51c0f7000c87 Author: Owen Leonard Date: Mon Jun 18 18:29:57 2018 +0000 Bug 17869: Don't show pick-up library for list of holds in OPAC account when there is only one branch This patch modifies the user summary page in the OPAC so that the "pick up location" column isn't shown in the table of holds if there is only one library defined. To test, apply the patch and log into the OPAC as a user with one or more holds. - In a system with more than one library defined the "Holds" tab of opac-user.pl should show a "Pick up location" column. - In a system with only one library defined there should be now "Pick up location" column. Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 10:28:31 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 08:28:31 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-31-g6ad2c14 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 6ad2c1402fa3a8d419a357233a6e4ad19e58a3db (commit) from 9d96e2142140b8184e77da038fde51c0f7000c87 (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 6ad2c1402fa3a8d419a357233a6e4ad19e58a3db Author: Marcel de Rooy Date: Thu May 3 12:33:19 2018 +0200 Bug 20697: Bind calling GetAnalyticsCount to pref EasyAnalyticalRecords If you do not use the EasyAnalyticalRecords feature (introduced with bug 5528), you will have a lot of warnings in zebra-output.log like: zebrasrv(1096) [request] Search biblios ERROR 114 1 1+0 RPN @attrset Bib-1 @attr 1=8911 259186 They come from C4::Items::GetAnalyticsCount called by catalogue/detail.pl. This sub starts a Zebra search on index 'hi' (Host-Item-Number). If you do not use this field at all (related to 773$9 in MARC21), Zebra returns an Unsupported Use attribute error (114). In making this change, I added one minor change: [1] Remove the commented GetAnalyticsCount in additem.pl and correcting indentation in that loop (removing tabs). So no change at all there. NOTE: I will propose to bind the GetHostItemsInfo call in detail.pl and two other scripts to this preference too on report 20702. Test plan: [1] If you use EasyAnalytics, verify that there is no change. [2] If you do not, check the zebra-output.log. You should no longer see searches for Host-Item-Number with 1=8911. (As well as ERROR 114 on this index.) Signed-off-by: Marcel de Rooy Signed-off-by: Charles Farmer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: catalogue/detail.pl | 2 +- cataloguing/additem.pl | 26 ++++++++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 10:30:39 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 08:30:39 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-33-gfd49ce5 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via fd49ce55d84530a43c90017eddf0a2f25adae616 (commit) via 0557c0fd9c468fb32011897318fb239dcdc30bc8 (commit) from 6ad2c1402fa3a8d419a357233a6e4ad19e58a3db (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 fd49ce55d84530a43c90017eddf0a2f25adae616 Author: Nick Clemens Date: Fri Jun 29 20:09:38 2018 +0000 Bug 20945: (RM follow-up) Escape param_name too Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 0557c0fd9c468fb32011897318fb239dcdc30bc8 Author: Nick Clemens Date: Thu Jun 14 14:20:44 2018 +0000 Bug 20945: Escape SQL parameters when constructing download links TO test: 1 - Create a report that takes a parameter 2 - Enter a parameter containing '%' 3 - Attempt to download report, note link is misconstructed 4 - Apply patch 5 - Reload 6 - Note URL is now correct Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 10:44:42 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 08:44:42 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-34-gb601031 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via b6010314dfed0f35c87de1a6c8209cd3e8f8b3c8 (commit) from fd49ce55d84530a43c90017eddf0a2f25adae616 (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 b6010314dfed0f35c87de1a6c8209cd3e8f8b3c8 Author: Caitlin Goodger Date: Tue May 29 17:32:12 2018 +0000 Bug 17886: Don't show option to add to existing list if there are no lists This patch modifies the page for adding a title to a list so that the "Add to existing list" option doesn't appear if there are no lists defined. TEST PLAN --------- 1) Make sure no lists exist at all. 2) Make there is at least one findable biblio record entered 3) Find that biblio record in the OPAC 4) Click 'Save to your lists' -- Notice that the whole save to list section is there. 5) Apply this patch 6) Click 'Cancel' 7) Click 'Save to your lists' -- Notice you can only add now, which makes sense. 8) Run koha qa test tools. Perform the same tests in the staff client. Signed-off-by: Maryse Simard Followed the test plan and the patch works. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../en/modules/virtualshelves/addbybiblionumber.tt | 86 ++++++++++---------- .../bootstrap/en/modules/opac-addbybiblionumber.tt | 2 +- 2 files changed, 45 insertions(+), 43 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 11:16:05 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 09:16:05 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-35-gb3cd4a3 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via b3cd4a382ffad36668164749dafb58d48c00d7f1 (commit) from b6010314dfed0f35c87de1a6c8209cd3e8f8b3c8 (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 b3cd4a382ffad36668164749dafb58d48c00d7f1 Author: Jonathan Druart Date: Tue Jun 26 13:04:01 2018 -0300 Bug 20991: Do not lost patron's category when editing a patron If there is an error in the edit patron form the patron's category is lost. This seems to be a long standing bug. Test plan: - Edit an existing patron - Change the patron category to a category that triggers the error that the user is not in the right age range for that new category - Save, error is triggered => Without this patch the patron category has been reset You should also test different ways to edit/add a patron (quick add, step 1) Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: members/memberentry.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 11:22:00 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 09:22:00 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-36-g8e5f562 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 8e5f562ded60d6dbaed706e7ddcd0ed9e5a9343f (commit) from b3cd4a382ffad36668164749dafb58d48c00d7f1 (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 8e5f562ded60d6dbaed706e7ddcd0ed9e5a9343f Author: Owen Leonard Date: Wed Apr 4 17:50:48 2018 +0000 Bug 20520: Re-indent moremember.tt This patch reindents the template for the patron detail page, moremember.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the patron detail page. There should be no visible difference before and after the applying the patch. HTML validation before and after the patch should return the same results. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/moremember.tt | 1244 ++++++++++++-------- 1 file changed, 725 insertions(+), 519 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 15:24:35 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 13:24:35 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-158-g1f818e6 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 1f818e67387488e06a106398994bccca2fadc698 (commit) via c5f62b9bf898c7e0dc55b9a72a84f63267aac282 (commit) via 44445d7ebf978457bbbc30110f837e2639452d07 (commit) via e14748867da3b742f8c9027a8f6546352305c684 (commit) via 04e2f7e836a707c8e8a14f06f963351ebde149f1 (commit) via 6bbad855deed9bf22976374ee825f39f7fc86f1a (commit) via 792bc2a01fb16b542f1ae807b746af79333e911d (commit) via 0f40236349fa54f08c31777762a74fad6ff5c347 (commit) via 2882bcf3db92a61f4a48f7c37c64ee9ca05d2aad (commit) via aab05ee6a460d1c9ec7da8b4a116e24e65d54a67 (commit) via fc518a1b56f8cb1ca0e034574275cfd78617d715 (commit) via 236a7a71d2bade4cba63fd10662736b2fd721006 (commit) via f253c72bc38482301de4aa4267ddf4d214dce6a1 (commit) via 295ae33800a322facfdf56795f4c02b2fd53432b (commit) via cdb6b68488fd33c20db7e35e4caa8a9b9bd8f4d4 (commit) via 4ec5a67c6f989635b14f048c3720bea7a8d86d38 (commit) via a21c57daa63df4214460d138f0618816bfeb89c4 (commit) via 603ad3a094686cb6c345467f994f52282576923c (commit) via 730bc64ea6854ad64f92381222191c256533dc1a (commit) via b1391e6e36784c79d2b08fb04652469606fe4890 (commit) via 96fda97c09c9ac6ee2fa6efc9cce2a7c5b6b825c (commit) via f0d9383d8d6588dc55553feea8df3bc00b39c761 (commit) via 53aab446ebea7e7ef74095407c7a56c8e254396f (commit) via 4ff98def40309c535154335ad722a16a1ac439f0 (commit) via f99a1daf2571a4d695a8701e3f0fb5e115499bb8 (commit) via 982eabb93782e1f6b8cece57545dc57bf10a47fc (commit) via 26f98dc986e5c99796ff372a6494c4bc400bf6e9 (commit) via 0254b4e87df2879d9de97a8651fd1f325fc4495c (commit) via 3e3cf93bff75bb4432889345024595e848108df1 (commit) from fa25c45ffcd2a654a258cacc133b51c60cf5ae92 (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 1f818e67387488e06a106398994bccca2fadc698 Author: Andrew Isherwood Date: Tue Apr 24 16:03:40 2018 +0100 Bug 20651: Improve full supplier metadata display This patch improves the display of the extra metadata that may be returned by an ILL supplier. The display of the metadata has been moved from the "Toggle full supplier metadata" link at the bottom of the page to a button on the right of the request toolbar, labelled "Display supplier metadata". Clicking this button opens a modal displaying the metadata. To test: 1) Ensure ILL is enabled and you have at least one request 2) From the "View ILL requests" page, click "Manage request" on a request 3) Click the "Display supplier metadata" button on the right of the toolbar 4) Observe that a modal opens containing the metadata Signed-off-by: Magnus Enger The modal looks good! Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit c5f62b9bf898c7e0dc55b9a72a84f63267aac282 Author: Kyle M Hall Date: Fri Apr 6 14:50:38 2018 -0400 Bug 20467: (QA follow-up) Display error if no or invalid course id is passed Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 44445d7ebf978457bbbc30110f837e2639452d07 Author: Jonathan Druart Date: Thu Apr 5 13:52:12 2018 -0300 Bug 20467: Remove useless use statements Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit e14748867da3b742f8c9027a8f6546352305c684 Author: Kyle M Hall Date: Tue Apr 3 06:35:01 2018 -0400 Bug 20467: (QA follow-up) Filter barcodes, remove selector code, use template plugins Removes selector code as batch changes cannot have a previous selection. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 04e2f7e836a707c8e8a14f06f963351ebde149f1 Author: Kyle M Hall Date: Thu Mar 29 07:33:16 2018 -0400 Bug 20467: (QA follow-up) Add Branches plugin to template Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 6bbad855deed9bf22976374ee825f39f7fc86f1a Author: Kyle M Hall Date: Fri Mar 23 01:03:00 2018 +0000 Bug 20467: Add ability to batch add items to a course Some librarians have requested the ability to batch add items to a course using the same settings for all items. Test Plan: 1) Apply this patch 2) Create a new course 3) Click the new 'Batch add reserves' button 4) Enter some valid and invalid barcodes in the text box, add some settings 5) Submit the batch, note the results list added items and invalid barcodes 6) Note the valid items were added to the course Signed-off-by: S?verine QUEUNE Signed-off-by: Maksim Sen Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 792bc2a01fb16b542f1ae807b746af79333e911d Author: Katrin Fischer Date: Fri May 11 07:52:51 2018 +0200 Bug 20709: (follow-up) Update GERMAN MARC frameworks to Update 26 (April 2018) A follow-up in line with bug 20710. Again, the files used here have been generated automatically from the po files on translate.koha-community.org. To test: - Make sure the de-DE installer can install all mandatory files cleanly. Signed-off-by: Bernardo Gonzalez Kriegel Tested using de-DE installer, all files load Ok No errors Signed-off-by: Nick Clemens commit 0f40236349fa54f08c31777762a74fad6ff5c347 Author: Katrin Fischer Date: Thu May 3 22:32:26 2018 +0000 Bug 20709: Update GERMAN MARC frameworks to Updates 23+24+25 (Nov 2016, May and Dec 2017) Translation of bibliographic and authority frameworks can be done using translate.koha-community.org. Updated and translated files will then be provided for download. See: http://lists.koha-community.org/pipermail/koha-translate/2018-April/002721.html To test: - Verify SQL is correct and frameworks load without problem Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Nick Clemens commit 2882bcf3db92a61f4a48f7c37c64ee9ca05d2aad Author: Katrin Fischer Date: Sat Apr 28 20:54:14 2018 +0000 Bug 19835: (follow-up) Correct formatting in a few places In some places - was used insted of --, changed for consistency with existing descriptions. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit aab05ee6a460d1c9ec7da8b4a116e24e65d54a67 Author: Bernardo Gonzalez Kriegel Date: Thu Apr 26 12:36:35 2018 -0300 Bug 19835: Fix MARC21 frameworks revision date This followup updates revison number and date Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit fc518a1b56f8cb1ca0e034574275cfd78617d715 Author: Bernardo Gonzalez Kriegel Date: Thu Apr 26 10:52:50 2018 -0300 Bug 19835: Fix repeatability on MARC21 subfields This followup fixes all repeatability cases, from updates 23+24+25 and a few older ones. To test: 0) Apply both patches 1) Remove all your frameworks 2) Check mandatory bibliographic and authority files load without problem 3) Check repeatability... Bibs and auth frameworks checked against LOC description. Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 236a7a71d2bade4cba63fd10662736b2fd721006 Author: Bernardo Gonzalez Kriegel Date: Wed Apr 25 23:57:40 2018 -0300 Bug 19835: Update MARC frameworks to Updates 23+24+25 (Nov 2016, May and Dec 2017) There are a bunch of updates, summary below 1) Update 23 1.a) Bibs New fields: 647 885 New subfields e in 752 0 in 257 377 3 in 382 4 in 752 Changes 028 redefined a renamed in 028 b renamed in 046 d renamed in 046 1.b) Auth New Fields: 075 147 447 547 677 747 885 New Subfields: 0 in 377 2) Update 24 2.a) Bibs New subfields b in 567 g in 340 i in 370 386 0 in many fields 2 in 567 3 in 370 4 in 370 386 Changes g renamed in 370 4 'Relationship code' -> 'Relationship' many fields 4 'Relator code' -> 'Relationship' many fields 2.b) Auth New subfields i in 370 386 0 in 050 052 053 055 060 065 070 080 087 3 in 370 4 in 370 386 Changes g in 370 4 'Relationship code' -> 'Relationship' many fields 4 'Relator code' -> 'Relationship' in 371 3) Update 25 3.a) Bibs New fields: 758 New subfields r in 777 u in 777 z in 777 1 in many fields Changes d renamed in 111 611 711 811 s repeatable in many fields 3.b) Auth New subfields 1 in many fields Changes d in 111 411 511 711 s repeatable in many fields For more detail: Update 23 bibs https://www.loc.gov/marc/up23bibliographic/bdapndxg.html auth https://www.loc.gov/marc/up23authority/adapndxf.html Update 24 bibs https://www.loc.gov/marc/up24bibliographic/bdapndxg.html auth https://www.loc.gov/marc/up24authority/adapndxf.html Update 25 bibs https://www.loc.gov/marc/bibliographic/bdapndxg.html auth https://www.loc.gov/marc/authority/adapndxf.html To test: 1) Remove all your frameworks 2) Check mandatory bibliographic and authority files load without problem 3) Check new fields/subfields Repeatability checks on followup Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit f253c72bc38482301de4aa4267ddf4d214dce6a1 Author: Marcel de Rooy Date: Thu Feb 22 15:46:12 2018 +0100 Bug 20272: Changes for Breeding.pm and Record.pm In Breeding.pm we let Z3950Search return the xslt handler error codes back to the template. They are converted to text messages by using an new include file (added for opac and intranet now). The generic xslt_err code is now obsoleted. In Record.pm the errstr call is removed. The croak is done with the new error code in err. This seems sufficient. Test plan: [1] Run Breeding.t [2] Run Record.t [3] Add a nonexisting xslt file to one of your Z3950 targets. Search on that target and check if you see a error 'XSLT file not found'. The bonus is these error messages are now translatable as they are in the templates Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher Signed-off-by: Chris Cormack Signed-off-by: Nick Clemens commit 295ae33800a322facfdf56795f4c02b2fd53432b Author: Marcel de Rooy Date: Thu Feb 22 14:52:29 2018 +0100 Bug 20272: Replace error numbers by codes in XSLT_Handler We remove the error numbers 1 to 7 by readable codes. And remove the errstr attribute (not used widely). Make XSLT_Handler a little bit less noisy by defaulting print_warns to false unless $ENV{DEBUG} is set. (See also bug 19018). The unit has been changed accordingly. (A few warnings are no longer tested.) Test plan: Run t/db_dependent/XSLT_Handler.t Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher Signed-off-by: Chris Cormack Signed-off-by: Nick Clemens commit cdb6b68488fd33c20db7e35e4caa8a9b9bd8f4d4 Author: Nick Clemens Date: Fri May 25 03:01:48 2018 +0000 Bug 20495: (follow-up) Correct search for report by name Ultimately we should probably remove name access as it is not a unique id, but this should preserve existing behaviour To test: Create a report Use the service link to confirm the report runs Replace id=# parameter with name=XXXXXX Confirm URL works Signed-off-by: Jonathan Druart Note: We should not remove the param "name", it's a feature, see bug 8256. Signed-off-by: Nick Clemens commit 4ec5a67c6f989635b14f048c3720bea7a8d86d38 Author: Nick Clemens Date: Thu Mar 29 13:32:19 2018 +0000 Bug 20495: Remove get_saved_report To test: 1 - prove t/db_dependent/Reports/Guided.t 2 - grep "get_saved_report" - ensure there are no occurences of the singular form 3 - create, save, edit, and convert a report 4 - access a public report and report json from opac and staff client 5 - Ensure all function as expected Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit a21c57daa63df4214460d138f0618816bfeb89c4 Author: Owen Leonard Date: Tue May 22 16:29:09 2018 +0000 Bug 20793: (follow-up) Add style to the non-link hold count on detail page This small follow-up changes the style on the bibliographic detail page of the hold count so that it looks similar whether it's a link to holds or not. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 603ad3a094686cb6c345467f994f52282576923c Author: Katrin Fischer Date: Sun May 20 02:42:28 2018 +0200 Bug 20793: Don't show a holds link in staff for users without permission On the results list in staff the 'Holds (x)' link always shows independent of the permissions of the staff user. This patch tightens the permission checks on the result page to explicitly check for the place_holds permission. To test: - Create a staff user with place_holds permission - Check the result list, you should see 2 links to the holds page: - 'Place holds' on top of the results list - 'Holds (x)' at the bottom of each entry in the results list - Verify both links work - Create a staff user without place_holds_permission - Without the patch you'll see the second link, but it will lead to a permission error - With the patch you'll still see the 'Holds (x)', but it will no longer be a link. - Go to the detail page of a record with an existing hold. - Repeat test with both staff users. - One time the Hold information in the bibliographic information should show as a link, the other time as a simple text. Displaying the information about existing holds still make sense as this is the current beheviour. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 730bc64ea6854ad64f92381222191c256533dc1a Author: Nick Clemens Date: Mon Jul 2 11:51:20 2018 +0000 Bug 7547: (RM follow-up) Compiled css Signed-off-by: Nick Clemens commit b1391e6e36784c79d2b08fb04652469606fe4890 Author: Josef Moravec Date: Wed Jun 27 13:00:17 2018 +0000 Bug 7547: (QA follow-up) Make button background transparent for consistency Test plan: Add some records to cart in opac and show the cart, look at the print button/link --> without patch it has darker background than other buttons --> with this patch it has the same background Note: tested wir firefox 45, firefox 60 and chromium 66 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 96fda97c09c9ac6ee2fa6efc9cce2a7c5b6b825c Author: Owen Leonard Date: Thu Jun 21 17:31:44 2018 +0000 Bug 7547: printing a sorted cart This patch adds a DataTables-generated print button to the OPAC cart. To make that process easier, the DataTables plugin has been upgraded to the latest version (1.10.18) with the Buttons plugin included. Changes to the OPAC LESS file style the DataTables button to look like the static version. Other templates in the OPAC which use the DataTables plugin have been modified to use up-to-date option names. To test, apply the patch and add several titles to the cart. - Open the cart - Re-sort the cart using something other than the default sort - Click the 'Print' button. - A print view should open in a separate window, sorted correctly, and automatically show the print dialog. - Click the cart's 'More details' button and click the print button. - This should trigger the print dialog directly. - Test DataTables sorting on other modified pages: - Bibliographic detail page (holdings table) - Course reserves (table of courses) - Course details (table of titles) - Full subscription history - Detail page for a subscription -> More details -> Full history - Most popular - Purchase suggestions - Self checkouts - Tag cloud - Your fines - Your interlibrary loan requests - Your reading history - Your search history - Your search IDREF for ppn (I don't know how to test this) The DataTables plugin is removed from "Your routing lists" and Self check-in because it is unused. Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit f0d9383d8d6588dc55553feea8df3bc00b39c761 Author: Owen Leonard Date: Tue Jun 26 15:17:21 2018 +0000 Bug 20999: Remove invalid 'style="block"' from OPAC templates This patch removes an invalid attribute from OPAC template markup. There should be no visible change to the OPAC. To test, apply the patch and confirm that the following pages still look correct when using various cover image sources: Coce, Amazon, Google: - Bibliographic detail page (opac-detail.pl) - The shelf browser - Catalog search results - Recent comments Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 53aab446ebea7e7ef74095407c7a56c8e254396f Author: Owen Leonard Date: Thu May 31 13:29:33 2018 +0000 Bug 15360: Incorrect or mislabeled behavior on Authorities "New from Z39.50" Button This patch makes a third stab at resolving this issue by reorganizing the authorities toolbar buttons to more closely match the bibliographic toolbar buttons: - "New from Z39.50" has been added to the "New authority" dropdown. - "Edit" is now a dropdown, like on the bibliographic detail page: - Edit record - Edit as new (duplicate) - Replace record via Z39.50/SRU - Delete record To test, apply the patch and go to the authorities module. Testing with existing Z39.50 authority sources configured: - On the authorities home page and the authorities search results page, the "New authority" menu should have a "New from Z39.50" link. - View the details for an authority record. The menus should appear as described above. Test each option. Remove all Z39.50 authority servers and test again. The "New from Z39.50" link should no longer appear. Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 4ff98def40309c535154335ad722a16a1ac439f0 Author: Mirko Tietgen Date: Fri Jun 29 22:25:33 2018 +0200 Bug 20920: (follow-up) generated d/control Signed-off-by: Mirko Tietgen Signed-off-by: Nick Clemens commit f99a1daf2571a4d695a8701e3f0fb5e115499bb8 Author: J?r?me Charaoui Date: Wed Jun 20 14:25:20 2018 -0400 Bug 20920: Add missing dependency on CGI::Compile Signed-off-by: Mirko Tietgen Signed-off-by: Nick Clemens commit 982eabb93782e1f6b8cece57545dc57bf10a47fc Author: Owen Leonard Date: Mon Jun 25 15:00:42 2018 +0000 Bug 20559: Compiled CSS This patch contains the compiled OPAC CSS. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 26f98dc986e5c99796ff372a6494c4bc400bf6e9 Author: Owen Leonard Date: Mon Jun 25 14:54:08 2018 +0000 Bug 20559: Occurrences of loading-small.gif still exist This patch removes some leftover references to a file which no longer exists. In the OPAC, loading-small.gif was included in CSS which was never used. In the staff client, loading-small.gif should have been corrected to spinner-small.gif. To test, apply the patch and go to Tools -> Batch record modification. - Submit a batch of records to modify - In the table of titles which will be modified, click the 'Show MARC' button. - The modal preview window should show "Loading" and an animated spinner before the MARC record is loaded. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 0254b4e87df2879d9de97a8651fd1f325fc4495c Author: Owen Leonard Date: Wed Jun 20 17:16:16 2018 +0000 Bug 20931: JS error "ReferenceError: $ is not defined" when CircSidebar is turned on This patch reorganizes the way sidebar menus get highlighted based on the current page. A global function is added to handle most cases. Individual menu-handling scripts have been modified to handle only the edge cases which aren't covered by the global one. A new class is added to the global CSS file so that highlighted menu links can be custom-styled. To test, apply the patch and clear your cache if necessary. View various pages to confirm that current-page-highlighting in the sidebar menu is working correctly and that there are no JS errors in the browser console. For example: - Administration -> Currencies and exchange rates. - Acquisitions -> Invoices - Tools -> Patron lists - Tools -> Export And with CircSidebar turned on test various circulation pages, e.g. - Circulation -> Set library Signed-off-by: Charles Farmer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 3e3cf93bff75bb4432889345024595e848108df1 Author: Kyle M Hall Date: Thu Jun 21 11:11:54 2018 -0400 Bug 20977: Javascript vars used in confirm_deletion in catalog.js do not match strings in catalog-strings.inc The naming mismatch can cause javascript errors. Test Plan: 1) Confirm the string vars used in catalog.js match the ones in catalog-strings.inc Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Breeding.pm | 2 +- C4/Installer/PerlDependencies.pm | 5 + C4/Record.pm | 5 +- C4/Reports/Guided.pm | 31 +- Koha/XSLT_Handler.pm | 105 ++--- authorities/detail.pl | 9 + course_reserves/batch_add_items.pl | 107 +++++ debian/control | 2 + .../marc21/mandatory/authorities_normal_marc21.sql | 380 ++++++++++++------ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 302 ++++++++++---- .../optional/marc21_simple_bib_frameworks.sql | 30 -- .../marc21/mandatory/authorities_normal_marc21.sql | 374 +++++++++++++----- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 270 +++++++++---- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 18 +- .../prog/en/includes/authorities-toolbar.inc | 85 ++-- .../prog/en/includes/authorities_js.inc | 21 +- .../prog/en/includes/catalog-strings.inc | 6 +- .../intranet-tmpl/prog/en/includes/circ-nav.inc | 13 - .../prog/en/includes/xslt-handler.inc | 16 + .../prog/en/modules/catalogue/detail.tt | 6 +- .../prog/en/modules/catalogue/results.tt | 10 +- .../prog/en/modules/cataloguing/z3950_search.tt | 4 +- .../en/modules/course_reserves/batch_add_items.tt | 135 +++++++ .../en/modules/course_reserves/course-details.tt | 1 + .../prog/en/modules/ill/ill-requests.tt | 40 +- .../en/modules/tools/batch_record_modification.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/acq.js | 5 - .../intranet-tmpl/prog/js/acquisitions-menu.js | 4 +- koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 12 +- koha-tmpl/intranet-tmpl/prog/js/catalog.js | 2 +- koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 12 + koha-tmpl/intranet-tmpl/prog/js/tools-menu.js | 18 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- .../bootstrap/en/includes/shelfbrowser.inc | 2 +- .../bootstrap/en/includes/xslt-handler.inc | 16 + .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 4 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 27 +- .../bootstrap/en/modules/opac-course-details.tt | 8 +- .../bootstrap/en/modules/opac-course-reserves.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 12 +- .../en/modules/opac-full-serial-issues.tt | 8 +- .../opac-tmpl/bootstrap/en/modules/opac-idref.tt | 6 +- .../bootstrap/en/modules/opac-illrequests.tt | 6 +- .../bootstrap/en/modules/opac-readingrecord.tt | 8 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +- .../bootstrap/en/modules/opac-routing-lists.tt | 3 - .../bootstrap/en/modules/opac-search-history.tt | 8 +- .../bootstrap/en/modules/opac-showreviews.tt | 2 +- .../bootstrap/en/modules/opac-suggestions.tt | 10 +- .../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 12 +- .../bootstrap/en/modules/opac-topissues.tt | 12 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 10 +- .../opac-tmpl/bootstrap/en/modules/sci/sci-main.tt | 3 +- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 12 +- koha-tmpl/opac-tmpl/bootstrap/js/datatables.js | 55 ++- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 40 +- .../lib/jquery/plugins/jquery.dataTables.min.js | 418 ++++++++++++-------- misc/cronjobs/runreport.pl | 9 +- opac/svc/report | 12 +- reports/guided_reports.pl | 57 +-- svc/convert_report | 5 +- svc/report | 12 +- t/db_dependent/Breeding.t | 27 +- t/db_dependent/Reports/Guided.t | 1 + t/db_dependent/XSLT_Handler.t | 60 ++- 65 files changed, 1913 insertions(+), 994 deletions(-) create mode 100755 course_reserves/batch_add_items.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/xslt-handler.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 19:08:01 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 17:08:01 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-37-g693d68b Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 693d68b64746ffd5569d32f2524e3587792908a1 (commit) from 8e5f562ded60d6dbaed706e7ddcd0ed9e5a9343f (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 693d68b64746ffd5569d32f2524e3587792908a1 Author: Kyle M Hall Date: Thu Jun 21 11:11:54 2018 -0400 Bug 20977: Javascript vars used in confirm_deletion in catalog.js do not match strings in catalog-strings.inc The naming mismatch can cause javascript errors. Test Plan: 1) Confirm the string vars used in catalog.js match the ones in catalog-strings.inc Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc | 6 +++--- koha-tmpl/intranet-tmpl/prog/js/catalog.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 19:09:40 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 17:09:40 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-38-g5253c38 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 5253c38864b9e8ebca18c2a8645e58b48290b677 (commit) from 693d68b64746ffd5569d32f2524e3587792908a1 (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 5253c38864b9e8ebca18c2a8645e58b48290b677 Author: Owen Leonard Date: Wed Jun 20 17:16:16 2018 +0000 Bug 20931: JS error "ReferenceError: $ is not defined" when CircSidebar is turned on This patch reorganizes the way sidebar menus get highlighted based on the current page. A global function is added to handle most cases. Individual menu-handling scripts have been modified to handle only the edge cases which aren't covered by the global one. A new class is added to the global CSS file so that highlighted menu links can be custom-styled. To test, apply the patch and clear your cache if necessary. View various pages to confirm that current-page-highlighting in the sidebar menu is working correctly and that there are no JS errors in the browser console. For example: - Administration -> Currencies and exchange rates. - Acquisitions -> Invoices - Tools -> Patron lists - Tools -> Export And with CircSidebar turned on test various circulation pages, e.g. - Circulation -> Set library Signed-off-by: Charles Farmer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 6 +++++- .../intranet-tmpl/prog/en/includes/circ-nav.inc | 13 ------------- koha-tmpl/intranet-tmpl/prog/js/acq.js | 5 ----- koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js | 4 +--- koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 12 +++++------- koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 12 ++++++++++++ koha-tmpl/intranet-tmpl/prog/js/tools-menu.js | 18 ++++++++---------- 7 files changed, 31 insertions(+), 39 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 19:13:13 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 17:13:13 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-40-g3e9a447 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 3e9a44794cac502b2e3809413dac2d5f2a3e0d7c (commit) via 6f047049ca973fe2cf02c7ce124fec0366c3f4fd (commit) from 5253c38864b9e8ebca18c2a8645e58b48290b677 (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 3e9a44794cac502b2e3809413dac2d5f2a3e0d7c Author: Owen Leonard Date: Mon Jun 25 15:00:42 2018 +0000 Bug 20559: Compiled CSS This patch contains the compiled OPAC CSS. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 6f047049ca973fe2cf02c7ce124fec0366c3f4fd Author: Owen Leonard Date: Mon Jun 25 14:54:08 2018 +0000 Bug 20559: Occurrences of loading-small.gif still exist This patch removes some leftover references to a file which no longer exists. In the OPAC, loading-small.gif was included in CSS which was never used. In the staff client, loading-small.gif should have been corrected to spinner-small.gif. To test, apply the patch and go to Tools -> Batch record modification. - Submit a batch of records to modify - In the table of titles which will be modified, click the 'Show MARC' button. - The modal preview window should show "Loading" and an animated spinner before the MARC record is loaded. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../en/modules/tools/batch_record_modification.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 24 -------------------- 3 files changed, 2 insertions(+), 26 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 19:19:10 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 17:19:10 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-43-g6900e76 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 6900e766130442f7baff42545f1b0b6bfdb0e508 (commit) via da51f6bcc9eb2bff48da2d7ca0efb7b791c62192 (commit) via 3b02a8d2da4b3a20bc3a4970b537066ff389b959 (commit) from 3e9a44794cac502b2e3809413dac2d5f2a3e0d7c (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 6900e766130442f7baff42545f1b0b6bfdb0e508 Author: Owen Leonard Date: Thu May 31 13:29:33 2018 +0000 Bug 15360: Incorrect or mislabeled behavior on Authorities "New from Z39.50" Button This patch makes a third stab at resolving this issue by reorganizing the authorities toolbar buttons to more closely match the bibliographic toolbar buttons: - "New from Z39.50" has been added to the "New authority" dropdown. - "Edit" is now a dropdown, like on the bibliographic detail page: - Edit record - Edit as new (duplicate) - Replace record via Z39.50/SRU - Delete record To test, apply the patch and go to the authorities module. Testing with existing Z39.50 authority sources configured: - On the authorities home page and the authorities search results page, the "New authority" menu should have a "New from Z39.50" link. - View the details for an authority record. The menus should appear as described above. Test each option. Remove all Z39.50 authority servers and test again. The "New from Z39.50" link should no longer appear. Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit da51f6bcc9eb2bff48da2d7ca0efb7b791c62192 Author: Mirko Tietgen Date: Fri Jun 29 22:25:33 2018 +0200 Bug 20920: (follow-up) generated d/control Signed-off-by: Mirko Tietgen Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 3b02a8d2da4b3a20bc3a4970b537066ff389b959 Author: J?r?me Charaoui Date: Wed Jun 20 14:25:20 2018 -0400 Bug 20920: Add missing dependency on CGI::Compile Signed-off-by: Mirko Tietgen Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 5 ++ authorities/detail.pl | 9 +++ debian/control | 2 + .../prog/en/includes/authorities-toolbar.inc | 85 +++++++++++--------- .../prog/en/includes/authorities_js.inc | 21 +++-- 5 files changed, 73 insertions(+), 49 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jul 2 19:20:28 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 02 Jul 2018 17:20:28 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-44-gd7ae1d6 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via d7ae1d65a461ed9f5052d45f3069a30f671660f1 (commit) from 6900e766130442f7baff42545f1b0b6bfdb0e508 (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 d7ae1d65a461ed9f5052d45f3069a30f671660f1 Author: Owen Leonard Date: Tue Jun 26 15:17:21 2018 +0000 Bug 20999: Remove invalid 'style="block"' from OPAC templates This patch removes an invalid attribute from OPAC template markup. There should be no visible change to the OPAC. To test, apply the patch and confirm that the following pages still look correct when using various cover image sources: Coce, Amazon, Google: - Bibliographic detail page (opac-detail.pl) - The shelf browser - Catalog search results - Recent comments Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jul 3 12:12:41 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Jul 2018 10:12:41 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-50-g1b8b3a7 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via 1b8b3a7390f785b2fda403e679a1b34a730327c3 (commit) via 77159706ca0226dccc56c2c50c161b5bd37e64ad (commit) via c1f916c1aa6e4937eca2dcf5b6493368d18cbcae (commit) via 5d79a95226d71482a1070e994746785ec7278542 (commit) via 05e612525bf8d92562ae9e17904a974913819125 (commit) via e98d4d30cad78715e613f833ed2356070f9985ad (commit) from d7ae1d65a461ed9f5052d45f3069a30f671660f1 (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 1b8b3a7390f785b2fda403e679a1b34a730327c3 Author: Katrin Fischer Date: Sat Apr 28 20:54:14 2018 +0000 Bug 19835: (follow-up) Correct formatting in a few places In some places - was used insted of --, changed for consistency with existing descriptions. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 77159706ca0226dccc56c2c50c161b5bd37e64ad Author: Bernardo Gonzalez Kriegel Date: Thu Apr 26 12:36:35 2018 -0300 Bug 19835: Fix MARC21 frameworks revision date This followup updates revison number and date Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit c1f916c1aa6e4937eca2dcf5b6493368d18cbcae Author: Bernardo Gonzalez Kriegel Date: Thu Apr 26 10:52:50 2018 -0300 Bug 19835: Fix repeatability on MARC21 subfields This followup fixes all repeatability cases, from updates 23+24+25 and a few older ones. To test: 0) Apply both patches 1) Remove all your frameworks 2) Check mandatory bibliographic and authority files load without problem 3) Check repeatability... Bibs and auth frameworks checked against LOC description. Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 5d79a95226d71482a1070e994746785ec7278542 Author: Bernardo Gonzalez Kriegel Date: Wed Apr 25 23:57:40 2018 -0300 Bug 19835: Update MARC frameworks to Updates 23+24+25 (Nov 2016, May and Dec 2017) There are a bunch of updates, summary below 1) Update 23 1.a) Bibs New fields: 647 885 New subfields e in 752 0 in 257 377 3 in 382 4 in 752 Changes 028 redefined a renamed in 028 b renamed in 046 d renamed in 046 1.b) Auth New Fields: 075 147 447 547 677 747 885 New Subfields: 0 in 377 2) Update 24 2.a) Bibs New subfields b in 567 g in 340 i in 370 386 0 in many fields 2 in 567 3 in 370 4 in 370 386 Changes g renamed in 370 4 'Relationship code' -> 'Relationship' many fields 4 'Relator code' -> 'Relationship' many fields 2.b) Auth New subfields i in 370 386 0 in 050 052 053 055 060 065 070 080 087 3 in 370 4 in 370 386 Changes g in 370 4 'Relationship code' -> 'Relationship' many fields 4 'Relator code' -> 'Relationship' in 371 3) Update 25 3.a) Bibs New fields: 758 New subfields r in 777 u in 777 z in 777 1 in many fields Changes d renamed in 111 611 711 811 s repeatable in many fields 3.b) Auth New subfields 1 in many fields Changes d in 111 411 511 711 s repeatable in many fields For more detail: Update 23 bibs https://www.loc.gov/marc/up23bibliographic/bdapndxg.html auth https://www.loc.gov/marc/up23authority/adapndxf.html Update 24 bibs https://www.loc.gov/marc/up24bibliographic/bdapndxg.html auth https://www.loc.gov/marc/up24authority/adapndxf.html Update 25 bibs https://www.loc.gov/marc/bibliographic/bdapndxg.html auth https://www.loc.gov/marc/authority/adapndxf.html To test: 1) Remove all your frameworks 2) Check mandatory bibliographic and authority files load without problem 3) Check new fields/subfields Repeatability checks on followup Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 05e612525bf8d92562ae9e17904a974913819125 Author: Owen Leonard Date: Tue May 22 16:29:09 2018 +0000 Bug 20793: (follow-up) Add style to the non-link hold count on detail page This small follow-up changes the style on the bibliographic detail page of the hold count so that it looks similar whether it's a link to holds or not. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit e98d4d30cad78715e613f833ed2356070f9985ad Author: Katrin Fischer Date: Sun May 20 02:42:28 2018 +0200 Bug 20793: Don't show a holds link in staff for users without permission On the results list in staff the 'Holds (x)' link always shows independent of the permissions of the staff user. This patch tightens the permission checks on the result page to explicitly check for the place_holds permission. To test: - Create a staff user with place_holds permission - Check the result list, you should see 2 links to the holds page: - 'Place holds' on top of the results list - 'Holds (x)' at the bottom of each entry in the results list - Verify both links work - Create a staff user without place_holds_permission - Without the patch you'll see the second link, but it will lead to a permission error - With the patch you'll still see the 'Holds (x)', but it will no longer be a link. - Go to the detail page of a record with an existing hold. - Repeat test with both staff users. - One time the Hold information in the bibliographic information should show as a link, the other time as a simple text. Displaying the information about existing holds still make sense as this is the current beheviour. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../marc21/mandatory/authorities_normal_marc21.sql | 374 ++++++++++++++------ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 270 ++++++++++---- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 3 +- .../prog/en/modules/catalogue/detail.tt | 6 +- .../prog/en/modules/catalogue/results.tt | 10 +- 5 files changed, 475 insertions(+), 188 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jul 3 12:15:35 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 03 Jul 2018 10:15:35 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.01-52-gc058a4a Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.05.x has been updated via c058a4a4858d5c03841b88ba65d232a03046304d (commit) via 3f1f212553a329a5fbda51e2746fac91ec4fc37c (commit) from 1b8b3a7390f785b2fda403e679a1b34a730327c3 (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 c058a4a4858d5c03841b88ba65d232a03046304d Author: Katrin Fischer Date: Fri May 11 07:52:51 2018 +0200 Bug 20709: (follow-up) Update GERMAN MARC frameworks to Update 26 (April 2018) A follow-up in line with bug 20710. Again, the files used here have been generated automatically from the po files on translate.koha-community.org. To test: - Make sure the de-DE installer can install all mandatory files cleanly. Signed-off-by: Bernardo Gonzalez Kriegel Tested using de-DE installer, all files load Ok No errors Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 3f1f212553a329a5fbda51e2746fac91ec4fc37c Author: Katrin Fischer Date: Thu May 3 22:32:26 2018 +0000 Bug 20709: Update GERMAN MARC frameworks to Updates 23+24+25 (Nov 2016, May and Dec 2017) Translation of bibliographic and authority frameworks can be done using translate.koha-community.org. Updated and translated files will then be provided for download. See: http://lists.koha-community.org/pipermail/koha-translate/2018-April/002721.html To test: - Verify SQL is correct and frameworks load without problem Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../marc21/mandatory/authorities_normal_marc21.sql | 380 ++++++++++++++------ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 302 ++++++++++++---- .../optional/marc21_simple_bib_frameworks.sql | 30 -- 3 files changed, 498 insertions(+), 214 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jul 4 10:24:50 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 04 Jul 2018 08:24:50 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.07-25-gbdb60e7 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.11.x has been updated via bdb60e7d19c8a7d5d80e064429a02779cb620a19 (commit) via a876da7c054a7c31adfd05ec090c0de2f341ff27 (commit) via 0040d05a370bb8507cf2872dc808d3fdb262038b (commit) via a83004bb92014173573b2dbc393e451f1a4d339c (commit) via 4f98d34c0fe8bb483869678e955881276e5ce257 (commit) via bc8d1205a6e08a036bfb5ad99f191cdbf6f58690 (commit) via ad6b2e8dc16fd4e4295ff53a5d3b61b72e71d59d (commit) via 3e0ccc346ca6f6b758b88cd0d4f09c2e6bdb44e4 (commit) via 65d196036df2f195569c7123df358995db1ca45e (commit) via a9035a52d082924a8380639dcf423437b064a4f0 (commit) via 16add1adb392389c87b30446cc13183d43aae167 (commit) from 3a6a8707c593d063d488e96470fad5492dfd4e84 (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 bdb60e7d19c8a7d5d80e064429a02779cb620a19 Author: Caitlin Goodger Date: Tue May 29 17:32:12 2018 +0000 Bug 17886: Don't show option to add to existing list if there are no lists This patch modifies the page for adding a title to a list so that the "Add to existing list" option doesn't appear if there are no lists defined. TEST PLAN --------- 1) Make sure no lists exist at all. 2) Make there is at least one findable biblio record entered 3) Find that biblio record in the OPAC 4) Click 'Save to your lists' -- Notice that the whole save to list section is there. 5) Apply this patch 6) Click 'Cancel' 7) Click 'Save to your lists' -- Notice you can only add now, which makes sense. 8) Run koha qa test tools. Perform the same tests in the staff client. Signed-off-by: Maryse Simard Followed the test plan and the patch works. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit b6010314dfed0f35c87de1a6c8209cd3e8f8b3c8) Signed-off-by: Fridolin Somers commit a876da7c054a7c31adfd05ec090c0de2f341ff27 Author: Nick Clemens Date: Thu Jun 14 14:20:44 2018 +0000 Bug 20945: Escape SQL parameters when constructing download links TO test: 1 - Create a report that takes a parameter 2 - Enter a parameter containing '%' 3 - Attempt to download report, note link is misconstructed 4 - Apply patch 5 - Reload 6 - Note URL is now correct Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 0557c0fd9c468fb32011897318fb239dcdc30bc8) Signed-off-by: Fridolin Somers commit 0040d05a370bb8507cf2872dc808d3fdb262038b Author: Marcel de Rooy Date: Thu May 3 12:33:19 2018 +0200 Bug 20697: Bind calling GetAnalyticsCount to pref EasyAnalyticalRecords If you do not use the EasyAnalyticalRecords feature (introduced with bug 5528), you will have a lot of warnings in zebra-output.log like: zebrasrv(1096) [request] Search biblios ERROR 114 1 1+0 RPN @attrset Bib-1 @attr 1=8911 259186 They come from C4::Items::GetAnalyticsCount called by catalogue/detail.pl. This sub starts a Zebra search on index 'hi' (Host-Item-Number). If you do not use this field at all (related to 773$9 in MARC21), Zebra returns an Unsupported Use attribute error (114). In making this change, I added one minor change: [1] Remove the commented GetAnalyticsCount in additem.pl and correcting indentation in that loop (removing tabs). So no change at all there. NOTE: I will propose to bind the GetHostItemsInfo call in detail.pl and two other scripts to this preference too on report 20702. Test plan: [1] If you use EasyAnalytics, verify that there is no change. [2] If you do not, check the zebra-output.log. You should no longer see searches for Host-Item-Number with 1=8911. (As well as ERROR 114 on this index.) Signed-off-by: Marcel de Rooy Signed-off-by: Charles Farmer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 6ad2c1402fa3a8d419a357233a6e4ad19e58a3db) Signed-off-by: Fridolin Somers commit a83004bb92014173573b2dbc393e451f1a4d339c Author: Owen Leonard Date: Mon Jun 18 18:29:57 2018 +0000 Bug 17869: Don't show pick-up library for list of holds in OPAC account when there is only one branch This patch modifies the user summary page in the OPAC so that the "pick up location" column isn't shown in the table of holds if there is only one library defined. To test, apply the patch and log into the OPAC as a user with one or more holds. - In a system with more than one library defined the "Holds" tab of opac-user.pl should show a "Pick up location" column. - In a system with only one library defined there should be now "Pick up location" column. Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 9d96e2142140b8184e77da038fde51c0f7000c87) Signed-off-by: Fridolin Somers commit 4f98d34c0fe8bb483869678e955881276e5ce257 Author: Nick Clemens Date: Thu Jun 7 14:03:11 2018 +0000 Bug 20893: batchRebuildItemsTables.pl has incorrect parameter To test: 1 - run batchRebuildItemsTables.pl with a valid biblionumber perl /usr/share/koha/bin/batchRebuildItemsTables.pl --where biblio.biblionumber=38483 -c 2 - Note it says 'undefined biblionumber 3 - Apply patch 4 - Do it again 5 - It works! Signed-off-by: Katrin Fischer Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 737702f9756f89f6f75b2a3323e03738234fa143) Signed-off-by: Fridolin Somers commit bc8d1205a6e08a036bfb5ad99f191cdbf6f58690 Author: Julian Maurice Date: Mon Jun 25 14:58:17 2018 +0200 Bug 16653: (QA follow-up) Avoid a warning and remove unused variables Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 73f37b3a561efe61832bde372ffc42fb9dd47f54) Signed-off-by: Fridolin Somers commit ad6b2e8dc16fd4e4295ff53a5d3b61b72e71d59d Author: Jonathan Druart Date: Thu Jun 7 11:47:46 2018 -0300 Bug 16653: Display number of checkouts when exporting 'Most-circulated items' as CSV reports/cat_issues_top.pl does not export "Count of checkouts" column as CSV To replicate: 1/ Make sure that test instance has circulation in a given date range 2/ Go to Home ? Reports ? Most-circulated items 3/ Select a date range 4/ Select 'To screen into the browser' radio button, click submit. 5/ Note that Columns 'Rank/Biblioitemnumbers', 'Global' and 'Count of checkouts' appear in screen output. 6/ Click the browser's back button 7/ Change output to 'To a file', click submit. Without this patch: the columns "100/", "Global" and "Total" are exported to the CSV file. "100/" contains the rank, "Global" is still global, and the "Total" column is empty. With this patch patch applied, the last column is filled and the "Total" line is removed (This script is really dirty) Signed-off-by: Pierre-Luc Lapointe (Yes it is) Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 5bb6b6581c9385d693194338db3e7865d2c28409) Signed-off-by: Fridolin Somers commit 3e0ccc346ca6f6b758b88cd0d4f09c2e6bdb44e4 Author: Josef Moravec Date: Fri Jun 8 09:43:13 2018 +0000 Bug 20903: Remove unnecessary category code parameters Test plan: 0) Do no apply the patch 1) Have only one adults patrons category defined 2) Add a fine to child patron and pay it 3) Try to print the payment receipt (file printfeercpt.pl) 4) You see only ISE 5) Apply the patch 6) Try the printing again 7) Now you should see right receipt Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 5f03b21cf3a7141dc0f2ae2b1922505d55d4cd34) Signed-off-by: Fridolin Somers commit 65d196036df2f195569c7123df358995db1ca45e Author: Jonathan Druart Date: Tue Jun 26 12:37:19 2018 -0300 Bug 20998: Simplify the conditional statement Signed-off-by: Jonathan Druart Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit d874e52cdc6bcb20ee12885b9ecec0f339d315db) Signed-off-by: Fridolin Somers commit a9035a52d082924a8380639dcf423437b064a4f0 Author: Nick Clemens Date: Tue Jun 26 15:02:02 2018 +0000 Bug 20998: Only perform quicksearch if patron found with cardnumber This patch makes sure we have a patron before we try to access their branchcode and allows search to work To recreate: 1 - Enable 'IndependentBranches' 2 - Setup a patron with all permissions, but not a superlibrarian 3 - Login to staff client as that patron 4 - Click 'Patrons' in the toolbar and try a search 5 - Internal server error 6 - Apply patch 7 - Try the search again 8 - Success! Signed-off-by: Jonathan Druart Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 3afc24c776a30fc510c23177548b8b26fd44c4c7) Signed-off-by: Fridolin Somers commit 16add1adb392389c87b30446cc13183d43aae167 Author: Jonathan Druart Date: Fri Jun 29 09:53:27 2018 -0300 Bug 21019: Fix display of patron's address on reserve pop-up on returns.pl Caused by commit 2b90ea2cb0e5e976de7ddef0151ae83d8ac578e6 Bug 17829: Move GetMember to Koha::Patron address variable has been replaced by boraddress (wrong resolution conflict?) It does not affect master (thanks bug 18789) Test plan: Confirm the address of the patron with a hold placed on the item is now displayed when this item is checked in Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: catalogue/detail.pl | 2 +- cataloguing/additem.pl | 26 +++--- circ/returns.pl | 4 +- .../prog/en/includes/reports-toolbar.inc | 2 +- .../en/modules/virtualshelves/addbybiblionumber.tt | 86 ++++++++++---------- .../bootstrap/en/modules/opac-addbybiblionumber.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 14 ++-- members/member.pl | 9 +- members/printfeercpt.pl | 6 -- misc/batchRebuildItemsTables.pl | 2 +- reports/cat_issues_top.pl | 17 +--- 11 files changed, 77 insertions(+), 93 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jul 4 18:12:03 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 04 Jul 2018 16:12:03 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.07-40-gb77b44d Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.11.x has been updated via b77b44da60b7b3f67c4fc33e425d8cbb635643ca (commit) via df99d46404ed261c4299bb440e9c8fffcd2dcd32 (commit) via 17ab7fcff93a94cec4ca39990b29fa574c29190b (commit) via 9c8dd886ddf466b33094d9faacfa29f4089efe93 (commit) via fb93142610a9b812982d37349a6ba22ea49a0ec1 (commit) via cd1f2dcd2433e62ac22e541496df0a75a865d32f (commit) via 80cf14bda0b6bd43e43e9d5b1c8cf5ed14a6fd4f (commit) via 015270c1be46c2227fdb58e41b7aab64cfd5dd53 (commit) via 6ee5204293ae8a1712bb12c622b750ce2bd32d1c (commit) via 39575212fd06643442fc7d7270505e7c12936774 (commit) via f0b6b4553bfadf754916be32b6b362bf61b4c83f (commit) via 3b92a5eb4f04edd2de71d4e7437452ca76ce0b50 (commit) via 459e6b7486944337f96d281392481a360be631f5 (commit) via 44217a1e1fddaf735e0b4e0126c0fabff4bf7f5b (commit) via df373dc6886eb20d1a5e76d07e7005216de2cba8 (commit) from bdb60e7d19c8a7d5d80e064429a02779cb620a19 (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 b77b44da60b7b3f67c4fc33e425d8cbb635643ca Author: Katrin Fischer Date: Fri May 11 07:52:51 2018 +0200 Bug 20709: (follow-up) Update GERMAN MARC frameworks to Update 26 (April 2018) A follow-up in line with bug 20710. Again, the files used here have been generated automatically from the po files on translate.koha-community.org. To test: - Make sure the de-DE installer can install all mandatory files cleanly. Signed-off-by: Bernardo Gonzalez Kriegel Tested using de-DE installer, all files load Ok No errors Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit c058a4a4858d5c03841b88ba65d232a03046304d) Signed-off-by: Fridolin Somers commit df99d46404ed261c4299bb440e9c8fffcd2dcd32 Author: Katrin Fischer Date: Thu May 3 22:32:26 2018 +0000 Bug 20709: Update GERMAN MARC frameworks to Updates 23+24+25 (Nov 2016, May and Dec 2017) Translation of bibliographic and authority frameworks can be done using translate.koha-community.org. Updated and translated files will then be provided for download. See: http://lists.koha-community.org/pipermail/koha-translate/2018-April/002721.html To test: - Verify SQL is correct and frameworks load without problem Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 3f1f212553a329a5fbda51e2746fac91ec4fc37c) Signed-off-by: Fridolin Somers commit 17ab7fcff93a94cec4ca39990b29fa574c29190b Author: Katrin Fischer Date: Sat Apr 28 20:54:14 2018 +0000 Bug 19835: (follow-up) Correct formatting in a few places In some places - was used insted of --, changed for consistency with existing descriptions. Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 1b8b3a7390f785b2fda403e679a1b34a730327c3) Signed-off-by: Fridolin Somers commit 9c8dd886ddf466b33094d9faacfa29f4089efe93 Author: Bernardo Gonzalez Kriegel Date: Thu Apr 26 12:36:35 2018 -0300 Bug 19835: Fix MARC21 frameworks revision date This followup updates revison number and date Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 77159706ca0226dccc56c2c50c161b5bd37e64ad) Signed-off-by: Fridolin Somers commit fb93142610a9b812982d37349a6ba22ea49a0ec1 Author: Bernardo Gonzalez Kriegel Date: Thu Apr 26 10:52:50 2018 -0300 Bug 19835: Fix repeatability on MARC21 subfields This followup fixes all repeatability cases, from updates 23+24+25 and a few older ones. To test: 0) Apply both patches 1) Remove all your frameworks 2) Check mandatory bibliographic and authority files load without problem 3) Check repeatability... Bibs and auth frameworks checked against LOC description. Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit c1f916c1aa6e4937eca2dcf5b6493368d18cbcae) Signed-off-by: Fridolin Somers commit cd1f2dcd2433e62ac22e541496df0a75a865d32f Author: Bernardo Gonzalez Kriegel Date: Wed Apr 25 23:57:40 2018 -0300 Bug 19835: Update MARC frameworks to Updates 23+24+25 (Nov 2016, May and Dec 2017) There are a bunch of updates, summary below 1) Update 23 1.a) Bibs New fields: 647 885 New subfields e in 752 0 in 257 377 3 in 382 4 in 752 Changes 028 redefined a renamed in 028 b renamed in 046 d renamed in 046 1.b) Auth New Fields: 075 147 447 547 677 747 885 New Subfields: 0 in 377 2) Update 24 2.a) Bibs New subfields b in 567 g in 340 i in 370 386 0 in many fields 2 in 567 3 in 370 4 in 370 386 Changes g renamed in 370 4 'Relationship code' -> 'Relationship' many fields 4 'Relator code' -> 'Relationship' many fields 2.b) Auth New subfields i in 370 386 0 in 050 052 053 055 060 065 070 080 087 3 in 370 4 in 370 386 Changes g in 370 4 'Relationship code' -> 'Relationship' many fields 4 'Relator code' -> 'Relationship' in 371 3) Update 25 3.a) Bibs New fields: 758 New subfields r in 777 u in 777 z in 777 1 in many fields Changes d renamed in 111 611 711 811 s repeatable in many fields 3.b) Auth New subfields 1 in many fields Changes d in 111 411 511 711 s repeatable in many fields For more detail: Update 23 bibs https://www.loc.gov/marc/up23bibliographic/bdapndxg.html auth https://www.loc.gov/marc/up23authority/adapndxf.html Update 24 bibs https://www.loc.gov/marc/up24bibliographic/bdapndxg.html auth https://www.loc.gov/marc/up24authority/adapndxf.html Update 25 bibs https://www.loc.gov/marc/bibliographic/bdapndxg.html auth https://www.loc.gov/marc/authority/adapndxf.html To test: 1) Remove all your frameworks 2) Check mandatory bibliographic and authority files load without problem 3) Check new fields/subfields Repeatability checks on followup Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 5d79a95226d71482a1070e994746785ec7278542) Signed-off-by: Fridolin Somers commit 80cf14bda0b6bd43e43e9d5b1c8cf5ed14a6fd4f Author: Owen Leonard Date: Tue May 22 16:29:09 2018 +0000 Bug 20793: (follow-up) Add style to the non-link hold count on detail page This small follow-up changes the style on the bibliographic detail page of the hold count so that it looks similar whether it's a link to holds or not. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 05e612525bf8d92562ae9e17904a974913819125) Signed-off-by: Fridolin Somers commit 015270c1be46c2227fdb58e41b7aab64cfd5dd53 Author: Katrin Fischer Date: Sun May 20 02:42:28 2018 +0200 Bug 20793: Don't show a holds link in staff for users without permission On the results list in staff the 'Holds (x)' link always shows independent of the permissions of the staff user. This patch tightens the permission checks on the result page to explicitly check for the place_holds permission. To test: - Create a staff user with place_holds permission - Check the result list, you should see 2 links to the holds page: - 'Place holds' on top of the results list - 'Holds (x)' at the bottom of each entry in the results list - Verify both links work - Create a staff user without place_holds_permission - Without the patch you'll see the second link, but it will lead to a permission error - With the patch you'll still see the 'Holds (x)', but it will no longer be a link. - Go to the detail page of a record with an existing hold. - Repeat test with both staff users. - One time the Hold information in the bibliographic information should show as a link, the other time as a simple text. Displaying the information about existing holds still make sense as this is the current beheviour. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit e98d4d30cad78715e613f833ed2356070f9985ad) Signed-off-by: Fridolin Somers commit 6ee5204293ae8a1712bb12c622b750ce2bd32d1c Author: Owen Leonard Date: Tue Jun 26 15:17:21 2018 +0000 Bug 20999: Remove invalid 'style="block"' from OPAC templates This patch removes an invalid attribute from OPAC template markup. There should be no visible change to the OPAC. To test, apply the patch and confirm that the following pages still look correct when using various cover image sources: Coce, Amazon, Google: - Bibliographic detail page (opac-detail.pl) - The shelf browser - Catalog search results - Recent comments Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit d7ae1d65a461ed9f5052d45f3069a30f671660f1) Signed-off-by: Fridolin Somers commit 39575212fd06643442fc7d7270505e7c12936774 Author: Mirko Tietgen Date: Fri Jun 29 22:25:33 2018 +0200 Bug 20920: (follow-up) generated d/control Signed-off-by: Mirko Tietgen Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit da51f6bcc9eb2bff48da2d7ca0efb7b791c62192) Signed-off-by: Fridolin Somers commit f0b6b4553bfadf754916be32b6b362bf61b4c83f Author: J?r?me Charaoui Date: Wed Jun 20 14:25:20 2018 -0400 Bug 20920: Add missing dependency on CGI::Compile Signed-off-by: Mirko Tietgen Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 3b02a8d2da4b3a20bc3a4970b537066ff389b959) Signed-off-by: Fridolin Somers commit 3b92a5eb4f04edd2de71d4e7437452ca76ce0b50 Author: Mirko Tietgen Date: Tue May 15 13:58:03 2018 +0200 Bug 20693: Update control file Auto-generated file. Signed-off-by: Mirko Tietgen Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 2a6cad2fa9d8e4419be7538949b4ce9a758d0e9b) Signed-off-by: Fridolin Somers commit 459e6b7486944337f96d281392481a360be631f5 Author: Mirko Tietgen Date: Tue May 15 13:47:10 2018 +0200 Bug 20693: Plack fails, because 'libcgi-emulate-psgi-perl' package is not installed Add CGI::Emulate::PSGI to PerlDependencies.pm Signed-off-by: Mirko Tietgen Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit f9e06c38495ad9b7c14a9866414c229da92833db) Signed-off-by: Fridolin Somers commit 44217a1e1fddaf735e0b4e0126c0fabff4bf7f5b Author: Owen Leonard Date: Mon Jun 25 14:54:08 2018 +0000 Bug 20559: Occurrences of loading-small.gif still exist This patch removes some leftover references to a file which no longer exists. In the OPAC, loading-small.gif was included in CSS which was never used. In the staff client, loading-small.gif should have been corrected to spinner-small.gif. To test, apply the patch and go to Tools -> Batch record modification. - Submit a batch of records to modify - In the table of titles which will be modified, click the 'Show MARC' button. - The modal preview window should show "Loading" and an animated spinner before the MARC record is loaded. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 6f047049ca973fe2cf02c7ce124fec0366c3f4fd) Signed-off-by: Fridolin Somers commit df373dc6886eb20d1a5e76d07e7005216de2cba8 Author: Jonathan Druart Date: Tue Jun 26 13:04:01 2018 -0300 Bug 20991: Do not lost patron's category when editing a patron If there is an error in the edit patron form the patron's category is lost. This seems to be a long standing bug. Test plan: - Edit an existing patron - Change the patron category to a category that triggers the error that the user is not in the right age range for that new category - Save, error is triggered => Without this patch the patron category has been reset You should also test different ways to edit/add a patron (quick add, step 1) Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit b3cd4a382ffad36668164749dafb58d48c00d7f1) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 10 + debian/control | 4 + .../marc21/mandatory/authorities_normal_marc21.sql | 378 ++++++++++++++------ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 302 ++++++++++++---- .../optional/marc21_simple_bib_frameworks.sql | 8 - .../marc21/mandatory/authorities_normal_marc21.sql | 374 +++++++++++++------ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 270 ++++++++++---- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 3 +- .../prog/en/modules/catalogue/detail.tt | 6 +- .../prog/en/modules/catalogue/results.tt | 10 +- .../en/modules/tools/batch_record_modification.tt | 2 +- .../bootstrap/en/includes/shelfbrowser.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +- .../bootstrap/en/modules/opac-showreviews.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 24 -- members/memberentry.pl | 2 +- 17 files changed, 994 insertions(+), 411 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jul 6 16:48:36 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 06 Jul 2018 14:48:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-209-g68ff870 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 68ff8702e09be9879d508ea82c0ef7fab53c0ee9 (commit) via 3f85c9b16b43a98c75f7344cfa389b38c56be022 (commit) via aabb3350cad7873b4d83240f7a07ab410fb3d9f2 (commit) via fba064838403961cffaaaa95bd7c41bd4c98c678 (commit) via 200a468a9c4a75f48ef2fbe77af03c497347c79f (commit) via 8e58b0396676ee2690857a00aeb786cf64657a52 (commit) via 4967a3150a65b9b8dbff5352eb837442b951a9bf (commit) via 6403070e63c80624c17d1e90557b4d0f2c078c6b (commit) via 32fd93ed6f11b371f3d6efa780b4f36644629837 (commit) via e1c9386bd8a7b9e5e124525c7df9612e2cde5adf (commit) via adfdd3b21f821953d4f07145ef3a1e9ab79be0cf (commit) via 948704964073dd8dea146d959ad5ed690ccafe67 (commit) via 46b09129c0e0df801d0dd6f526911506a0d36f93 (commit) via fcd3965fb5f6a5fb0d8830e884dd0ecf5de75af5 (commit) via 95d8ceef98f5c1242a54dd701c49e7a41bd34721 (commit) via cdd956bc5fbabd9fe5bd79aa1d57a9acf1ba3753 (commit) via 175a4037f72186d9b422e2b9ab4b4224df006f7e (commit) via 3c887b4e07acf9459767a7b934aa4f6c16cae534 (commit) via 18c0eb1301440c20acb657ef553beed0feaf5d0e (commit) via 60e40ba573b9ea5b7db3fe2a3fed31a2d3991849 (commit) via a943a924edff7db28495b0c92341f5357ad952ce (commit) via 64761e56ccfbf98844d2fc8c7aa68ee608a2b162 (commit) via 8a83f1e1a975368c006c698f94357975333fd2d6 (commit) via 65aacc1b1ded569a259f45c3abd5d1a73c3f37e6 (commit) via 7b6c242d972e3edf5b4d75d6023a0ae1dc9d1f9d (commit) via cc30dc39bf3c8f627865c1a4891fac534266dc03 (commit) via f7ed22d25372bb7a68dcbf1a744b81aeb8657b0a (commit) via b8cae8e5b85aa0bdef7783e39343eedf5a123e9f (commit) via 59a9e5502dd18db47333fa304ba5c11df32b807f (commit) via a13061ee4b1f515bc91b6842773d0d9bae6be461 (commit) via a66542d67ba2cd6edb582055d38b1d577dd1be32 (commit) via 04cc45bb520b4621af84d3d13b7933f91222c1e4 (commit) via 1a41e5ef14c9b706ddad3afaddcc6a5f5242ba35 (commit) via f69e62ff9fbe2958fbb9720a8d914df4566244ab (commit) via 977c1a73e883b5e9ed1c6fe33eb26f33c439b3b5 (commit) via 2c5413f36a353fbacdfdd7ce17f5b294fa026207 (commit) via 9864b805f4986b439551d10e45b8673d2e4c487e (commit) via e9f12b6baac366195a7666bf2d521c61a2851131 (commit) via 2479a70a810973ddec2ad67f4638cb9273829912 (commit) via 8c5fd0dec1a0802c8714cb9ecc966f481fe45d7e (commit) via 455c254ee01095d574ff1a26171ec4cca251b7b5 (commit) via 462ec9601a43c31ccb12f010b4bddc80dcb71344 (commit) via 72058d27415a82799d9f6acac693e94dc7bf9309 (commit) via 158e50d0bcf214932fb1ca037049e6515fbbd80c (commit) via d212eb4026c8543c6f1adc9871d96233618173bf (commit) via b3cd3855b912cd7bfc9b10f1163a34d09be4f5e0 (commit) via b0cb7f44ef80d5f6a3d45ce87543a27637c68c6f (commit) via 0e45263492dbd8123bf2507aad6dc45d95c4902c (commit) via 302224798333eee6a67822f994474a2263a75de9 (commit) via 505630ca081c93fa81f1f6b85573374be8ee1009 (commit) via 0cf594c3ad0b1e3aae2af14cbfe16bdbd2462318 (commit) from 1f818e67387488e06a106398994bccca2fadc698 (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 68ff8702e09be9879d508ea82c0ef7fab53c0ee9 Author: Tomas Cohen Arazi Date: Mon Jul 2 15:30:57 2018 -0300 Bug 19617: (QA follow-up) Fix typo for type Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit 3f85c9b16b43a98c75f7344cfa389b38c56be022 Author: Kyle M Hall Date: Mon Apr 30 12:47:26 2018 -0400 Bug 19617: Allow 'writeoff of selected' This patch adds a writeoff equivilent to 'Pay selected' Test Plan: 1) Apply this patch 2) Find a patron with fines 3) On the "Pay fines" tab, select one or more fines and use the "Write off selected" button. 4) Note the fine amount you used was written off for those fines. Signed-off-by: Kyle M Hall Signed-off-by: Martha Fuerst Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens commit aabb3350cad7873b4d83240f7a07ab410fb3d9f2 Author: Nick Clemens Date: Fri Jul 6 14:25:20 2018 +0000 Bug 12395: (RM follow-up) Make updatedatabase statements idempotent Signed-off-by: Nick Clemens commit fba064838403961cffaaaa95bd7c41bd4c98c678 Author: Nick Clemens Date: Fri Jul 6 14:19:22 2018 +0000 Bug 12395: DBRev 18.06.00.005 Signed-off-by: Nick Clemens commit 200a468a9c4a75f48ef2fbe77af03c497347c79f Author: Julian Maurice Date: Fri Jun 8 10:24:19 2018 +0200 Bug 12395: Add FK constraint and use patron-title.inc Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 8e58b0396676ee2690857a00aeb786cf64657a52 Author: Katrin Fischer Date: Mon Apr 16 21:10:15 2018 +0000 Bug 12395: (QA follow-up) Change wording for consistency and fix use CGI; Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 4967a3150a65b9b8dbff5352eb837442b951a9bf Author: Owen Leonard Date: Thu Dec 3 13:01:46 2015 -0500 Bug 12395: Use standard
+
    markup for showorder.tt Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 6403070e63c80624c17d1e90557b4d0f2c078c6b Author: Katrin Fischer Date: Sun Oct 25 12:32:45 2015 +0100 Bug 12395: (QA follow-up) Add class/id to body tag Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 32fd93ed6f11b371f3d6efa780b4f36644629837 Author: Alex Arnaud Date: Tue Jun 16 10:05:16 2015 +0200 Bug 12395: Make received orders table consistent with pending orders table (links of More column) Also change "Created by" with "Ordered by" in receive page. Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit e1c9386bd8a7b9e5e124525c7df9612e2cde5adf Author: Jonathan Druart Date: Fri Feb 20 11:31:52 2015 +0100 Bug 12395: Display created_by even if firstname is missing on receiving On receiving orders, "no name" was displayed if the firstname of creator was not filled. The surname should be displayed. Signed-off-by: Paola Rossi Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit adfdd3b21f821953d4f07145ef3a1e9ab79be0cf Author: Julian Maurice Date: Tue Feb 10 10:23:25 2015 +0100 Bug 12395: Add unit test to check created_by is correctly set Signed-off-by: Paola Rossi Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 948704964073dd8dea146d959ad5ed690ccafe67 Author: Julian Maurice Date: Mon Jun 9 16:15:17 2014 +0200 Bug 12395: Save order line's creator New MySQL column: aqorders.createdby Creator's name is displayed on order's receive pages (acqui/orderreceive.pl and acqui/parcel.pl) On acqui/orderreceive.pl it replace the name of basket's creator On acqui/parcel.pl, to avoid adding more data in the table of pending orders, it is shown in a popup like MARC and Card views Test plan: 1/ Run updatedatabase.pl 2/ Create a new order and go to the receipt page (acqui/parcel.pl) 3/ Click on "Order" link in column "More" (previously "View record") 4/ A javascript popup should appear with your name in it. Close the popup. 5/ Click on "Receive" link 6/ Your name should appear in front of "Created by" label, to the right of the page. Patch updated with use of atomic update. Signed-off-by: S?verine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 46b09129c0e0df801d0dd6f526911506a0d36f93 Author: Owen Leonard Date: Tue Jun 19 10:02:26 2018 -0300 Bug 20650: Remove unused virtualshelves/merge.tt Committed by Jonathan Druart, get out from first patch of this patchset. It's a follow-up of bug 4019 which removed virtualshelves/merge.pl Moving this change to its own commit to make it clear in the git log and easier to backport if needed. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit fcd3965fb5f6a5fb0d8830e884dd0ecf5de75af5 Author: Owen Leonard Date: Tue Jun 19 12:45:07 2018 +0000 Bug 20650: (follow-up) Add missing include file This patch adds a missing include of doc-head-open.inc. To test, apply the patch and export a batch of patron cards. The modal view for downloading the card batch PDF should work correctly. Validating the iframe's source should show no relevant errors. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 95d8ceef98f5c1242a54dd701c49e7a41bd34721 Author: Owen Leonard Date: Tue Apr 24 13:37:07 2018 +0000 Bug 20650: Switch single-column templates to Bootstrap grid: Various, part 3 This patch updates various unrelated templates to use the Bootstrap grid. In each case, confirm that the indicated page looks correct. This patch also corrects a couple of capitalization errors and removes an unused template: virtualshelves/merge.tt. - Tools -> Patron card creator -> Manage -> Card batches - Export a batch - The pages inside the modal window should look correct: Both the "X batch(es) to export" screen and the "download exported batch(es)" one. - Tools -> Patron lists -> Edit list - The patron list add/edit form should look correct. - Disable plugins in koha-conf.xml. - Tools -> Plugins - The "Plugins disabled" page should look correct. - Enable plugins in koha-conf.xml - Tools -> Plugins -> Upload plugins. - This page should look correct. - Tools - The tools home page should show three columns: Patrons and Circulation, Catalog, Additional tools. - At viewport width below 768 pixels content should reflow into one column. - virtualshelves/merge.tt has been removed as it is unused. Search the codebase for references to it. There should be none. Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit cdd956bc5fbabd9fe5bd79aa1d57a9acf1ba3753 Author: Owen Leonard Date: Mon Apr 23 18:26:14 2018 +0000 Bug 20641: Switch single-column templates to Bootstrap grid: Various, part 2 This patch updates various unrelated templates to use the Bootstrap grid. In each case, confirm that the indicated page looks correct. - Acquisitions -> Vendor -> Add to basket -> From a staged file. - Logged-in user menu (in the upper right) -> Search history. - With plugins disabled in koha-conf.xml, go to Tools -> Tools plugins. - With the EasyAnalyticalRecords system preference set to 'Display,' view a bibliographic record. - Choose Edit -> Link to host item. - Submit a barcode to be linked. - Configure a MARC subfield (e.g. 100$a) to use the unimarc_field_225a_bis plugin. From the MARC edit page, trigger the plugin and confirm that the page in the popup window looks correct. Confirm that changes made in the popup window are saved to the corresponding field in the editor. - Administration -> Funds -> Edit a fund. - Click 'Select owner.' - Search for a patron. Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 175a4037f72186d9b422e2b9ab4b4224df006f7e Author: Owen Leonard Date: Wed Apr 25 18:07:42 2018 +0000 Bug 20220: Move template JavaScript to the footer: Holds This patch modifies the holds template so that JavaScript is included in the footer. To test, apply the patch and initiate the process of placing a hold. Throughout the process JavaScript-based interactions should work: Patron autocomplete, datepickers, DataTables, cancel confirmations, etc. Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 3c887b4e07acf9459767a7b934aa4f6c16cae534 Author: Owen Leonard Date: Tue May 8 13:45:37 2018 +0000 Bug 19709: Move template JavaScript to the footer: Labels This patch modifies the staff client label creator templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. This patch also modifies the templates to use the Bootstrap grid instead of YUI, and removes obsolete "text/javascript" attributes from