From gitmaster at git.koha-community.org Fri Feb 2 09:58:02 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Feb 2018 08:58:02 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.08-45-g9b22031 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 9b220314b2a85130ef8df86948b3eb0a2ba77460 (commit) via 7084f4689543470ecdee3b13588a5ea425bee62e (commit) via 3097ef634eef46d20ea379be37a19fa08c53a6d0 (commit) via 761b3c7699f744dde172be368c8cde92b6060e87 (commit) via 772275440e79d9ee00ba998df6e8f5a18ce9d591 (commit) via 5af0142725ea7d6b53963faf72815b2b4a0f4be7 (commit) via e114bed04bb18133988cfbd81330406e0ba4fec3 (commit) via ee225fd477fd28dd4d47de525563b60566ba0403 (commit) via cac9c271b849459b159c0595e4ad16ce6c0c7a81 (commit) via 30d1c0365ae5efbab5fefda158566b2e285aa039 (commit) from d635ed5c8c610958dd934a6681d8ca517864d99b (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 9b220314b2a85130ef8df86948b3eb0a2ba77460 Author: Jonathan Druart Date: Wed Dec 20 20:29:29 2017 -0300 Bug 15770: Do not format numbers if too big At several places we got the following error if we use numbers too big for Number::Format Template process failed: undef error - round() overflow. Try smaller precision or use Math::BigFloat at /home/koha/src/Koha/Number/Price.pm line 44 It make the app explodes. The goal here is to handle these errors gracefully and easily. Test plan: - Add a manual fine to a patron of 100000000000000 - Create a patron category with an enrolment fee of 123456789012345 Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 937237a1f29192c8be73fbcc3cd7e29c40468831) Signed-off-by: Fridolin Somers commit 7084f4689543470ecdee3b13588a5ea425bee62e Author: Olivier Crouzet Date: Mon Jan 15 17:22:22 2018 +0100 Bug 19971: Typo in the comments of parseQuery routine TEST PLAN --------- 1) Run these commands: git checkout master git pull perldoc C4::Search 2) look for parseQuery -- NOTE: The sample code provided below this heading has the wrong function name! 3) Run these commands: git checkout -b bug_19971 origin/master perldoc C4::Search 4) look for parseQuery -- NOTE: The wrong function name is corrected. 5) Run koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 431d315534c9f41d4418b528bf9b78970f235a46) Signed-off-by: Fridolin Somers commit 3097ef634eef46d20ea379be37a19fa08c53a6d0 Author: Te Rauhina Jackson Date: Tue Jan 16 21:21:21 2018 +0000 Bug 19221: Onboarding tool says user needs to be made superlibrarian I changed the "To give new patron superlibrarian permissions go to:" message to "To edit patron permissions, go to:". Please clarify if this is clearer or not. Test plan: 1) Apply patch 2) Go through the web installer 3) At the create koha administrator patron step, notice that at the bottom, there is a message saying "To edit patron permissions, go to:" Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 42ff4bfca63da3e4e8df39b4f6bce703f7cc9213) Signed-off-by: Fridolin Somers commit 761b3c7699f744dde172be368c8cde92b6060e87 Author: Josef Moravec Date: Sun Dec 17 08:45:41 2017 +0000 Bug 19825: Make links to biblios on pending offline circulation page working again 0) Do not apply the patch 1) Have pending offline circulation operations - you can use standalone application, Firefox add-on or built-in offline circulatin client - it does not matter in this case 2) Go to Circulation -> pending offline circulation actions 3) You see all barcode in red and without links - even if the item and biblio existed 4) Apply the patch 5) Repeat 1-3, now you should see the links to biblio on existing items Note: Don't add non-existent barcodes actions and payment actions unti bug 19771 is not fixed Signed-off-by: Charlotte Cordwell Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 14a3e2fddf031aca6b76d69122464412c461c5f9) Signed-off-by: Fridolin Somers commit 772275440e79d9ee00ba998df6e8f5a18ce9d591 Author: Grace Smyth Date: Tue Jan 16 03:41:15 2018 +0000 Bug 19839: Removed Warning (invoice.pl - uncertainprices) Test Plan [1.] Check the patch to see that I have removed: $template->param( uncertainprices => 1 ); from line 204 as Mr Druart has instructed to do (to get to the patch see the comment above by Mr Druart) Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit db7e3a41b15829a11d9f4465c95e36c7fd3eb735) Signed-off-by: Fridolin Somers commit 5af0142725ea7d6b53963faf72815b2b4a0f4be7 Author: Fridolin Somers Date: Fri Feb 2 09:18:16 2018 +0100 Bug 17682: DBRev 17.05.08.002 Signed-off-by: Fridolin Somers commit e114bed04bb18133988cfbd81330406e0ba4fec3 Author: Jonathan Druart Date: Fri Jan 19 15:26:32 2018 -0300 Bug 17682: Replace 2 occurrences in de-DE and nb-NO Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 7b4b8699a69df4d4c6e0bedd421e385bfdc5dcee) Signed-off-by: Fridolin Somers commit ee225fd477fd28dd4d47de525563b60566ba0403 Author: Charlotte Cordwell Date: Tue Jan 16 20:14:20 2018 +0000 Bug 17682: (follow-up) Change URL for Google Scholar in OPACSearchForTitleIn Amended the sql statement so it only affects the http://www.scholar.google.com url Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 5bf7600456aa66c1984ba7e8f2d781f468f23b6e) Signed-off-by: Fridolin Somers commit cac9c271b849459b159c0595e4ad16ce6c0c7a81 Author: Charlotte Cordwell Date: Tue Jan 16 03:55:49 2018 +0000 Bug 17682: Change URL for Google Scholar in OPACSearchForTitleIn 1)apply patch 2) go into administration --> search for OPACSearchForTitleIn 3) *click to edit* 4) look at the link and read the google scholar one. 5) check that the start link is https://scholar.google.com. 6) http://www.scholar.google is incorrect Signed-off-by: Claire Gravely Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 17a0a796bb3349f175ae82fa8a7ba05eb614391c) Signed-off-by: Fridolin Somers commit 30d1c0365ae5efbab5fefda158566b2e285aa039 Author: Mirko Tietgen Date: Tue Jan 23 11:43:10 2018 +0100 Bug 20072 - Fix build-git-snapshot for Debian source format quilt With bug 18696 we need a few tiny changes to build-git-snapshot: - Debian revision number for debian/changelog - "orig" in the file name for the tar.gz archive Signed-off-by: Mirko Tietgen Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 2 +- Koha.pm | 2 +- Koha/Number/Price.pm | 5 +++++ acqui/invoice.pl | 1 - debian/build-git-snapshot | 4 +++- installer/data/mysql/de-DE/mandatory/system_preferences.sql | 2 +- .../data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 9 +++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep3.tt | 2 +- t/Number/Price.t | 4 +++- 12 files changed, 27 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 2 10:58:22 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Feb 2018 09:58:22 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.08-46-g1c098c3 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 1c098c31dc9b4cd66af930616bff6851e9cd550e (commit) from 9b220314b2a85130ef8df86948b3eb0a2ba77460 (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 1c098c31dc9b4cd66af930616bff6851e9cd550e Author: Jonathan Druart Date: Thu Oct 12 11:19:40 2017 -0300 Bug 19455: Prevent SwitchOnSiteCheckouts.t to fail randomly If categorycode is 'X', the test will fail Signed-off-by: Jonathan Druart (cherry picked from commit 307e55a7debdf5e1c960cbfea443b6b160c0ce9a) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 2 16:17:54 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Feb 2018 15:17:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-362-gf3c6284 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 f3c6284835769dead3e9a8b6e91a14d7620a130c (commit) via b65f1f4c94731c4c35845f2a3db112ea3f5cc843 (commit) via 906563d1ff9dd32b53b38e9b40a316f0570637fc (commit) via e6da42de894a5fde78d804208fa9d8b493dc57c8 (commit) via 58f7214926c62f86e7d5a42e3c38037a8e80263c (commit) via 9215cb7cafb95b7fa21838a7d8ddaf71999ad572 (commit) via 320e66b0438cc752ddc4e21d5c74c226f2e85120 (commit) via 11515d5f76fbc5244df6b5d3b5ff7a6d4f262445 (commit) via b8ffee5f0fad17815027c5c0b85babab515c679e (commit) via 6f5a9c98bcc38d6481be0463747086bfcf705a70 (commit) from bd2d2fd433baeca3d311c403b482c6a2000a6668 (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 f3c6284835769dead3e9a8b6e91a14d7620a130c Author: Marcel de Rooy Date: Thu Jan 18 15:40:15 2018 +0100 Bug 20031: CGI param in list context warn in guided_reports.pl Resolve warn: CGI::param called in list context from package CGI::Compile::ROOT::usr_share_koha_shadowclone_reports_guided_reports_2epl line 794, this can lead to vulnerabilities. [NOTE: line number from older Koha version.] Test plan: Looking at this change should convince you already. Another look at this routine in C4/Output.pm would be bonus. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit b65f1f4c94731c4c35845f2a3db112ea3f5cc843 Author: Julian Maurice Date: Fri Dec 1 15:51:16 2017 +0000 Bug 19730: (follow-up bug 17196) Use biblio_metadata.timestamp in export_records.pl Since bug 17196, biblioitems.timestamp is not always updated after a change in the MARC record. Filtering should be based on biblio_metadata.timestamp instead. REVISED TEST PLAN ----------------- 0. Do not apply patch 1. Find a biblio record, remember the biblionumber for step 3 2. Edit the record, modify a field (e.g. 003, 015$q) that is not mapped to a DB column, so biblio_metadata.timestamp will be modified but not biblioitems.timestamp 3. In MySQL with the koha database selected: > select timestamp from biblio where biblionumber=###; > select timestamp from biblio_metadata where biblionumber=###; -- you'll need to change the ###'s based on the biblionumber you remembered in step 1. -- the two timestamps will differ. -- Remember the timestamp of biblio_metadata for step 4. 4. Run this command: $ sudo koha-shell -c bash kohadev $ export DATE="YYYY-MM-DD HH:mm:SS" -- use the timestamp remembered in step 3. 5. Run this command: $ ./misc/export_records.pl --date="$DATE" $ ls -la koha.mrc -- the file should be 0 bytes. 6. Run this command: $ exit $ git bz apply 19730 $ restart_all $ sudo koha-shell -c bash kohadev $ export DATE="YYYY-MM-DD HH:mm:SS" -- use the timestamp remembered in step 3. 7. Run this command: $ ./misc/export_records.pl --date="$DATE" $ ls -la koha.mrc -- the file should be a lot more than 0 bytes. 8. Run this command: $ /home/vagrant/qa-test-tools/koha-qa.pl -v 2 -c 1 -- this should pass. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 906563d1ff9dd32b53b38e9b40a316f0570637fc Author: Marcel de Rooy Date: Fri Feb 2 12:06:00 2018 +0100 Bug 20126: Add simple test for ModBiblioMarc Just to confirm that we see record length and base address in a record that has been passed through ModBiblioMarc. Test plan: Run the test. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit e6da42de894a5fde78d804208fa9d8b493dc57c8 Author: Marcel de Rooy Date: Fri Feb 2 11:32:49 2018 +0100 Bug 20126: (follow-up bug 10455) Restore MARC field length calculation in ModBiblioMarc Trivial fix. Problem raised by bug 10455. Test plan: [1] Create or edit biblio record. [2] Save and check leader field lengths in MARC view. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 58f7214926c62f86e7d5a42e3c38037a8e80263c Author: Marcel de Rooy Date: Wed Jan 31 13:52:46 2018 +0100 Bug 18198: (QA follow-up) Add tests for GetMarcNotes As requested by the RM, this patch adds a separate unit test for GetMarcNotes. We test MARC21 and UNIMARC. The NotesBlacklist pref is tested and also handling URLs in 5XX$u for MARC21. Test plan: Run t/Biblio/GetMarcNotes.t Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 9215cb7cafb95b7fa21838a7d8ddaf71999ad572 Author: Marcel de Rooy Date: Thu Mar 2 12:59:37 2017 +0100 Bug 18198: MARC21: Further improve handling of 5XX$u in GetMarcNotes Bug 14306 only handled field 555 in MARC21 as an URI. But a lot of other 5XX fields have a $u subfield for URIs; actually $u is not used in any other way. This patch generalizes the change made for 555 and extends it to all 5XX $u. Test plan: [1] Run t/Biblio.t [2] Run t/db_dependent/Biblio.t [3] Edit a MARC21 record. Add a URL into 505u, 520u, 555u. [4] Check presentation on opac-detail (tab Title notes) [5] Check presentation on catalogue/detail (tab Descriptions) Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 320e66b0438cc752ddc4e21d5c74c226f2e85120 Author: Owen Leonard Date: Fri Jan 19 19:41:35 2018 +0000 Bug 20051: Invalid markup in staff client's header.inc This patch corrects markup errors in header.inc which introduced by Bug 19851. For id attributes on s have been replaced with classes, eliminating an HTML validator error about duplicate ids. Minor unrelated change: Updated an element's id with a more descriptive name. Test plan the same as Bug 19851's: - Log in to the staff client and confirm that the appearance of the menu bar at the top of the screen looks correct at various browser widths. - Confirm that the logged-in user menu label and help link expand and collapse according to browser width. Signed-off-by: Charles Farmer Signed-off-by: Nick Clemens Fix for QA: Corrected ID reference in circ/offline.tt Signed-off-by: Jonathan Druart commit 11515d5f76fbc5244df6b5d3b5ff7a6d4f262445 Author: Kyle M Hall Date: Tue Dec 5 10:23:45 2017 -0500 Bug 19750: Overdues without a fine rule add warnings to log When running fines.pl, any overdue items that have no corresponding circulation rule will generate the following warning: Use of uninitialized value $amount in numeric gt (>) at /usr/share/koha/bin/cronjobs/fines.pl line 133. Test Plan: 1) Create a single circ rule 2) Backdate a checkout so it is overdue 3) Delete the circ rule 4) Run fines.pl, note the warning 5) Apply this patch 6) Run fines.pl, note the warning is gone Signed-off-by: Dilan Johnpull? Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit b8ffee5f0fad17815027c5c0b85babab515c679e Author: Nick Clemens Date: Tue Jan 30 14:34:10 2018 +0000 Bug 18497: (follow-up) Chomp newlines in BLOCK To test: Run report Validate results page at: https://validator.w3.org/ Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 6f5a9c98bcc38d6481be0463747086bfcf705a70 Author: Nick Clemens Date: Wed Jan 3 13:13:40 2018 +0000 Bug 18497: Use report id to retrieve saved SQL instead of passing param This patch takes some of the code when executing report and moves it to a sub to be reused when downloading To test: 1 - Run some very long report (see comment #1) 2 - Try to download, erk! 3 - Apply patch 4 - Run report, results hould not have changed 5 - Try to download, success! 6 - Ensure reports work as before Signed-off-by: Mark Tompsett Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 18 ++++-- .../intranet-tmpl/prog/en/includes/header.inc | 12 ++-- .../prog/en/includes/reports-toolbar.inc | 10 +++- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +- misc/cronjobs/fines.pl | 2 +- misc/export_records.pl | 12 ++-- reports/guided_reports.pl | 46 ++++++++------- t/Biblio/GetMarcNotes.t | 59 ++++++++++++++++++++ t/db_dependent/Biblio/{Isbd.t => ModBiblioMarc.t} | 38 ++++++------- 9 files changed, 137 insertions(+), 62 deletions(-) create mode 100755 t/Biblio/GetMarcNotes.t copy t/db_dependent/Biblio/{Isbd.t => ModBiblioMarc.t} (50%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 2 16:38:26 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Feb 2018 15:38:26 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.02-23-gdeb7d17 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 deb7d1717736e00b0dbb3a45d9b41d6259d0d6ce (commit) via 2a06f9be43184c12e37e2cca0057b7584d8610bd (commit) via 8f4b2b7b37221e626d45263090ce9f8cce0247aa (commit) via 3c5a561cfc156b4d465d25ca03d9a3d11b09d23d (commit) via 5cdf443250ac028093dd41942a9477cd7473a775 (commit) via 5bdeeda457205cb11d02bc4d615cd75044b57702 (commit) via a66fdeaa63919d66970f3c3e4aa89ab9ef7da0f7 (commit) via 0d36e8a429dcadb3bbc48d43e9ead8b8ad947a77 (commit) via e83f5c807d717e447a52353af1067c6c241e952a (commit) via 68f595c1c7fd51c528a6029bf3d45715c12f769b (commit) via 3e93c07250f3909df796d412b2160b949f9f8b46 (commit) via dab2f8e327e2140e82ee3bf3bceafc0939fcf408 (commit) via 9ed362a566b345c842be812f94fcdd27dbf241f1 (commit) via 71cb493c6805385f2ab3b1ddf64561f58205679c (commit) via 7837347fc99f9e6550d8fbc043ad13d16e96bb0e (commit) via fc172d3252b8587006f7d6b4d747ce2b339ea803 (commit) via 8005d27c5d0c1a2063e94e8b8931306e37fb9498 (commit) via fac379745770ec518b9068d0454b23843f71dcb4 (commit) via a6d6b0fdf68e56fd41eb3a8e38362a0e8005de9e (commit) via 55d8ea59e7964d05ffb68e7bfcf14d6556ed8739 (commit) via e1a61134eb921760ebe3ac992a151591bb3977bf (commit) via 2a0423778e73467beeb57379db49b49b811894aa (commit) via 23090cac1ea82ff7958097562fa38c92219a1e9e (commit) from 2a87bcc1c40b72672d429e5ac3ef8c548bf75cf5 (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 deb7d1717736e00b0dbb3a45d9b41d6259d0d6ce Author: Mirko Tietgen Date: Tue Jan 23 14:00:05 2018 +0100 Bug 17108 - Automatic debian/control updates (stable) Signed-off-by: Mirko Tietgen Signed-off-by: Nick Clemens commit 2a06f9be43184c12e37e2cca0057b7584d8610bd Author: Marcel de Rooy Date: Thu Jan 25 12:01:30 2018 +0100 Bug 20088: Fix uninitialized warning from svc/holds Use of uninitialized value in array element at svc/holds line 56. Test plan: Check if the warn is no longer in the logs; the warning is triggered by an ajax call from the circulation template in staff. Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 8f4b2b7b37221e626d45263090ce9f8cce0247aa Author: Marcel de Rooy Date: Mon Jan 22 09:49:36 2018 +0100 Bug 20056: Resolve uninitialized warn in cmp_sysprefs.pl When running a compare with --upd flag, I got the following warn: Use of uninitialized value in addition (+) at misc/maintenance/cmp_sysprefs.pl line 125. This is simply resolved by not returning undef but 0 in case of the Version syspref in the sub UpdateOnePref. Test plan: Look at this simple change. Signed-off-by: Marcel de Rooy Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 3c5a561cfc156b4d465d25ca03d9a3d11b09d23d Author: Zoe Bennett Date: Wed Jan 17 23:16:38 2018 +0000 Bug 19827: Removing &checkuniquemember from the export in C4/Members.pm Test Plan: - Check that the line &checkuniquemember has been removed from the export in C4/Members.pm Signed-off-by: Roch D'Amour Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 5cdf443250ac028093dd41942a9477cd7473a775 Author: Nick Clemens Date: Fri Jan 26 12:43:58 2018 +0000 Bug 20091: Moved FailedLoginAttempts out of Norwegian Patron Database heading To test: 1 - View systempreferences patron tab 2 - Note FailedLoginAttempts is uner 'Norwegian Patron Database' 3 - apply patch 4 - Now it is under 'General' Signed-off-by: Mark Tompsett Signed-off-by: Maksim Sen Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 5bdeeda457205cb11d02bc4d615cd75044b57702 Author: Mark Tompsett Date: Sun Jan 28 01:41:01 2018 -0500 Bug 13990: (follow-up) silence warnings on testing prove t/db_dependent/ILSDI_Services.t Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit a66fdeaa63919d66970f3c3e4aa89ab9ef7da0f7 Author: Mark Tompsett Date: Sun Jan 28 01:18:54 2018 -0500 Bug 13990: (QA follow-up) Add unit test coverage prove t/db_dependent/ILSDI_Services.t Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 0d36e8a429dcadb3bbc48d43e9ead8b8ad947a77 Author: Mark Tompsett Date: Fri Jan 26 16:20:20 2018 +0000 Bug 13990: (follow-up) fix various whitespace errors - tabs to 4 spaces - trailing whitespace - missing vertical whitespace before =head3 Without this patch, this bug fails qa test tools. Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit e83f5c807d717e447a52353af1067c6c241e952a Author: Jon Knight Date: Tue Nov 7 17:27:56 2017 +0000 Bug 13990: ILS-DI LookupPatron requires ID Type Patch provides a constrained set of borrower attributes to try in turn if the ID type is not specified. Also added "email" to the POD documented list of id types seeing as its quite a useful one for integration developers. Test plan: 1) without the patch applied, turn on ils-di interface in your admin sysprefs and then try accessing the URL: https://your-server/cgi-bin/koha/ilsdi.pl?service=LookupPatron&id=Mabel replacing "your-server" your Koha dev test domain name (localhost:8080 if you're using a kohadevbox VM) and "Mabel" with the first name of a patron (Mabel is in the test database already if you're using that). You should get back an error message in the XML. 2) Apply the patch and repeat. This time you should get an element in the XML with Mabel's patron ID in it. Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 68f595c1c7fd51c528a6029bf3d45715c12f769b Author: Jonathan Druart Date: Tue Jan 30 14:06:27 2018 -0300 Bug 19230: (follow-up) Preventing warn when deleting course Simplify 'unless' statement Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt Signed-off-by: Nick Clemens commit 3e93c07250f3909df796d412b2160b949f9f8b46 Author: Aleisha Amohia Date: Thu Dec 21 00:57:21 2017 +0000 Bug 19230: Preventing warn when deleting course To test: 1) Ensure UseCourseReserves is enabled 2) Go to Course Reserves, create a course 3) When you are taken to the course page, you should notice the 'Argument "" isn't numeric in numeric gt' warn 4) Delete course 5) Notice warn, and that no confirm message popped up 6) Apply patch 7) Create a course again. Confirm the 'Argument "" isn't numeric in numeric gt' warn did not show 8) Delete the course 9) Notice no warn and the confirm message pops up Sponsored-by: Catalyst IT Signed-off-by: Roch D'Amour Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt Signed-off-by: Nick Clemens commit dab2f8e327e2140e82ee3bf3bceafc0939fcf408 Author: Liz Rea Date: Fri Jan 26 15:01:39 2018 +1300 Bug 20041: ILL module missing from more menu in staff when activated Apply this patch Check that ILL requests are now listed in More menu when ILL requests syspref is enabled Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 9ed362a566b345c842be812f94fcdd27dbf241f1 Author: Grace Smyth Date: Wed Jan 17 20:36:59 2018 +0000 Bug 19986: 'Server name' doesn't appear as required Test plan: [1.] Go to Admin -> z39.50/SRU servers [2.] Make a new z39.50 server [3.] Fill in the required field (hostname, port, database) [4.] Save the server [5.] Notice that the form does not submit, tells you that Sever name is required [6.] Repeat steps 2 - 5 but this time make a new SRU server [6.] Upload the patch and repeat steps 1 - 3 (make a new z39.50 server and a new SRRU server) [7.] See that now 'Server name:' is red and on the right side of the box there is a required note [8.] Save both servers and it should have created a new z39.50 server and a new SRU server Signed-off-by: Roch D'Amour Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 71cb493c6805385f2ab3b1ddf64561f58205679c Author: Nick Clemens Date: Fri Jan 26 21:05:39 2018 +0000 Bug 20003: (QA follow-up) use patron checkouts method instead of Koha::Checkouts Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 7837347fc99f9e6550d8fbc043ad13d16e96bb0e Author: Josef Moravec Date: Thu Jan 18 07:56:15 2018 +0000 Bug 20003: Fix showing number of remaining checkouts during checking in Test plan: 0) Do not apply the patch 1) Have a patron with more then one checkout 2) Return one of patron's checkout and confirm the remaining number of checkout is not shown 3) Apply the patch 4) Try it again and confirm the number is now shown Signed-off-by: Roch D'Amour Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit fc172d3252b8587006f7d6b4d747ce2b339ea803 Author: Jonathan Druart Date: Mon Jan 22 17:04:28 2018 -0300 Bug 19975: Fix search by tags at the OPAC This bug has certainly be caused by commit 091d6c513bcbee224ff06477e79be48cea7fe825 Bug 17843: Replace C4::Koha::getitemtypeinfo with Koha::ItemTypes The reason is quite simple, in Koha::ItemType->translated_description (called in opac-search.pl l.229) there is an eval to know if we have access to the translated description of the item type, to avoid retrieving it again. The evaluation of $@ later in opac-search.pl is supposed to test the 2 eval made few lines before (a "normal" search, without tags), but $@ contains the error message from the *last* eval command. So we are raising an error that have been correctly handled in Koha::ItemType. Test plan: At the OPAC, click Tag cloud, then click any of the tags => Without the patch you get Koha::ItemType::get_column generated this error: DBIx::Class::Row::get_column(): No such column 'translated_description' on Koha::Schema::Result::Itemtype at /usr/share/koha/lib/Koha/Object.pm line 307 => With the patch applied the page is correctly displayed Signed-off-by: Claire Gravely Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 8005d27c5d0c1a2063e94e8b8931306e37fb9498 Author: Mirko Tietgen Date: Tue Jan 23 11:43:10 2018 +0100 Bug 20072: Fix build-git-snapshot for Debian source format quilt With bug 18696 we need a few tiny changes to build-git-snapshot: - Debian revision number for debian/changelog - "orig" in the file name for the tar.gz archive Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit fac379745770ec518b9068d0454b23843f71dcb4 Author: Jonathan Druart Date: Tue Jan 30 12:24:48 2018 -0300 Revert "Bug 19669: (QA follow-up) Remove itemstypes.plugin" This reverts commit 7140a5e4ecc68759c1bee04571386f9cc9a16d92. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit a6d6b0fdf68e56fd41eb3a8e38362a0e8005de9e Author: Jonathan Druart Date: Tue Jan 23 17:00:16 2018 -0300 Bug 19705: Try to fix random failures from DecreaseLoanHighHolds.t No idea if it will do the trick, wait and see... Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 55d8ea59e7964d05ffb68e7bfcf14d6556ed8739 Author: Jonathan Druart Date: Mon Jan 22 17:18:59 2018 -0300 Bug 19985: Make TestBuilder.t pass even if default_circ_rules is not empty This table cannot contain more than 1 row, so we need to remove its data before trying to generate a new entry. Test plan: Set a default circ rule prove t/db_dependent/TestBuilder.t should return green Without this patch you get: # Failed test 'TestBuilder should be able to create an object for every source' # at t/db_dependent/TestBuilder.t line 78. # got: '1' # expected: '0' # The following sources have not been generated correctly: DefaultCircRule # Looks like you failed 1 test of 1. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit e1a61134eb921760ebe3ac992a151591bb3977bf Author: Kyle M Hall Date: Mon May 8 16:47:06 2017 +0000 Bug 18477: Populate article_requests table values for AR_PENDING notices The default AR_PENDING letter does not print populate <> fields. Test Plan: 1) Enable article requests ( syspref: ArticleRequests => Enable, Circ and fine rules ALL/ALL (or a given category/itemtype): Article requests => Yes ) 2) Search for a title, click in to catalog detail, click 'Request Article' button. 3) Select Patron 4) Fill out request information 5) Click 'Place request' 6) Go to notices in patron record, inspect 'Article Request Received' notice. You should see the request information from step 4, but it doesn't display. 7) Apply this patch 8) Repeat steps 2-6, not the fields now display! Signed-off-by: Eric Phetteplace Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 2a0423778e73467beeb57379db49b49b811894aa Author: Jonathan Druart Date: Tue Jan 2 14:36:43 2018 -0300 Bug 18477: Add tests Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 23090cac1ea82ff7958097562fa38c92219a1e9e Author: Aleisha Amohia Date: Mon Jan 22 23:52:21 2018 +0000 Bug 20068: Check if user logged in before passing dashboard params to template This prevents warns from dashboard variables when not logged in To test: 1) Go to OPAC main homepage. Do not log in 2) Notice warn 3) Apply patch and refresh 4) Warn should be gone 5) Log in 6) Confirm dashboard shows as normal Sponsored-by: Catalyst IT Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/ILSDI/Services.pm | 143 +++++++++++--------- C4/Members.pm | 1 - Koha/ArticleRequest.pm | 1 + circ/returns.pl | 3 +- course_reserves/mod_course.pl | 12 +- debian/build-git-snapshot | 4 +- debian/control | 32 +++-- .../intranet-tmpl/prog/en/includes/header.inc | 3 + .../prog/en/modules/admin/preferences/patrons.pref | 10 +- .../prog/en/modules/admin/z3950servers.tt | 4 +- .../en/modules/course_reserves/course-details.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 5 +- misc/maintenance/cmp_sysprefs.pl | 2 +- opac/ilsdi.pl | 2 +- opac/opac-main.pl | 31 +++-- opac/opac-search.pl | 2 +- reports/itemtypes.plugin | 109 +++++++++++++++ svc/holds | 4 +- t/db_dependent/ArticleRequests.t | 25 +++- t/db_dependent/DecreaseLoanHighHolds.t | 5 + t/db_dependent/ILSDI_Services.t | 57 +++++++- t/db_dependent/TestBuilder.t | 1 + 22 files changed, 340 insertions(+), 118 deletions(-) create mode 100755 reports/itemtypes.plugin hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 5 11:50:29 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Feb 2018 10:50:29 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.08-49-g1f34c49 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 1f34c499c8bedc260eb07930d59caa97f03f1736 (commit) via 7998c6bc64b1fc36ee39fba089cbd0d343cda225 (commit) via 1a6e2e54ba80edb79bcec6789a24b1775e26879d (commit) from 1c098c31dc9b4cd66af930616bff6851e9cd550e (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 1f34c499c8bedc260eb07930d59caa97f03f1736 Author: Nick Clemens Date: Wed Nov 8 17:55:00 2017 +0000 Bug 19596: Don't try to get hold or items count for non-existent biblios Patch applies and works as expected. Signed-off-by: Dilan Johnpull? Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit c42053021bf6f0d5550df5786c8017b90f634ebd) Signed-off-by: Fridolin Somers commit 7998c6bc64b1fc36ee39fba089cbd0d343cda225 Author: Jonathan Druart Date: Tue Jan 23 17:00:16 2018 -0300 Bug 19705: Try to fix random failures from DecreaseLoanHighHolds.t No idea if it will do the trick, wait and see... Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit a6d6b0fdf68e56fd41eb3a8e38362a0e8005de9e) Signed-off-by: Fridolin Somers commit 1a6e2e54ba80edb79bcec6789a24b1775e26879d Author: Fridolin Somers Date: Mon Feb 5 11:25:11 2018 +0100 Revert "Bug 19669: (QA follow-up) Remove itemstypes.plugin" This reverts commit 6338895489156832782ce31c0f1e37dce070d4f9. ----------------------------------------------------------------------- Summary of changes: acqui/parcel.pl | 4 +- reports/itemtypes.plugin | 109 ++++++++++++++++++++++++++++++++ t/db_dependent/DecreaseLoanHighHolds.t | 5 ++ 3 files changed, 116 insertions(+), 2 deletions(-) create mode 100755 reports/itemtypes.plugin hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 5 13:57:27 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Feb 2018 12:57:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-391-g2ff5482 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 2ff5482c973eb2f1835a3e372bcee6f16c4a9445 (commit) via 3c2cd21cc35fdb5a048c042add0087ebedbca44e (commit) via 127da0e35c5117e4c6ad7a208087cf191745b49b (commit) via 458c8c1ae1d27cd4099328b4035fb236458fcd67 (commit) via 60efdccafd40de43a4917a80fc96d3f6e63626a7 (commit) via e3d0bc24c97ed35653130cdc55f0da3271d958e9 (commit) via e1b4b53765da4088483a7255b657b1a4c98db694 (commit) via d10513dfc0d47846fdb874b0a62ce9c8c7107644 (commit) via 484fd322abd36bba61a8c2fa40e3902e909438c3 (commit) via cad2db6016fb154049a030f0d8a74a6b539cb7a4 (commit) via 2bde680e0b7cb0a91731bd9a9475e3460e4b6fec (commit) via eb5aa286126d204c3bfb52a2d774eeaf7bfe9b68 (commit) via 7b3470ca3f5df7af683e916b35880e674dd200bb (commit) via 5d9348ffa22ecf8cf2a2cf2f953d4e18930c2669 (commit) via b0216c7ca0c78c9fbb866950562632315b588e36 (commit) via 3ded637bc51227acc9b107da09ba8d0f2a39862d (commit) via f2502c94998c5a60e6ec038e64decc5fb64e5b6a (commit) via 165c56de29b259c0607d5e3000045ae5fe481af0 (commit) via b4458e71e56aaa79c80b695aa9c7945a29211584 (commit) via f9b93e07fd3259d2c8c795ee220d27a8a1251cd4 (commit) via f477c078d86fab112c1ecf26e68dc869bf0fef54 (commit) via 70b4176b195a0e54d776a1de5f1212ab5707f29f (commit) via cea818a56ac29ae0cb8876e514c5ec97e8ede0e2 (commit) via cc37c04bf3cd7afb61e53cffd58c079fa43af4f2 (commit) via 3f6a7933b84ba95550518b0364a9ba90002390b5 (commit) via 8ba6bd033f30c4d7f393a50e299fe709e524c5f7 (commit) via 0f3fef5cae94b64f7ca636be082d4d4c02e1fae9 (commit) via f3d62e4331a9ac00a693ce2fc855ea8131e92395 (commit) via 8622f4be5900d141dc4fe232476fb3cbfafd3b09 (commit) from f3c6284835769dead3e9a8b6e91a14d7620a130c (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 2ff5482c973eb2f1835a3e372bcee6f16c4a9445 Author: Pasi Kallinen Date: Fri Feb 2 09:45:42 2018 +0200 Bug 20124: Make "Save configuration" translatable on "did you mean?" config When saving the "Did you mean?" setting, a popup with the message "Successfully saved configuration" is shown, but it cannot be translated. Make it translatable. Test plan: 1) Go to Home -> Administration -> Did you mean? 2) Change the settings, click on "Save configuration" 3) Popup with "Successfully saved configuration" 4) Apply patch, update po-files, etc. 5) Check that the msgid "Successfully saved configuration" is in fi-FI-staff-prog.po, and translate the message 6) install the fi-FI language 7) Change your UI language to finnish 8) Repeat 1, 2, 3. You should now see the same popup message translated. Signed-off-by: Pasi Kallinen Signed-off-by: Roch D'Amour Signed-off-by: Jonathan Druart commit 3c2cd21cc35fdb5a048c042add0087ebedbca44e Author: Pasi Kallinen Date: Wed Jan 31 11:11:56 2018 +0200 Bug 20110: Adding same user multiple times to same budget In javascript, using indexOf to test if a number exists in an array of strings doesn't work, and makes it possible to add the same user multiple times into the same budget fund. Make borrowernumber into string and compare that instead. Test plan: 1) Go to Home -> Administration -> Budgets -> Funds -> Add Fund 2) Add a user to the fund 3) Try to add the same user again to the same fund. No error. 4) Apply patch 5) Do 1, 2, and 3 again. You should now get an error message saying the user is already in the list. Signed-off-by: Pasi Kallinen Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 127da0e35c5117e4c6ad7a208087cf191745b49b Author: Pasi Kallinen Date: Wed Jan 31 08:51:30 2018 +0200 Bug 20109: Make "Remove" translatable when adding a fund When a user has been added to the fund, the link to "Remove" that user is not translatable. Test plan: 1) Install language xx-YY 2) Go to Home -> Administration -> Budgets -> Funds -> Add Fund 3) Add a user to the fund 4) Notice how the "Remove" link after the user's name is not translated 5) Apply patch 6) Look in xx-YY-staff-prog.po, and if needed, translate the msgid "Remove" 7) Update and reinstall the language 8) Do 2 and 3 again. The "Remove" link should now be translated. Signed-off-by: Pasi Kallinen Signed-off-by: Owen Leonard https://bugs.koha-community.org/show_bug.cgi?id=10209 Signed-off-by: Jonathan Druart commit 458c8c1ae1d27cd4099328b4035fb236458fcd67 Author: Victor Grousset Date: Mon Jan 29 16:09:24 2018 +0100 Bug 20098: Inventory tool: CVS export: fix itemlost column It was mapped with "lost" instead of "itemlost". == Test plan == 1. Have a lost item 2. Go to staff:/cgi-bin/koha/tools/inventory.pl 3. Tick "Optional filters" ? "items.itemlost" ? "name of Authorized values for the lost state" 4. Tick "Export to CSV file" 5. Submit 6. Open the CSV 7. Check that the lost item is in the list 8. You should observe that the "Lost status" column is empty for all items This is the problem 9. Apply this patch 10. Click submit to re-export the CSV 11. Open the CSV 12. Check that the lost item is in the list 13. You should observe that the "Lost status" column now filled with the expected values. 14. Smile because it works! :D Signed-off-by: Mark Tompsett Signed-off-by: Maksim Sen Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 60efdccafd40de43a4917a80fc96d3f6e63626a7 Author: Owen Leonard Date: Mon Jan 22 15:48:42 2018 +0000 Bug 20062: Remove support for Internet Explorer 7 in the staff client This patch removes JavaScript files which were added to support Internet Explorer 7. Templates which included the files have been modified accordingly. To test, apply the patch and clear your browser cache if necessary. Perform a catalog search in the staff client and click through to view one of the search results. The search results navigation menu in the left-hand sidebar should work correctly. Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit e3d0bc24c97ed35653130cdc55f0da3271d958e9 Author: Marcel de Rooy Date: Mon Jan 22 13:04:33 2018 +0100 Bug 20060: Resolve uninitialized warn from Koha::Template::Plugin::Branches The warn comes from undefined C4::Context->userenv->{branch}. Can be triggered by calling mainpage.pl when being logged out in staff. Signed-off-by: Marcel de Rooy Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit e1b4b53765da4088483a7255b657b1a4c98db694 Author: Charlotte Cordwell Date: Thu Jan 18 03:32:12 2018 +0000 Bug 20020: use Modern::Perl in XT scripts Test Case: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; author/podcorrectness.t author/show-template-structure.pl author/translatable-templates.t author/valid-templates.t find-license-problems fix-old-fsf-address single_quotes.t verify-debian-docbook.t Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit d10513dfc0d47846fdb874b0a62ce9c8c7107644 Author: Te Rauhina Jackson Date: Thu Jan 18 20:41:33 2018 +0000 Bug 20019: use Modern::Perl in misc perl scripts Test Plan: Test Plan: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; services/itemrecorddisplay.pl suggestion/suggestion.pl tags/list.pl tags/review.pl virtualshelves/sendshelf.pl help.pl changelanguage.pl koha_perl_deps.pl debian/bd-to-depends debian/build-git-snapshot debian/list-deps docs/CAS/CASProxy/examples/koha_webservice.pl docs/CAS/CASProxy/examples/proxy_cas.pl docs/CAS/CASProxy/examples/proxy_cas_callback.pl docs/CAS/CASProxy/examples/proxy_cas_data.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 484fd322abd36bba61a8c2fa40e3902e909438c3 Author: Zoe Bennett Date: Thu Jan 18 03:32:43 2018 +0000 Bug 20018: use Modern::Perl in offline_circ scripts Test Plan: - Check that it now says 'use Modern::Perl' and not 'use trict; use warnings;' in the follwing plugins perl scripts enqueue_koc.pl list.pl process.pl process_koc.pl service.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit cad2db6016fb154049a030f0d8a74a6b539cb7a4 Author: Jenny Way Date: Thu Jan 18 02:04:47 2018 +0000 Bug 20017: use Modern::Perl in Tools perl scripts Test plan: Check that the following files don't contain use strict; use warnings; and have use Modern::Perl instead. background-job-progress.pl batchMod.pl copy-holidays.pl exceptionHolidays.pl holidays.pl import_borrowers.pl koha-news.pl letter.pl manage-marc-import.pl newHolidays.pl overduerules.pl quotes-upload.pl quotes.pl quotes/quotes-upload_ajax.pl quotes/quotes_ajax.pl scheduler.pl stage-marc-import.pl upload-cover-image.pl Also the credits have been added to newHolidays.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 2bde680e0b7cb0a91731bd9a9475e3460e4b6fec Author: Zoe Bennett Date: Thu Jan 18 03:24:23 2018 +0000 Bug 20016: use Modern::Perl in svc scripts Test Plan: - Check that it now says 'use Modern::Perl' and not 'use trict; use warnings;' in the follwing plugins svc scripts authentication bib bib_profile checkouts config/systempreferences import_bib new_bib https://bugs.koha-community.org/show_bug.cgi?id=20016 Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit eb5aa286126d204c3bfb52a2d774eeaf7bfe9b68 Author: Jenny Way Date: Thu Jan 18 00:56:42 2018 +0000 Bug 20015: use Modern::Perl in Serials perl script Test plan: Check that use strict; use warnings; doesn't exist in the following files and use Modern::Perl; is written instead. acqui-search-result.pl acqui-search.pl checkexpiration.pl reorder_members.pl routing-preview.pl routing.pl serials-collection.pl serials-edit.pl subscription-add.pl subscription-bib-search.pl subscription-renew.pl viewalerts.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 7b3470ca3f5df7af683e916b35880e674dd200bb Author: Jenny Way Date: Thu Jan 18 00:40:57 2018 +0000 Bug 20013: use Modern::Perl in Reserve perl script Test plan: Check the following files that use strict; use warnings; doesn't exist and use Modern::Perl; is written instead. modrequest.pl modrequest_suspendall.pl placerequest.pl Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 5d9348ffa22ecf8cf2a2cf2f953d4e18930c2669 Author: Charlotte Cordwell Date: Thu Jan 18 02:58:06 2018 +0000 Bug 20012: use Modern::Perl in Reports perl scripts Test Case: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; borrowers_out.pl cat_issues_top.pl catalogue_out.pl catalogue_stats.pl dictionary.pl issues_avg_stats.pl issues_stats.pl itemslost.pl manager.pl reports-home.pl serials_stats.pl stats.print.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit b0216c7ca0c78c9fbb866950562632315b588e36 Author: Zoe Bennett Date: Thu Jan 18 03:13:55 2018 +0000 Bug 20011: use Modern::Perl in plugins perl scripts Test Plan: - Check that it now says 'use Modern::Perl' and not 'use trict; use warnings;' in the follwing plugins perl scripts plugins-home.pl plugins-uninstall.pl plugins-upload.pl run.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 3ded637bc51227acc9b107da09ba8d0f2a39862d Author: Grace Smyth Date: Thu Jan 18 03:58:42 2018 +0000 Bug 20010: use Modern::Perl in Patroncards perl scripts Test Plan: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; create-pdf.pl edit-batch.pl edit-layout.pl edit-profile.pl edit-template.pl home.pl image-manage.pl manage.pl print.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit f2502c94998c5a60e6ec038e64decc5fb64e5b6a Author: Te Rauhina Jackson Date: Thu Jan 18 03:43:59 2018 +0000 Bug 20009: use Modern::Perl in Members perl scripts Test Plan: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; boraccount.pl default_messageprefs.pl deletemem.pl files.pl mancredit.pl maninvoice.pl member-flags.pl member-password.pl memberentry.pl members-home.pl members-update-do.pl moremember.pl notices.pl pay.pl paycollect.pl printfeercpt.pl printinvoice.pl printslip.pl readingrec.pl routing-lists.pl setstatus.pl update-child.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 165c56de29b259c0607d5e3000045ae5fe481af0 Author: Zoe Bennett Date: Wed Jan 17 23:00:28 2018 +0000 Bug 19999: use Modern::Perl in label scripts Test Plan: - Check that it now says 'use Modern::Perl;' and not 'use strict; use warnings;' in the following labels perl scripts: label-create-csv.pl label-create-pdf.pl label-create-xml.pl label-edit-batch.pl label-edit-layout.pl label-edit-profile.pl label-edit-template.pl label-home.pl label-item-search.pl label-print.pl spinelabel-home.pl spinelabel-print.pl Signed-off-by: Jonathan Druart commit b4458e71e56aaa79c80b695aa9c7945a29211584 Author: Te Rauhina Jackson Date: Thu Jan 18 03:14:44 2018 +0000 Bug 19998: use Modern::Perl in error perl scripts Test Plan: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; 400.pl 401.pl 402.pl 403.pl 404.pl 500.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit f9b93e07fd3259d2c8c795ee220d27a8a1251cd4 Author: Charlotte Cordwell Date: Thu Jan 18 01:57:32 2018 +0000 Bug 19997: use Modern::Perl in Circulation perl scripts Test Case: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; bookcount.pl branchoverdues.pl branchtransfers.pl circulation.pl hold-transfer-slip.pl reserveratios.pl returns.pl selectbranchprinter.pl transfer-slip.pl transferstoreceive.pl view_holdsqueue.pl waitingreserves.pl ypattrodue-attr-search-authvalue.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit f477c078d86fab112c1ecf26e68dc869bf0fef54 Author: Katrin Fischer Date: Sun Feb 4 15:26:58 2018 +0100 Bug 19996: (QA follow-up) Remove commented use warnings; Signed-off-by: Jonathan Druart commit 70b4176b195a0e54d776a1de5f1212ab5707f29f Author: Grace Smyth Date: Thu Jan 18 03:30:08 2018 +0000 Bug 19996: use Modern::Perl in cataloguing perl scripts Test Case: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; addbiblio.pl addbooks.pl additem.pl linkitem.pl moveitem.pl value_builder/normarc_field_007.pl value_builder/normarc_field_008.pl value_builder/normarc_leader.pl value_builder/unimarc_field_010.pl value_builder/unimarc_field_100.pl value_builder/unimarc_field_105.pl value_builder/unimarc_field_106.pl value_builder/unimarc_field_110.pl value_builder/unimarc_field_115a.pl value_builder/unimarc_field_115b.pl value_builder/unimarc_field_116.pl value_builder/unimarc_field_117.pl value_builder/unimarc_field_120.pl value_builder/unimarc_field_121a.pl value_builder/unimarc_field_121b.pl value_builder/unimarc_field_122.pl value_builder/unimarc_field_123a.pl value_builder/unimarc_field_123d.pl value_builder/unimarc_field_123e.pl value_builder/unimarc_field_123f.pl value_builder/unimarc_field_123g.pl value_builder/unimarc_field_123i.pl value_builder/unimarc_field_123j.pl value_builder/unimarc_field_124.pl value_builder/unimarc_field_124a.pl value_builder/unimarc_field_124b.pl value_builder/unimarc_field_124c.pl value_builder/unimarc_field_124d.pl value_builder/unimarc_field_124e.pl value_builder/unimarc_field_124f.pl value_builder/unimarc_field_124g.pl value_builder/unimarc_field_125.pl value_builder/unimarc_field_125a.pl value_builder/unimarc_field_125b.pl value_builder/unimarc_field_126.pl value_builder/unimarc_field_126a.pl value_builder/unimarc_field_126b.pl value_builder/unimarc_field_127.pl value_builder/unimarc_field_128a.pl value_builder/unimarc_field_128b.pl value_builder/unimarc_field_128c.pl value_builder/unimarc_field_130.pl value_builder/unimarc_field_135a.pl value_builder/unimarc_field_140.pl value_builder/unimarc_field_141.pl value_builder/unimarc_field_210c.pl value_builder/unimarc_field_210c_bis.pl value_builder/unimarc_field_225a.pl value_builder/unimarc_field_4XX.pl value_builder/unimarc_field_686a.pl value_builder/unimarc_field_700-4.pl value_builder/unimarc_leader.pl z3950_auth_search.pl z3950_search.pl Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit cea818a56ac29ae0cb8876e514c5ec97e8ede0e2 Author: Zoe Bennett Date: Thu Jan 18 00:45:11 2018 +0000 Bug 19995: use Modern::Perl in Catalogue perl scripts Test Plan: - Check that it now says 'use Modern::Perl;' and not 'use strict; use warnings;' in the following catalogue perl scripts. MARCdetail.pl export.pl image.pl imageviewer.pl issuehistory.pl labeledMARCdetail.pl moredetail.pl search.pl showmarc.pl updateitem.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit cc37c04bf3cd7afb61e53cffd58c079fa43af4f2 Author: Charlotte Cordwell Date: Thu Jan 18 00:48:55 2018 +0000 Bug 19993: use Modern::Perl in Acquisition perl scripts Test Case: Check the following files have been updated from use strict; use warnings; to use Modern::Perl; acqui-home.pl addorder.pl basketgroup.pl basketheader.pl booksellers.pl check_budget_total.pl check_duplicate_barcode_ajax.pl edi_ean.pl edifactmsgs.pl edimsg.pl finishreceive.pl histsearch.pl invoice.pl invoices.pl neworderbiblio.pl neworderempty.pl newordersuggestion.pl ordered.pl orderreceive.pl parcel.pl parcels.pl pdfformat/layout2pages.pm pdfformat/layout2pagesde.pm pdfformat/layout3pages.pm pdfformat/layout3pagesfr.pm spent.pl supplier.pl uncertainprice.pl updatesupplier.pl z3950_search.pl Signed-off-by: Owen Leonard Corrected a single semicolon in edimsg.pl during signoff. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 3f6a7933b84ba95550518b0364a9ba90002390b5 Author: Jenny Way Date: Wed Jan 17 21:48:57 2018 +0000 Bug 19992: use Modern::Perl in Admin perl scripts Test plan: Check use warnings; use strict doesn't exist and use Modern::Perl is written instead in the following files: admin/admin-home.pl admin/aqcontract.pl admin/aqplan.pl admin/auth_tag_structure.pl admin/branch_transfer_limits.pl admin/check_budget_parent.pl admin/check_parent_total.pl admin/checkmarc.pl admin/classsources.pl admin/clone-rules.pl admin/didyoumean.pl admin/edi_accounts.pl admin/edi_ean_accounts.pl admin/import_export_framework.pl admin/item_circulation_alerts.pl admin/marctagstructure.pl admin/matching-rules.pl admin/printers.pl admin/smart-rules.pl admin/systempreferences.pl admin/transport-cost-matrix.pl Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 8ba6bd033f30c4d7f393a50e299fe709e524c5f7 Author: Jonathan Druart Date: Mon Feb 5 09:34:42 2018 -0300 Bug 19989: remove confusing variable Signed-off-by: Jonathan Druart commit 0f3fef5cae94b64f7ca636be082d4d4c02e1fae9 Author: Zoe Bennett Date: Wed Jan 17 04:01:01 2018 +0000 Bug 19989: Use Koha::Patron::Modifications->delete instead of loop Test: 1) Make a change to the user in the OPAC 2) In the staff client make sure this is the only request Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit f3d62e4331a9ac00a693ce2fc855ea8131e92395 Author: Mark Tompsett Date: Tue Jan 30 18:22:42 2018 +0000 Bug 12932: Check the Perl version even if all modules installed The description in comment #0 is quite true, because the scope of the $checkmodule variable is local to just the module checking. If we change the scope, we can include the perl check as part of the new scope, and thus properly set its value. As Debian Jessie, Stretch and Ubuntu Xenial all have good versions of Perl by default, the easiest way to test this is to: - make sure to have some optional modules not installed. - change the system preference 'Version' to one just under the current version in your SQL client. - modify the version check line to 5.030000 - restart_all and try going to the staff client. -- This should not inform you that your perl version is bad. - git reset hard back to origin/master - apply the patch - modify the version check line to 5.030000 - change the system preference 'Version' to one just under the current version in your SQL client. - restart_all and try going to the staff client. -- This should trigger the patch, and you should be informed your perl version is bad. - git reset hard back to origin/master - apply the patch - run koha qa test tools Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 8622f4be5900d141dc4fe232476fb3cbfafd3b09 Author: Pasi Kallinen Date: Thu Jan 25 13:04:09 2018 +0200 Bug 11827: Make "Cancel Rating" translatable in jQuery rating plugin - Make the "Cancel rating" text translatable (and change capitalization to conform to Koha coding guidelines) - Improve the two other messages to use formatted strings instead of concatenation. - Use the exact same text for the "your rating" text, so it only appears once in the po-file. Test plan: 1. See that the "Cancel rating" -text doesn't appear in po/xx-YY-opac-bootstrap.po 2. Note how there's two versions of the your rating -text ("your rating: %s, " and "your rating:") in the po-file 3. Apply patch 4. Update the xx-YY translation 5. Check the po-file. It should now contain the "Cancel rating" and a single "your rating: %s, " 6. Translate those texts, and update & install the language. 7. Go to the OPAC detail page of a biblio, and check the rating texts. 8. Hovering over the rating minus -sign should show the translated "Cancel rating" 9. Check that the text after the stars is correct with and without your rating Signed-off-by: Pasi Kallinen Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: Koha/Template/Plugin/Branches.pm | 2 +- acqui/acqui-home.pl | 3 +- acqui/addorder.pl | 3 +- acqui/basketgroup.pl | 3 +- acqui/basketheader.pl | 3 +- acqui/booksellers.pl | 3 +- acqui/check_budget_total.pl | 3 +- acqui/check_duplicate_barcode_ajax.pl | 3 +- acqui/edi_ean.pl | 3 +- acqui/edifactmsgs.pl | 3 +- acqui/edimsg.pl | 3 +- acqui/finishreceive.pl | 3 +- acqui/histsearch.pl | 3 +- acqui/invoice.pl | 3 +- acqui/invoices.pl | 3 +- acqui/neworderbiblio.pl | 3 +- acqui/neworderempty.pl | 3 +- acqui/newordersuggestion.pl | 3 +- acqui/ordered.pl | 3 +- acqui/orderreceive.pl | 3 +- acqui/parcel.pl | 3 +- acqui/parcels.pl | 3 +- acqui/pdfformat/layout2pages.pm | 3 +- acqui/pdfformat/layout2pagesde.pm | 3 +- acqui/pdfformat/layout3pages.pm | 3 +- acqui/pdfformat/layout3pagesfr.pm | 3 +- acqui/spent.pl | 3 +- acqui/supplier.pl | 3 +- acqui/uncertainprice.pl | 3 +- acqui/updatesupplier.pl | 3 +- acqui/z3950_search.pl | 3 +- admin/admin-home.pl | 3 +- admin/aqcontract.pl | 3 +- admin/aqplan.pl | 3 +- admin/auth_tag_structure.pl | 3 +- admin/branch_transfer_limits.pl | 3 +- admin/check_budget_parent.pl | 3 +- admin/check_parent_total.pl | 3 +- admin/checkmarc.pl | 3 +- admin/classsources.pl | 3 +- admin/clone-rules.pl | 3 +- admin/didyoumean.pl | 3 +- admin/edi_accounts.pl | 3 +- admin/edi_ean_accounts.pl | 3 +- admin/import_export_framework.pl | 3 +- admin/item_circulation_alerts.pl | 3 +- admin/marctagstructure.pl | 3 +- admin/matching-rules.pl | 3 +- admin/printers.pl | 3 +- admin/smart-rules.pl | 3 +- admin/systempreferences.pl | 3 +- admin/transport-cost-matrix.pl | 3 +- catalogue/MARCdetail.pl | 3 +- catalogue/export.pl | 3 +- catalogue/image.pl | 3 +- catalogue/imageviewer.pl | 3 +- catalogue/issuehistory.pl | 3 +- catalogue/labeledMARCdetail.pl | 3 +- catalogue/moredetail.pl | 3 +- catalogue/search.pl | 3 +- catalogue/showmarc.pl | 3 +- catalogue/updateitem.pl | 3 +- cataloguing/addbiblio.pl | 4 +- cataloguing/addbooks.pl | 4 +- cataloguing/additem.pl | 4 +- cataloguing/linkitem.pl | 3 +- cataloguing/moveitem.pl | 4 +- cataloguing/value_builder/normarc_field_007.pl | 2 +- cataloguing/value_builder/normarc_field_008.pl | 2 +- cataloguing/value_builder/normarc_leader.pl | 3 +- cataloguing/value_builder/unimarc_field_010.pl | 3 +- cataloguing/value_builder/unimarc_field_100.pl | 4 +- cataloguing/value_builder/unimarc_field_105.pl | 3 +- cataloguing/value_builder/unimarc_field_106.pl | 4 +- cataloguing/value_builder/unimarc_field_110.pl | 3 +- cataloguing/value_builder/unimarc_field_115a.pl | 3 +- cataloguing/value_builder/unimarc_field_115b.pl | 3 +- cataloguing/value_builder/unimarc_field_116.pl | 3 +- cataloguing/value_builder/unimarc_field_117.pl | 3 +- cataloguing/value_builder/unimarc_field_120.pl | 3 +- cataloguing/value_builder/unimarc_field_121a.pl | 3 +- cataloguing/value_builder/unimarc_field_121b.pl | 3 +- cataloguing/value_builder/unimarc_field_122.pl | 3 +- cataloguing/value_builder/unimarc_field_123a.pl | 3 +- cataloguing/value_builder/unimarc_field_123d.pl | 4 +- cataloguing/value_builder/unimarc_field_123e.pl | 4 +- cataloguing/value_builder/unimarc_field_123f.pl | 4 +- cataloguing/value_builder/unimarc_field_123g.pl | 4 +- cataloguing/value_builder/unimarc_field_123i.pl | 4 +- cataloguing/value_builder/unimarc_field_123j.pl | 4 +- cataloguing/value_builder/unimarc_field_124.pl | 4 +- cataloguing/value_builder/unimarc_field_124a.pl | 4 +- cataloguing/value_builder/unimarc_field_124b.pl | 4 +- cataloguing/value_builder/unimarc_field_124c.pl | 4 +- cataloguing/value_builder/unimarc_field_124d.pl | 4 +- cataloguing/value_builder/unimarc_field_124e.pl | 4 +- cataloguing/value_builder/unimarc_field_124f.pl | 4 +- cataloguing/value_builder/unimarc_field_124g.pl | 4 +- cataloguing/value_builder/unimarc_field_125.pl | 4 +- cataloguing/value_builder/unimarc_field_125a.pl | 4 +- cataloguing/value_builder/unimarc_field_125b.pl | 3 +- cataloguing/value_builder/unimarc_field_126.pl | 4 +- cataloguing/value_builder/unimarc_field_126a.pl | 3 +- cataloguing/value_builder/unimarc_field_126b.pl | 4 +- cataloguing/value_builder/unimarc_field_127.pl | 4 +- cataloguing/value_builder/unimarc_field_128a.pl | 4 +- cataloguing/value_builder/unimarc_field_128b.pl | 3 +- cataloguing/value_builder/unimarc_field_128c.pl | 4 +- cataloguing/value_builder/unimarc_field_130.pl | 3 +- cataloguing/value_builder/unimarc_field_135a.pl | 3 +- cataloguing/value_builder/unimarc_field_140.pl | 3 +- cataloguing/value_builder/unimarc_field_141.pl | 4 +- cataloguing/value_builder/unimarc_field_210c.pl | 4 +- .../value_builder/unimarc_field_210c_bis.pl | 3 +- cataloguing/value_builder/unimarc_field_225a.pl | 4 +- cataloguing/value_builder/unimarc_field_4XX.pl | 3 +- cataloguing/value_builder/unimarc_field_686a.pl | 4 +- cataloguing/value_builder/unimarc_field_700-4.pl | 4 +- cataloguing/value_builder/unimarc_leader.pl | 3 +- cataloguing/z3950_auth_search.pl | 4 +- cataloguing/z3950_search.pl | 3 +- changelanguage.pl | 3 +- circ/bookcount.pl | 3 +- circ/branchoverdues.pl | 3 +- circ/branchtransfers.pl | 3 +- circ/circulation.pl | 3 +- circ/hold-transfer-slip.pl | 3 +- circ/reserveratios.pl | 3 +- circ/returns.pl | 3 +- circ/selectbranchprinter.pl | 3 +- circ/transfer-slip.pl | 3 +- circ/transferstoreceive.pl | 3 +- circ/view_holdsqueue.pl | 3 +- circ/waitingreserves.pl | 3 +- circ/ypattrodue-attr-search-authvalue.pl | 5 +- debian/bd-to-depends | 3 +- debian/build-git-snapshot | 3 +- debian/list-deps | 3 +- docs/CAS/CASProxy/examples/koha_webservice.pl | 3 +- docs/CAS/CASProxy/examples/proxy_cas.pl | 3 +- docs/CAS/CASProxy/examples/proxy_cas_callback.pl | 3 +- docs/CAS/CASProxy/examples/proxy_cas_data.pl | 3 +- errors/400.pl | 3 +- errors/401.pl | 3 +- errors/402.pl | 3 +- errors/403.pl | 3 +- errors/404.pl | 3 +- errors/500.pl | 3 +- help.pl | 3 +- installer/install.pl | 3 +- koha-tmpl/intranet-tmpl/lib/shims/json2.js | 486 -------------------- koha-tmpl/intranet-tmpl/lib/shims/json2.min.js | 1 - .../prog/en/modules/admin/aqbudgets.tt | 4 +- .../prog/en/modules/admin/didyoumean.tt | 2 +- .../prog/en/modules/catalogue/results.tt | 3 - .../prog/en/modules/cataloguing/addbiblio.tt | 3 - .../prog/en/modules/cataloguing/additem.tt | 3 - .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 5 +- koha_perl_deps.pl | 3 +- labels/label-create-csv.pl | 3 +- labels/label-create-pdf.pl | 3 +- labels/label-create-xml.pl | 3 +- labels/label-edit-batch.pl | 3 +- labels/label-edit-layout.pl | 3 +- labels/label-edit-profile.pl | 3 +- labels/label-edit-template.pl | 3 +- labels/label-home.pl | 3 +- labels/label-item-search.pl | 3 +- labels/label-print.pl | 3 +- labels/spinelabel-home.pl | 3 +- labels/spinelabel-print.pl | 3 +- members/boraccount.pl | 3 +- members/default_messageprefs.pl | 3 +- members/deletemem.pl | 3 +- members/files.pl | 3 +- members/mancredit.pl | 3 +- members/maninvoice.pl | 3 +- members/member-flags.pl | 3 +- members/member-password.pl | 3 +- members/memberentry.pl | 3 +- members/members-home.pl | 3 +- members/members-update-do.pl | 3 +- members/moremember.pl | 3 +- members/notices.pl | 3 +- members/pay.pl | 3 +- members/paycollect.pl | 3 +- members/printfeercpt.pl | 3 +- members/printinvoice.pl | 3 +- members/printslip.pl | 3 +- members/readingrec.pl | 3 +- members/routing-lists.pl | 3 +- members/setstatus.pl | 3 +- members/update-child.pl | 3 +- offline_circ/enqueue_koc.pl | 3 +- offline_circ/list.pl | 3 +- offline_circ/process.pl | 3 +- offline_circ/process_koc.pl | 3 +- offline_circ/service.pl | 3 +- opac/opac-memberentry.pl | 8 +- patroncards/create-pdf.pl | 4 +- patroncards/edit-batch.pl | 4 +- patroncards/edit-layout.pl | 3 +- patroncards/edit-profile.pl | 3 +- patroncards/edit-template.pl | 3 +- patroncards/home.pl | 3 +- patroncards/image-manage.pl | 3 +- patroncards/manage.pl | 3 +- patroncards/print.pl | 3 +- plugins/plugins-home.pl | 3 +- plugins/plugins-uninstall.pl | 3 +- plugins/plugins-upload.pl | 3 +- plugins/run.pl | 3 +- reports/borrowers_out.pl | 3 +- reports/cat_issues_top.pl | 3 +- reports/catalogue_out.pl | 3 +- reports/catalogue_stats.pl | 3 +- reports/dictionary.pl | 3 +- reports/issues_avg_stats.pl | 3 +- reports/issues_stats.pl | 3 +- reports/itemslost.pl | 3 +- reports/manager.pl | 3 +- reports/reports-home.pl | 3 +- reports/serials_stats.pl | 3 +- reports/stats.print.pl | 3 +- reserve/modrequest.pl | 3 +- reserve/modrequest_suspendall.pl | 3 +- reserve/placerequest.pl | 3 +- serials/acqui-search-result.pl | 3 +- serials/acqui-search.pl | 3 +- serials/checkexpiration.pl | 3 +- serials/reorder_members.pl | 3 +- serials/routing-preview.pl | 3 +- serials/routing.pl | 3 +- serials/serials-collection.pl | 3 +- serials/serials-edit.pl | 3 +- serials/subscription-add.pl | 3 +- serials/subscription-bib-search.pl | 3 +- serials/subscription-renew.pl | 3 +- serials/viewalerts.pl | 3 +- services/itemrecorddisplay.pl | 3 +- suggestion/suggestion.pl | 3 +- svc/authentication | 3 +- svc/bib | 3 +- svc/bib_profile | 3 +- svc/checkouts | 3 +- svc/config/systempreferences | 3 +- svc/import_bib | 3 +- svc/new_bib | 3 +- tags/list.pl | 3 +- tags/review.pl | 3 +- tools/background-job-progress.pl | 3 +- tools/batchMod.pl | 3 +- tools/copy-holidays.pl | 3 +- tools/exceptionHolidays.pl | 3 +- tools/holidays.pl | 3 +- tools/import_borrowers.pl | 3 +- tools/inventory.pl | 2 +- tools/koha-news.pl | 3 +- tools/letter.pl | 3 +- tools/manage-marc-import.pl | 3 +- tools/newHolidays.pl | 20 +- tools/overduerules.pl | 3 +- tools/quotes-upload.pl | 3 +- tools/quotes.pl | 3 +- tools/quotes/quotes-upload_ajax.pl | 3 +- tools/quotes/quotes_ajax.pl | 3 +- tools/scheduler.pl | 3 +- tools/stage-marc-import.pl | 3 +- tools/upload-cover-image.pl | 3 +- virtualshelves/sendshelf.pl | 3 +- xt/author/podcorrectness.t | 4 +- xt/author/show-template-structure.pl | 3 +- xt/author/translatable-templates.t | 4 +- xt/author/valid-templates.t | 3 +- xt/find-license-problems | 3 +- xt/fix-old-fsf-address | 3 +- xt/single_quotes.t | 3 +- xt/verify-debian-docbook.t | 4 +- 278 files changed, 329 insertions(+), 1046 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/lib/shims/json2.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/shims/json2.min.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 5 14:05:05 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Feb 2018 13:05:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-393-ga49cc5a 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 a49cc5a5850a2ba70e274c389ceee63d8396fbdb (commit) via 1e2f88990da0747ea7164b98060fb82bac24670f (commit) from 2ff5482c973eb2f1835a3e372bcee6f16c4a9445 (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 a49cc5a5850a2ba70e274c389ceee63d8396fbdb Author: Jonathan Druart Date: Mon Feb 5 09:56:42 2018 -0300 Bug 11827: (follow-up) Use double quote instead of simple-quote commit 1e2f88990da0747ea7164b98060fb82bac24670f Author: Jonathan Druart Date: Mon Feb 5 09:55:50 2018 -0300 Bug 20109: (follow-up) Use double quote instead of simple-quote ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 5 14:11:30 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Feb 2018 13:11:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-394-ge6f8059 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 e6f8059a04144bf9247a6f43e19f83ba2c4f7f9a (commit) from a49cc5a5850a2ba70e274c389ceee63d8396fbdb (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 e6f8059a04144bf9247a6f43e19f83ba2c4f7f9a Author: Jonathan Druart Date: Mon Feb 5 10:02:00 2018 -0300 Bug 7143: Update about page for new dev - Jenny Way Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 + 2 files changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 9 09:22:33 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Feb 2018 08:22:33 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.08-53-gd4897d2 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via d4897d2d6abfe6943ff8bdaae53cfb8b5a162876 (commit) via 8fdbaee0e4678a3e5d3f9a64ee6bb5d6ba9118ea (commit) via c2d7c71c91bf5b3579abdca5937ddb0c611aaca8 (commit) via 4177b81d49d27720f7a2b67d1b3a3524d8d78db5 (commit) from 1f34c499c8bedc260eb07930d59caa97f03f1736 (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 d4897d2d6abfe6943ff8bdaae53cfb8b5a162876 Author: Jonathan Druart Date: Mon Jan 22 17:04:28 2018 -0300 Bug 19975: Fix search by tags at the OPAC This bug has certainly be caused by commit 091d6c513bcbee224ff06477e79be48cea7fe825 Bug 17843: Replace C4::Koha::getitemtypeinfo with Koha::ItemTypes The reason is quite simple, in Koha::ItemType->translated_description (called in opac-search.pl l.229) there is an eval to know if we have access to the translated description of the item type, to avoid retrieving it again. The evaluation of $@ later in opac-search.pl is supposed to test the 2 eval made few lines before (a "normal" search, without tags), but $@ contains the error message from the *last* eval command. So we are raising an error that have been correctly handled in Koha::ItemType. Test plan: At the OPAC, click Tag cloud, then click any of the tags => Without the patch you get Koha::ItemType::get_column generated this error: DBIx::Class::Row::get_column(): No such column 'translated_description' on Koha::Schema::Result::Itemtype at /usr/share/koha/lib/Koha/Object.pm line 307 => With the patch applied the page is correctly displayed Signed-off-by: Claire Gravely Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit fc172d3252b8587006f7d6b4d747ce2b339ea803) Signed-off-by: Fridolin Somers commit 8fdbaee0e4678a3e5d3f9a64ee6bb5d6ba9118ea Author: Jonathan Druart Date: Mon Jan 22 17:18:59 2018 -0300 Bug 19985: Make TestBuilder.t pass even if default_circ_rules is not empty This table cannot contain more than 1 row, so we need to remove its data before trying to generate a new entry. Test plan: Set a default circ rule prove t/db_dependent/TestBuilder.t should return green Without this patch you get: # Failed test 'TestBuilder should be able to create an object for every source' # at t/db_dependent/TestBuilder.t line 78. # got: '1' # expected: '0' # The following sources have not been generated correctly: DefaultCircRule # Looks like you failed 1 test of 1. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 55d8ea59e7964d05ffb68e7bfcf14d6556ed8739) Signed-off-by: Fridolin Somers commit c2d7c71c91bf5b3579abdca5937ddb0c611aaca8 Author: Kyle M Hall Date: Mon May 8 16:47:06 2017 +0000 Bug 18477: Populate article_requests table values for AR_PENDING notices The default AR_PENDING letter does not print populate <> fields. Test Plan: 1) Enable article requests ( syspref: ArticleRequests => Enable, Circ and fine rules ALL/ALL (or a given category/itemtype): Article requests => Yes ) 2) Search for a title, click in to catalog detail, click 'Request Article' button. 3) Select Patron 4) Fill out request information 5) Click 'Place request' 6) Go to notices in patron record, inspect 'Article Request Received' notice. You should see the request information from step 4, but it doesn't display. 7) Apply this patch 8) Repeat steps 2-6, not the fields now display! Signed-off-by: Eric Phetteplace Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit e1a61134eb921760ebe3ac992a151591bb3977bf) Signed-off-by: Fridolin Somers commit 4177b81d49d27720f7a2b67d1b3a3524d8d78db5 Author: Jonathan Druart Date: Tue Jan 2 14:36:43 2018 -0300 Bug 18477: Add tests Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 2a0423778e73467beeb57379db49b49b811894aa) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: Koha/ArticleRequest.pm | 1 + opac/opac-search.pl | 2 +- t/db_dependent/ArticleRequests.t | 25 +++++++++++++++++++++++-- t/db_dependent/TestBuilder.t | 1 + 4 files changed, 26 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 9 17:58:24 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Feb 2018 16:58:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-406-g0927962 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 0927962b45016fb30e378ddf4860ed7f4a0b7f59 (commit) via 571c088ceec98f34320f27e505245a0cdfa52a82 (commit) via f3453684dfe388314cda39d4ace23041d1b6af98 (commit) via 91198900191ee53051f64a0f7bb1d14b712d3ce0 (commit) via d77d371c4fe679c416554806da0d1c94ec06bc02 (commit) via bb98e99dc6349ba316889e2123f6218d42863fc7 (commit) via 0ad922011cc330397d9b680b0d045bfd48e85f44 (commit) via 0f43bdd6416cf997bf656f5f3766f6f6020b52a5 (commit) via f89a2bbdbeefe2befe77c2985a11109d3e23ac88 (commit) via 43c67312a02c60f77f8a164b3766dbcbd8196554 (commit) via 3e23c85bceb61f81c1487c1812844631fa0f9a5a (commit) via bc2a79f86b7fd9268ec4b2cd85f5a9c871bff12a (commit) from e6f8059a04144bf9247a6f43e19f83ba2c4f7f9a (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 0927962b45016fb30e378ddf4860ed7f4a0b7f59 Author: Liz Rea Date: Wed Dec 13 15:14:58 2017 +1300 Bug 19801: Display messages on user details page as well as on check out page To test: Look up a borrower, add a message (internal or opac) Click the Details tab for that borrower Messages should be displayed above the user information [is this the right place? it could go below] adding messages on this page should make them immediately available deleting messages on this page should delete them immediately and bring you back to the detail page. Basically, make sure messages work from both the Check out and detail pages and that there are no typos. Messages should work the same as they always have from the Check Out page. sponsored-by: Catalyst IT Signed-off-by: Simon Pouchol Signed-off-by: Marjorie Vila Signed-off-by: Alex Arnaud Bug 19801 - Fixes for QA - Fixes indentation - changes messages to patron_messages (even though it's not like that on the circulation page.) Signed-off-by: Marjorie Vila Signed-off-by: Alex Arnaud commit 571c088ceec98f34320f27e505245a0cdfa52a82 Author: Owen Leonard Date: Thu Jan 4 14:16:42 2018 +0000 Bug 10032: (follow-up) Move title attribute to button container This patch modifies the "Close basket" button markup so that the title attribute on a disabled button is added to the button wrapper
instead of the tag. This allows the title attribute tooltip to appear when the cursor is hovered over the button. To test, follow the original patch's test plan and confirm that when the "Close basket" button is disabled, hovering the mouse over the button triggers the title attribute tooltip. Signed-off-by: Charlotte Cordwell Signed-off-by: Katrin Fischer commit f3453684dfe388314cda39d4ace23041d1b6af98 Author: Jon Knight Date: Tue Dec 12 17:50:36 2017 +0000 Bug 10032: Improve GUI when uncertain price prevents closing the basket Added disabled "Close this basket" button when uncertain prices are present. Note that whilst this has a "title" attribute, there is no tooltip shown because JQueryUI disabled buttons don't get DOM events. https://bugs.koha-community.org/show_bug.cgi?id=10032 Signed-off-by: Charlotte Cordwell Signed-off-by: Katrin Fischer commit 91198900191ee53051f64a0f7bb1d14b712d3ce0 Author: Owen Leonard Date: Wed Feb 7 17:42:09 2018 +0000 Bug 20156: Display a markup for the current language in header menu This patch replaces Glyphicon markup with Font Awesome markup so that a check mark appears next to the currently-selected language in the staff client header's language menu. Also changed in this patch: Some classes have been removed because they are not used in staff client CSS. To test you must have multiple languages installed and enabled in the staff client. - Set the StaffLangSelectorMode system preference to "top" or "both top and footer" - Confirm that the currently-select language in the langauge menu has a check mark next to it. Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer commit d77d371c4fe679c416554806da0d1c94ec06bc02 Author: Tomas Cohen Arazi Date: Mon Feb 5 10:28:37 2018 -0300 Bug 20134: Remove /api/v1/app.pl from the generated URLs This patch removes the /api/v1/app.pl prefix from generated baseUrl. It has the consequence of hardcoding / as the base path for the API. This is ok because we don't currently support mounting Koha pieces in different than hardcoded paths (/cgi-bin/koha?), but certainly worth mentioning because this will need to depend on a syspref or config entry when someone chages this behviour. To test: - On master, point your browser to: http://kohadev.mydnsname.org:8080/api/v1/ => FAIL: basePath looks like /api/v1/app.pl/api/v1 - Apply this patch - Restart memcached and plack: $ restart_all or $ sudo systemctl restart memcached && sudo systemctl restart koha-common - Reload http://kohadev.mydnsname.org:8080/api/v1/ => SUCCESS: basePath is /api/v1 - Sign off :-D Signed-off-by: Julian Maurice Signed-off-by: Katrin Fischer commit bb98e99dc6349ba316889e2123f6218d42863fc7 Author: Jonathan Druart Date: Tue Feb 6 10:41:03 2018 -0300 Bug 12904: Fix occurrences not caught by script Signed-off-by: Josef Moravec commit 0ad922011cc330397d9b680b0d045bfd48e85f44 Author: Jonathan Druart Date: Tue Jan 23 10:22:47 2018 -0300 Bug 12904: Force browser to load new javascript files after upgrade This patch has been automatically generated using: perl kv.pl **/*.tt **/*.inc Signed-off-by: Josef Moravec commit 0f43bdd6416cf997bf656f5f3766f6f6020b52a5 Author: Jonathan Druart Date: Tue Jan 23 10:24:52 2018 -0300 Bug 12904: Pass KOHA_VERSION in C4::Auth Signed-off-by: Josef Moravec commit f89a2bbdbeefe2befe77c2985a11109d3e23ac88 Author: Olli-Antti Kivilahti Date: Wed May 24 09:34:17 2017 -0400 Bug 12904: Add mod_expire to etc/koha-httpd.conf Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec commit 43c67312a02c60f77f8a164b3766dbcbd8196554 Author: Kyle M Hall Date: Thu Dec 22 15:42:30 2016 +0000 Bug 12904: Apache configuration Signed-off-by: Nick Clemens Signed-off-by: Olli-Antti Kivilahti Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec commit 3e23c85bceb61f81c1487c1812844631fa0f9a5a Author: Victor Grousset Date: Wed Jan 10 16:07:36 2018 +0100 Bug 19928: Acquisitions' CSV exports now honors syspref "delimiter" Bonus fixes: - Basketgroup: there was an unnecessary space. " RRP tax excluded" replaced by "RRP tax excluded" - Late orders: - leading spaces before every line - surrounding spaces for [% orders.size %] Other changes: - quoted "Total orders in late" to no worry about additional spaces - Late orders: additional spaces which shouldn't be a problem because all the fields are enclosed by quotes. Test plan: 1. Set syspref "delimiter" to "#'s" 2. Change the language e.g. FR-fr 3. Create a vendor with minimal info 4. Create a basket with two items 5. Go to the basket. URL should be /cgi-bin/koha/acqui/basket.pl?basketno=XXXXX 6. Close this basket 7. "Export as CSV" 8. You should see that the file contains commas "," This is the bug. Leave the file open for future comparison to ensure that there are no regressions. 9. Create a basket group with two baskets (tick the close this basket group check box) 10. Go to the "Closed" tab to see your basket group 11. "Export as CSV" 12. You should see that the file contains commas "," This is the bug. Leave the file open for future comparison to ensure that there are no regressions. 13. Go to /cgi-bin/koha/acqui/lateorders.pl 14. Tick two orders. Of the same vendor, otherwise Koha won't let you tick orders of different vendors. 15. "Export as CSV" 16. You should see that the file contains commas "," This is the bug. Leave the file open for future comparison to ensure that there are no regressions. 17. Apply this patch 18. Translation stuff 1. cd misc/translator 2. perl translate update YOUR_LANG 3. manually edit the po file, remove the fuzzy tags. And translate the string. You can just copy the original and replace some parts by gibberish. 4. perl translate install YOUR_LANG 19. Re-export the same CSVs and compare with the original version to check that - delimiter syspref is honored - the headers are translatable - there is no whitespace regression (additional newlines or spaces) Signed-off-by: Mark Tompsett Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer commit bc2a79f86b7fd9268ec4b2cd85f5a9c871bff12a Author: Jonathan Druart Date: Wed Feb 7 11:27:50 2018 -0300 Bug 7143: Fix typo developper vs developer ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 2 + Koha/REST/V1.pm | 5 +++ circ/del_message.pl | 9 ++++- debian/templates/apache-shared-intranet.conf | 2 + debian/templates/apache-shared-opac.conf | 2 + docs/history.txt | 24 +++++------ etc/koha-httpd.conf | 20 ++++++++++ .../prog/en/includes/csv_headers/acqui/basket.tt | 5 ++- .../en/includes/csv_headers/acqui/basketgroup.tt | 5 ++- .../en/includes/csv_headers/acqui/lateorders.tt | 5 ++- .../intranet-tmpl/prog/en/includes/datatables.inc | 10 ++--- .../prog/en/includes/doc-head-close-receipt.inc | 2 +- .../prog/en/includes/doc-head-close.inc | 14 +++---- .../intranet-tmpl/prog/en/includes/greybox.inc | 6 +-- .../intranet-tmpl/prog/en/includes/help-top.inc | 18 ++++----- .../prog/en/includes/installer-doc-head-close.inc | 16 ++++---- .../prog/en/includes/intranetstylesheet.inc | 2 +- .../intranet-tmpl/prog/en/includes/js_includes.inc | 22 +++++----- .../prog/en/includes/langmenu-staff-top.inc | 8 ++-- .../intranet-tmpl/prog/en/includes/select2.inc | 4 +- .../prog/en/includes/wysiwyg-systempreferences.inc | 2 +- .../prog/en/modules/acqui/acqui-home.tt | 6 +-- .../prog/en/modules/acqui/addorderiso2709.tt | 8 ++-- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 9 +++-- .../prog/en/modules/acqui/basketgroup.tt | 20 +++++----- .../prog/en/modules/acqui/basketheader.tt | 4 +- .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/acqui/csv/basket.tt | 19 ++++++++- .../prog/en/modules/acqui/csv/basketgroup.tt | 32 ++++++++++++++- .../prog/en/modules/acqui/csv/lateorders.tt | 18 ++++++++- .../prog/en/modules/acqui/edifactmsgs.tt | 4 +- .../prog/en/modules/acqui/histsearch.tt | 6 +-- .../prog/en/modules/acqui/invoice-files.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 4 +- .../prog/en/modules/acqui/invoices.tt | 2 +- .../prog/en/modules/acqui/lateorders.tt | 4 +- .../prog/en/modules/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/acqui/neworderempty.tt | 8 ++-- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/acqui/newordersuggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 6 +-- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 6 +-- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- .../prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/acqui/uncertainprice.tt | 4 +- .../prog/en/modules/acqui/z3950_search.tt | 6 +-- .../prog/en/modules/admin/aqbudgetperiods.tt | 6 +-- .../prog/en/modules/admin/aqbudgets.tt | 8 ++-- .../prog/en/modules/admin/aqcontract.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 4 +- .../prog/en/modules/admin/audio_alerts.tt | 4 +- .../en/modules/admin/auth_subfields_structure.tt | 2 +- .../prog/en/modules/admin/auth_tag_structure.tt | 4 +- .../prog/en/modules/admin/authorised_values.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 4 +- .../prog/en/modules/admin/biblio_framework.tt | 6 +-- .../en/modules/admin/branch_transfer_limits.tt | 6 +-- .../prog/en/modules/admin/branches.tt | 6 +-- .../prog/en/modules/admin/categories.tt | 6 +-- .../prog/en/modules/admin/checkmarc.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 4 +- .../prog/en/modules/admin/classsources.tt | 2 +- .../prog/en/modules/admin/clone-rules.tt | 2 +- .../prog/en/modules/admin/columns_settings.tt | 2 +- .../prog/en/modules/admin/currency.tt | 4 +- .../prog/en/modules/admin/didyoumean.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 2 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 2 +- .../prog/en/modules/admin/fieldmapping.tt | 2 +- .../en/modules/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/admin/items_search_field.tt | 2 +- .../prog/en/modules/admin/items_search_fields.tt | 4 +- .../prog/en/modules/admin/itemtypes.tt | 4 +- .../prog/en/modules/admin/koha2marclinks.tt | 4 +- .../prog/en/modules/admin/localization.tt | 2 +- .../en/modules/admin/marc_subfields_structure.tt | 4 +- .../prog/en/modules/admin/marctagstructure.tt | 6 +-- .../prog/en/modules/admin/matching-rules.tt | 2 +- .../prog/en/modules/admin/oai_set_mappings.tt | 2 +- .../prog/en/modules/admin/oai_sets.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/admin/preferences.tt | 12 +++--- .../prog/en/modules/admin/printers.tt | 2 +- .../admin/searchengine/elasticsearch/mappings.tt | 2 +- .../prog/en/modules/admin/smart-rules.tt | 2 +- .../prog/en/modules/admin/sms_providers.tt | 4 +- .../prog/en/modules/admin/sru_modmapping.tt | 2 +- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/admin/usage_statistics.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 4 +- .../prog/en/modules/authorities/authorities.tt | 6 +-- .../prog/en/modules/authorities/detail.tt | 2 +- .../prog/en/modules/authorities/merge.tt | 2 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +-- .../prog/en/modules/catalogue/ISBDdetail.tt | 4 +- .../prog/en/modules/catalogue/MARCdetail.tt | 4 +- .../prog/en/modules/catalogue/advsearch.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 10 ++--- .../prog/en/modules/catalogue/imageviewer.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 8 ++-- .../prog/en/modules/catalogue/labeledMARCdetail.tt | 4 +- .../prog/en/modules/catalogue/moredetail.tt | 4 +- .../prog/en/modules/catalogue/results.tt | 4 +- .../prog/en/modules/catalogue/search-history.tt | 4 +- .../prog/en/modules/cataloguing/addbiblio.tt | 8 ++-- .../prog/en/modules/cataloguing/additem.tt | 8 ++-- .../prog/en/modules/cataloguing/editor.tt | 2 +- .../prog/en/modules/cataloguing/merge.tt | 2 +- .../cataloguing/value_builder/cn_browser.tt | 2 +- .../en/modules/cataloguing/z3950_auth_search.tt | 6 +-- .../prog/en/modules/cataloguing/z3950_search.tt | 6 +-- .../prog/en/modules/circ/circulation.tt | 14 +++---- .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 6 +-- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 2 +- .../prog/en/modules/circ/printslip.tt | 2 +- .../prog/en/modules/circ/request-article.tt | 2 +- .../prog/en/modules/circ/reserveratios.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 +- .../prog/en/modules/circ/transferstoreceive.tt | 2 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- .../prog/en/modules/clubs/club-enrollments.tt | 4 +- .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 4 +- .../prog/en/modules/common/patron_search.tt | 2 +- .../en/modules/course_reserves/course-details.tt | 2 +- .../en/modules/course_reserves/course-reserves.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 4 +- .../prog/en/modules/ill/ill-requests.tt | 4 +- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- .../prog/en/modules/labels/label-edit-batch.tt | 2 +- .../prog/en/modules/labels/label-home.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 2 +- .../intranet-tmpl/prog/en/modules/labels/result.tt | 2 +- .../prog/en/modules/labels/spinelabel-print.tt | 6 +-- .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 2 +- .../prog/en/modules/members/member-flags.tt | 4 +- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 4 +- .../prog/en/modules/members/moremember-receipt.tt | 2 +- .../prog/en/modules/members/moremember.tt | 42 +++++++++++++++----- .../prog/en/modules/members/notices.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/pay.tt | 2 +- .../prog/en/modules/members/printfeercpt.tt | 2 +- .../prog/en/modules/members/printinvoice.tt | 2 +- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/statistics.tt | 2 +- .../prog/en/modules/members/update-child.tt | 2 +- .../prog/en/modules/offline_circ/list.tt | 2 +- .../prog/en/modules/offline_circ/process_koc.tt | 4 +- .../prog/en/modules/onboarding/onboardingstep2.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep3.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep4.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep5.tt | 2 +- .../prog/en/modules/patron_lists/add-modify.tt | 2 +- .../prog/en/modules/patron_lists/list.tt | 6 +-- .../prog/en/modules/patron_lists/lists.tt | 4 +- .../prog/en/modules/patroncards/edit-batch.tt | 2 +- .../prog/en/modules/plugins/plugins-home.tt | 2 +- .../prog/en/modules/reports/cash_register_stats.tt | 2 +- .../en/modules/reports/guided_reports_start.tt | 2 +- .../prog/en/modules/reports/itemslost.tt | 2 +- .../prog/en/modules/reports/itemtypes.tt | 2 +- .../prog/en/modules/reports/orders_by_budget.tt | 2 +- .../prog/en/modules/reports/serials_stats.tt | 2 +- .../prog/en/modules/reserve/request.tt | 2 +- .../prog/en/modules/reviews/reviewswaiting.tt | 2 +- .../en/modules/rotating_collections/addItems.tt | 4 +- .../rotating_collections/editCollections.tt | 4 +- .../rotating_collections/rotatingCollections.tt | 6 +-- .../rotating_collections/transferCollection.tt | 4 +- .../prog/en/modules/serials/add_fields.tt | 2 +- .../prog/en/modules/serials/claims.tt | 2 +- .../prog/en/modules/serials/serials-collection.tt | 6 +-- .../prog/en/modules/serials/serials-edit.tt | 4 +- .../prog/en/modules/serials/serials-home.tt | 2 +- .../prog/en/modules/serials/serials-search.tt | 4 +- .../prog/en/modules/serials/subscription-add.tt | 4 +- .../prog/en/modules/serials/subscription-detail.tt | 2 +- .../modules/serials/subscription-numberpatterns.tt | 4 +- .../prog/en/modules/suggestion/suggestion.tt | 8 ++-- .../intranet-tmpl/prog/en/modules/tags/list.tt | 2 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 6 +-- .../tools/automatic_item_modification_by_age.tt | 6 +-- .../prog/en/modules/tools/batchMod-del.tt | 8 ++-- .../prog/en/modules/tools/batchMod-edit.tt | 10 ++--- .../prog/en/modules/tools/batchMod.tt | 2 +- .../prog/en/modules/tools/batch_delete_records.tt | 6 +-- .../en/modules/tools/batch_record_modification.tt | 8 ++-- .../prog/en/modules/tools/cleanborrowers.tt | 2 +- .../prog/en/modules/tools/csv-profiles.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/export.tt | 2 +- .../prog/en/modules/tools/holidays.tt | 4 +- .../prog/en/modules/tools/inventory.tt | 6 +-- .../prog/en/modules/tools/koha-news.tt | 6 +-- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 8 ++-- .../prog/en/modules/tools/manage-marc-import.tt | 6 +-- .../modules/tools/marc_modification_templates.tt | 4 +- .../prog/en/modules/tools/modborrowers.tt | 4 +- .../prog/en/modules/tools/overduerules.tt | 2 +- .../prog/en/modules/tools/quotes-upload.tt | 10 ++--- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 10 ++--- .../prog/en/modules/tools/scheduler.tt | 2 +- .../prog/en/modules/tools/showdiffmarc.tt | 4 +- .../prog/en/modules/tools/stage-marc-import.tt | 6 +-- .../prog/en/modules/tools/upload-images.tt | 6 +-- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 6 +-- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 8 ++-- .../opac-tmpl/bootstrap/en/includes/datatables.inc | 4 +- .../bootstrap/en/includes/doc-head-close.inc | 18 ++++----- .../opac-tmpl/bootstrap/en/includes/greybox.inc | 6 +-- .../bootstrap/en/includes/opac-bottom.inc | 36 ++++++++--------- .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 2 +- .../bootstrap/en/modules/opac-advsearch.tt | 4 +- .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 2 +- .../bootstrap/en/modules/opac-auth-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +- .../bootstrap/en/modules/opac-course-details.tt | 2 +- .../bootstrap/en/modules/opac-course-reserves.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 14 +++---- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/opac-overdrive-search.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 2 +- .../bootstrap/en/modules/opac-results-grouped.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 10 ++--- .../bootstrap/en/modules/opac-search-history.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- .../bootstrap/en/modules/opac-suggestions.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/sco/help.tt | 8 ++-- .../bootstrap/en/modules/sco/printslip.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 8 ++-- members/moremember.pl | 14 +++++++ 240 files changed, 666 insertions(+), 519 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 9 18:58:25 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Feb 2018 17:58:25 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-407-g35b60cb 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 35b60cbd139146ecbce7a0b3ba7a51e912630c48 (commit) from 0927962b45016fb30e378ddf4860ed7f4a0b7f59 (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 35b60cbd139146ecbce7a0b3ba7a51e912630c48 Author: Jonathan Druart Date: Fri Feb 9 14:49:21 2018 -0300 Bug 19928: Mock delimiter pref in tests Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Acquisition/GetBasketAsCSV.t | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 12 19:54:25 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 12 Feb 2018 18:54:25 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-481-g90fea78 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 90fea78bc15642798d9f7e9540c6f7f09258ff47 (commit) via cb6c280c53c18ee8d25b71c8011dc9188ed3ccca (commit) via e7aa94b78216e9c71c2ecbcec3b329db8af54f46 (commit) via 702c464c7472596022af17ff388793acfad008bb (commit) via 75a40acc39997a40aa8c692a58ec819630eb8f22 (commit) via 1240cd140890f9698202ac7682fae6864296e105 (commit) via f353a6caacb8bc0c075106a1b1060db0495fdecf (commit) via 9f961c963d2a3131b3377bb444d4060ca3b74e8e (commit) via 84e17bd716bd2f561a58a7688700dddf2faa4b98 (commit) via 9d52044f65a611d49cd8f78f7aeaef24a018e357 (commit) via a0919c3a29b70a83063a245da6e967ccf5328e4d (commit) via ca0ca1b99e01baa913e2b5c56a87b529d8819bab (commit) via 25655c3bc56338ac5327745a9d3f2e378d37e8da (commit) via 340c18d8bc2c2b0691c0c45de201d4b663d90a47 (commit) via 607c66e436a0e4eddfb59f1c0ce6a69311c8e9ce (commit) via d433a4dc3d18c68ed579c5c720465060602283b2 (commit) via 5b3b382f5814c2d30234e80d00f238547871d3e5 (commit) via a037b80ee325e3828141ebc15533e8f3d159de5a (commit) via 5c8365e4a748a6e3eadddccc44a196087d4da279 (commit) via fda87270ad49d403e70f3db4291c2ca65649cfeb (commit) via 710175fbe6721583028083d498f1df4a44bb1784 (commit) via dc1e7f478f150a33d53a07114d65aead54569f48 (commit) via e484b543f796df481edfb5e00920fb30c162fe80 (commit) via fb2550de6e2c47ad83b63a196f50cbe1e0e16b43 (commit) via 38ae35332a60da74a69afb8765f8f2f3e870c11d (commit) via 55544f0187545747b1fbc2ce74ed44517ba7ca2f (commit) via 40ae454b9b0678d9e9f0418216bd546bc222e4f5 (commit) via 7809a6bd132e6bd2c98d69179fc2c2f0788decb0 (commit) via 032992042dc0dcc910465e1ded4b7bbb6d23e9f6 (commit) via c6299bbca5dc1654652814f9792f276670e1ac7f (commit) via ea15f3112b4de5d0fb76343d4545ccfd940d40fd (commit) via fa54100dffe092e606f79b15692eedaf78f42e45 (commit) via 5f80977875ff124d411f2cd89de4a944fa9c27af (commit) via e09ed656af5f75a82ccfa29318081e217618c32d (commit) via 6ef64cda22dc7a17c72215bbb0d74c240b314646 (commit) via cee2cf9ff927504f9c24f6519462a7d702c5c27d (commit) via 4bc92169dcc04cd0bd586abf01828331711980cc (commit) via 4134df83734d2fabd4806339854cfab41faab82d (commit) via d2f2590c894efca417112795e05248dbd16636f5 (commit) via eb68ca2af2c9ebf32091f98380dbbd07cd7ff2e6 (commit) via 6e14fd52761f709f0644fe3a59700895cb1e7f87 (commit) via 95d0a17e8b873c493f099fc69772e4c50908a21c (commit) via 1cd2ad6e052d12e6ccf4d0b098ff2dd7a1fa526a (commit) via a364bb15a7c7c49017d0a928bbe9e02038231419 (commit) via 1a0421dbf78e896d831c8ac5c1caf44b802208c2 (commit) via bb02cd1a7375fe391c37408981662d70c6aa0499 (commit) via dc475cceabba7fceb3e53a8021cd9799b46b7d4b (commit) via ae870e767a3edbb786e4815220c57ca624e3d5e3 (commit) via ad6a7aaf85d1c10fe74c9c1c503384b04372a29c (commit) via 6b106a7e7b8cb45a9f3794e325d12ad5799bb0a9 (commit) via e667fc1cfc601704a72432c7efafdd1c40a6126f (commit) via 28dccc7a112065fa39d03ca44f864be9e3174c78 (commit) via 2059f7d8016ab61172830e9b670279d3e28882b7 (commit) via d3d4820209ca8a35cf5fcce9595a8d7700ca9da9 (commit) via bd81430d4209822e69d970db3aef520a6010c94f (commit) via d1cd3d1e0520e87d373fe154946e95d64705812c (commit) via ba4a808015ac1e172983487e590b097469970355 (commit) via bc25710581e4e69abff401757ae6351601c19893 (commit) via 99543e96ab7fca91e9126db1ba9a4d838dc8e01e (commit) via f32cdb7211705a0950e98897820f3a4a7bc52cd8 (commit) via 1c4d57a7906aba9f87c04924eadb231c6f727495 (commit) via 3fdb554ad8c349f78399fb14e9a2a2e502ed2ebc (commit) via fbc466f93b3cd6900b8313db3314d2f1b946abdf (commit) via 4a2e3d1b1499c84fdc900e3fa2cc15e7f63494a2 (commit) via 1effa1b90fdf84b23934bb3b6d8f1d18fbd79641 (commit) via 5a02e867449b3f74f9b4dda44c2dfde3972de1be (commit) via 65d4289f129274a4ed504e7fb517623aeee1bb3b (commit) via bf232417fc16a366cb1389d9d64b4f978144101d (commit) via bb52f91d3c39944d7aa68b9ee1653e73c4397512 (commit) via 2cb369e5d23abfcd797832fb173b33afb9a6dbb2 (commit) via 6f2893c35bcf2aeb65680db3dc3d4dbdd51ab8e5 (commit) via ee259d614000e0121f1567fd40b0721b23d100d5 (commit) via bfb5ebc98856c111a6dcf32f1cd4cc0bb5d6c86b (commit) via 9d178613ad16d030ca9252d971f7efc615c8925f (commit) from 35b60cbd139146ecbce7a0b3ba7a51e912630c48 (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 90fea78bc15642798d9f7e9540c6f7f09258ff47 Author: Jonathan Druart Date: Fri Feb 9 15:42:03 2018 -0300 Bug 20157: DBRev 17.12.00.011 Signed-off-by: Jonathan Druart commit cb6c280c53c18ee8d25b71c8011dc9188ed3ccca Author: Jonathan Druart Date: Fri Feb 9 11:17:37 2018 -0300 Bug 20157: Group search groups together We do not actually need 2 groups, the previous feature worked for both OPAC and STAFF interface. The only difference was the "show_in_pulldown" feature. Here we are going to REMOVE this feature for ergonomic reasons. We will already have 3 features and it will surcharge the interface to add another one. Moreover the feature will have to be applied at the OPAC (and so will add lot of JS checks to keep data consistent: only useful if ft_search_groups_opac is set). Moreover it is quite easy to remove entry from the dropdown list in JavaScript. If people was really using this feature, we will re-add it, just let us know. Signed-off-by: Jonathan Druart commit e7aa94b78216e9c71c2ecbcec3b329db8af54f46 Author: Jonathan Druart Date: Fri Feb 9 10:49:56 2018 -0300 Bug 20157: Do not display OPAC groups on the staff interface Signed-off-by: Jonathan Druart commit 702c464c7472596022af17ff388793acfad008bb Author: Jonathan Druart Date: Fri Feb 9 10:10:31 2018 -0300 Bug 20157: Correctly hide the features for non first level groups Signed-off-by: Jonathan Druart commit 75a40acc39997a40aa8c692a58ec819630eb8f22 Author: Jonathan Druart Date: Fri Feb 9 10:00:06 2018 -0300 Bug 20157: Save the features that have been checked Previous patch forgot to modify the controller script to save the changes. Signed-off-by: Jonathan Druart commit 1240cd140890f9698202ac7682fae6864296e105 Author: Kyle M Hall Date: Wed Feb 7 19:48:56 2018 +0000 Bug 20157: DBIC Schema changes Signed-off-by: Jonathan Druart commit f353a6caacb8bc0c075106a1b1060db0495fdecf Author: Kyle M Hall Date: Wed Feb 7 19:44:28 2018 +0000 Bug 20157: Use group 'features' to decide which groups to use for group searching functionality Instead of basing the group searches on the group name, which is an inherently touchy system, we should use the same checkbox style that Jonathan introduced for the patron limits by group feature. Test Plan: 1) Check to ensure existing group searches still show as they used to Signed-off-by: Jonathan Druart commit 9f961c963d2a3131b3377bb444d4060ca3b74e8e Author: Jonathan Druart Date: Fri Feb 9 15:40:42 2018 -0300 Bug 20133: DBRev 17.12.00.010 Signed-off-by: Jonathan Druart commit 84e17bd716bd2f561a58a7688700dddf2faa4b98 Author: Kyle M Hall Date: Wed Feb 7 12:41:10 2018 -0500 Bug 20133: (QA follow-up) Tweak new 'group features' section Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart commit 9d52044f65a611d49cd8f78f7aeaef24a018e357 Author: Jonathan Druart Date: Fri Feb 2 14:23:42 2018 -0300 Bug 20133: Enable/disable the "Hide patron information" feature per group of libraries In order to control this feature correctly it needs to be enabled for group of libraries and not for all groups defined in the system. Groups will be used for different usages and so the feature must not be enabled by default for all of them. Test plan: Retest bug 18403 with the feature turned on/off for a given tree Signed-off-by: Jonathan Druart commit a0919c3a29b70a83063a245da6e967ccf5328e4d Author: Jonathan Druart Date: Fri Feb 2 14:21:49 2018 -0300 Bug 20133: UI Changes Add a checkbox to enable/disable the feature for given group of libraries. Important note: Only the top level node can turn the feature, the idea is to avoid confusion, ease testing (by limiting the number of cases) and force libraries to define one tree per feature (Maybe this is wrong, but maybe good to start) Signed-off-by: Jonathan Druart commit ca0ca1b99e01baa913e2b5c56a87b529d8819bab Author: Jonathan Druart Date: Fri Feb 2 14:21:26 2018 -0300 Bug 20133: DBIC Schema changes Signed-off-by: Jonathan Druart commit 25655c3bc56338ac5327745a9d3f2e378d37e8da Author: Jonathan Druart Date: Fri Feb 2 14:21:14 2018 -0300 Bug 20133: Add new column library_groups.ft_hide_patron_info Signed-off-by: Jonathan Druart commit 340c18d8bc2c2b0691c0c45de201d4b663d90a47 Author: Jonathan Druart Date: Fri Feb 9 15:38:54 2018 -0300 Bug 18403: DBRev 17.12.00.009 Signed-off-by: Jonathan Druart commit 607c66e436a0e4eddfb59f1c0ce6a69311c8e9ce Author: Jonathan Druart Date: Mon Feb 12 14:14:32 2018 -0300 Bug 18403: Fix few errors found with hit_pages.t Signed-off-by: Jonathan Druart commit d433a4dc3d18c68ed579c5c720465060602283b2 Author: Jonathan Druart Date: Fri Feb 9 16:57:01 2018 -0300 Bug 18403: Add POD for output_and_exit_if_error Signed-off-by: Jonathan Druart commit 5b3b382f5814c2d30234e80d00f238547871d3e5 Author: Kyle M Hall Date: Fri Feb 9 08:51:02 2018 -0500 Bug 18403: Fix error triggered by subgroups being added to group With one root group and two child groups and it works fine. But if I create any groups under *those* groups, not only does it not work, I get the following error: Template process failed: undef error - SQL::Abstract::puke(): [SQL::Abstract::__ANON__] Fatal: SQL::Abstract before v1.75 used to generate incorrect SQL when the -IN operator was given an undef-containing list: !!!AUDIT YOUR CODE AND DATA!!! (the upcoming Data::Query-based version of SQL::Abstract will emit the logically correct SQL instead of raising this exception) at /home/vagrant/kohaclone/Koha/Objects.pm line 269 Signed-off-by: Jonathan Druart commit a037b80ee325e3828141ebc15533e8f3d159de5a Author: Jonathan Druart Date: Wed Apr 12 09:56:22 2017 -0300 Bug 18403: Deal with the DB user On first login, Koha explodes before the logged in user does not exist in DB. This patch deals with that by adding several checks when it's needed. Test plan: Use the DB user to create a superlibrarian user. The DB user should no be allowed to do anything else. Signed-off-by: Signed-off-by: Jon McGowan Bug 18403: Fix patron creation memberentry.pl can be called to create a new patron, in that case the patron does not exist yet. Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 5c8365e4a748a6e3eadddccc44a196087d4da279 Author: Jonathan Druart Date: Mon Apr 10 17:34:34 2017 -0300 Bug 18403: REST API - patrons endpoint There is something wrond here, the userenv is no set and so we cannot user search_limited. Should we set the userenv or filter on the libraries using libraries_where_can_see_patrons? WAITING FOR FEEDBACK HERE. Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit fda87270ad49d403e70f3db4291c2ca65649cfeb Author: Jonathan Druart Date: Mon Apr 10 10:23:37 2017 -0300 Bug 18403: Guarantors Technically a kid from your library group could have a guarantor attached to another group of library, let's deal with this case. Test plan: - Create a kid from your library group - With a superlibrarian staff user create a guarantor that is outside of the group of libraries of the kid - Login with a limited staff user and confirm that on the patron detail page you do not see the link to the guarantor detail page. Note that you see the firstname and surname of the guarantor Q. should it be hidden? Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 710175fbe6721583028083d498f1df4a44bb1784 Author: Jonathan Druart Date: Fri Apr 7 17:53:35 2017 -0300 Bug 18403: Article requests Same as previously but for article requests. Test plan: Test article requests and make sure you do not need the requests for patrons that are attached to a group that is not part of your library's group Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit dc1e7f478f150a33d53a07114d65aead54569f48 Author: Jonathan Druart Date: Fri Apr 7 15:42:51 2017 -0300 Bug 18403: Patron discharges This patch deals with patron's discharges. Test plan: Same as previously you will need to request dischages at the OPAC. On the staff interface the logged in user should not be allowed to see discharge from patrons outside his library group. The number of discharges waiting displayed on the mainpage should be correct as well. Signed-off-by: Signed-off-by: Jon McGowan Bug 18403: (follow-up) Patron discharges Fix QA issue: forbidden pattern: Do not assume male gender, use they/them instead (bug 18432) (line 150) Signed-off-by: Jonathan Druart commit e484b543f796df481edfb5e00920fb30c162fe80 Author: Jonathan Druart Date: Fri Apr 7 14:37:47 2017 -0300 Bug 18403: Patron reviews This patch adds a new method Koha::Reviews->search_limited to return the reviews a logged in user is allowed to see depending his permissions. Test plan: Create some reviews at the OPAC and make sure a staff user is limited (or not) to approve or decline it. The number of reviews displayed on the mainpage should be correct as well. Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit fb2550de6e2c47ad83b63a196f50cbe1e0e16b43 Author: Jonathan Druart Date: Fri Apr 7 14:02:09 2017 -0300 Bug 18403: Patron modification requests Limit patron's modifications based on logged in patron permissions. Test plan: Create some patron's modification requests at the OPAC Make sure the logged in staff user see (or not) the modification depending his permissions. The number of modification displayed on the mainpage should be correct as well. Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 38ae35332a60da74a69afb8765f8f2f3e870c11d Author: Jonathan Druart Date: Fri Apr 7 14:00:34 2017 -0300 Bug 18403: Add new method Koha::Patron->can_see_patrons_from Technical note: Sometimes we do not have the patron object, for instance for the patron modifications we will need to know if the logged in user can modify patron's from a given library. This new subroutine 'can_see_patrons_from' will then be useful Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 55544f0187545747b1fbc2ce74ed44517ba7ca2f Author: Jonathan Druart Date: Wed Apr 5 07:34:47 2017 -0300 Bug 18403: Add tests for Koha::Patrons A bit late but here are the tests for Koha::Patron->libraries_where_can_see_patrons Koha::Patron->can_see_patron_infos Koha::Patron->search_limited Test plan: prove t/db_dependent/Koha/Patrons.t should return green Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 40ae454b9b0678d9e9f0418216bd546bc222e4f5 Author: Jonathan Druart Date: Thu Apr 6 12:59:46 2017 -0300 Bug 18403: Refactor and add Koha::Patron->libraries_where_can_see_patrons Technical note: Here we are just refactoring a code that have been copied into 3 different places. libraries_where_can_see_patrons is a terrible method's name, feel free to suggest something better. The method return a list of branchcodes to be more efficient, instead of Koha::Libraries Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 7809a6bd132e6bd2c98d69179fc2c2f0788decb0 Author: Jonathan Druart Date: Thu Apr 6 12:42:03 2017 -0300 Bug 18403: Add new methods Koha::Patrons->search_limited and use it where needed Most of the time when we search for patrons we do not want to search for all patrons, but just the ones the logged in user is allowed to see the information. This patch takes care of that by adding a new search_limited method to Koha::Patrons. When called this method only search for patrons that the logged in user is allowed to see. Test plan: Patron autocomplete search should be limited Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 032992042dc0dcc910465e1ded4b7bbb6d23e9f6 Author: Jonathan Druart Date: Wed Apr 5 18:55:13 2017 -0300 Bug 18403: output_and_exit_if_error for circulation.pl This is a follow-up for a previous patch, changes have been tested already Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit c6299bbca5dc1654652814f9792f276670e1ac7f Author: Jonathan Druart Date: Wed Apr 5 18:47:30 2017 -0300 Bug 18403: Batch patron modification tool Do not allow a logged in staff user to modify patrons that are not part of his group if he is not allowed. Test plan: Make sure you are not allowed to modify patrons that are not part of your group from the batch patron modification tool Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit ea15f3112b4de5d0fb76343d4545ccfd940d40fd Author: Jonathan Druart Date: Wed Apr 5 17:25:13 2017 -0300 Bug 18403: Use patron-title.inc when hidepatronname is used [SPECIFIC for view_holdsqueue] Same that the previous patch but for the holds queue Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit fa54100dffe092e606f79b15692eedaf78f42e45 Author: Jonathan Druart Date: Wed Apr 5 17:04:36 2017 -0300 Bug 18403: Use patron-title.inc when hidepatronname is used [SPECIFIC for issuehistory] On this page we do not have the patron object sent to the template, let's pass it! Test plan: Go on the checkout history of a bibliographic record (catalogue/issuehistory.pl) You should not see patron's information that are not part of your group if you are not allowed to see them. Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 5f80977875ff124d411f2cd89de4a944fa9c27af Author: Jonathan Druart Date: Wed Apr 5 16:43:41 2017 -0300 Bug 18403: Use patron-title.inc when hidepatronname is used There is already a HidePatronName syspref to hide patron's information on bibliographic record detail pages and the hold list. Test plan: With the HidePatronName enabled, make sure the patron's information are hidden from the catalogue and hold list pages. If the logged in user is not allowed to see the patron's info, no link and no cardnumber will be displayed With he HidePatronName disabled, make sure the patron's information are displayed if the logged in user is allowed to see the patron's info. Technical note: This patch improves the existing patron-title.inc include file to display patron's information. Using it everywhere patron's details are displayed will permit to homogenise the way they are displayed. The file takes now a patron object (what should be, in the future, the only way to use it), that way we can call the new method on it to know if patron's information can be shown by the logged in used. NOTE: I am not sure this syspref makes sense anymore. Should not we remove it? Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit e09ed656af5f75a82ccfa29318081e217618c32d Author: Jonathan Druart Date: Wed Apr 5 14:11:02 2017 -0300 Bug 18403: Only display libraries from group in dropdown lists From where patrons it's about patrons, we do not want to display the libraries from all the system, but only the ones from the group. Test plan: - See the overdues (circ/overdue.pl) and make sure you can only see overdues from patrons part of your group (do not forget to test the CSV export). - Search for patrons, the 'library' filters (headers and left side) should only display libraries from your group - Search for article request by patron's library: only the libraries from your group should be displayed Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 6ef64cda22dc7a17c72215bbb0d74c240b314646 Author: Jonathan Druart Date: Wed Apr 5 13:19:42 2017 -0300 Bug 18403: Adapt patron search This patch modifies the patron search code to limit the libraries to the ones the logged in user is allowed to access Test plan: Search for patrons You should not see patrons you are not allowed to see. Technical note: I am really glad to have refactored all the patron searches before having to write this patch. It tooks me ~40 l to acchieve this job and affect all patron searches. Thanks refactoring! Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit cee2cf9ff927504f9c24f6519462a7d702c5c27d Author: Jonathan Druart Date: Tue Apr 4 18:48:45 2017 -0300 Bug 18403: Add sub output_and_exit_if_error - unknown_patron & cannot_see_patron_infos Test plan: Login with a patron that is not allowed to see patron's information for patrons outside of his group. Try to access patron's information from scripts of the patron module (members/*) and circ/circulation.pl. You should be able to access patron's information of patrons outside of your group and get "You are not allowed to see the information of this patron." If you try and access a patron page with a borrowernumber that does not exist, you should get "This patron does not exist" Technical note: A new C4::Output subroutine is created in this patch: "output_and_exit_if_error" Executed at the beginning of the script it will permit not to copy/paste all the different checks to know if the logged in user is authorised to see patron's information. The design here can be discussed, but I did not find an alternative with as less changes. On the way I refactor what we did with 'unknowuser' previously: it will now work with all patron pages, not only the few that used it. Note that the 'or die "Not logged in";' part should not be needed, but... who trusts C4::Auth? I think it could be used as a safeguard later. I am willing to sed and remove them if required. Changes in discharge.pl are mainly indentation changes. With this patch we should now have a $patron variable that refer to the patron we want to access. That will be very useful to remove plenty of code in members/* and only pass this variable to the template (instead of 1 variable per patron's attribute). Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 4bc92169dcc04cd0bd586abf01828331711980cc Author: Jonathan Druart Date: Tue Apr 4 17:45:30 2017 -0300 Bug 18403: Update permissions - borrowers => 1|* becomes borrowers => 'edit_borrowers' Test plan: Login with a patron that only have the 'edit_borrowers' permission. You should be able to access patron's information of patrons inside of your group. Technical note: Before this patchset the borrowers permission module contains only 1 permission 'edit_borrowers'. That meant borrowers => 1 and borrowers => '*' had the same behavior. Moreover, now that we have 2 permissions, 'CAN_user_borrowers' is set when all permissions of 'borrowers' are set. We need to update the different occurrences of these tests. Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 4134df83734d2fabd4806339854cfab41faab82d Author: Jonathan Druart Date: Thu Apr 6 16:10:18 2017 -0300 Bug 18403: Add new method Koha::Patron->can_see_patron_info Technical note: This is the method that will be called on the logged_in_user variable sent to the template. Moreover we will check that the logged in user can access patron' information when access to members/* and some circulation scripts will be done. Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit d2f2590c894efca417112795e05248dbd16636f5 Author: Jonathan Druart Date: Tue Apr 4 16:43:58 2017 -0300 Bug 18403: Send logged_in_user to template from C4::Auth Technical note: To ease future changes we are passing a logged_in_user variable to templates. It contains the Koha::Patron object representing the logged in patron. This will be very useful for this patch and even after (for instance we will be able to replace easily loggedinusername and loggedinusernumber). Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit eb68ca2af2c9ebf32091f98380dbbd07cd7ff2e6 Author: Jonathan Druart Date: Thu Apr 6 16:10:02 2017 -0300 Bug 18403: Add new method Koha::Library::Group->has_child This is more a follow-up for bug 15707. It could be moved on its own bug report if necessary. IMPORTANT NOTE: At the moment the feature only works for 1 level depth, see bug 15707 comment 166+ for the discussion It means that if we have: root_group + groupA + groupA1 + groupA1_library2 + groupA_library1 + groupA2 + groupB + groupB_library1 groupA1_library2 is not considered a child of groupA1. Note that this can change. Test plan: prove t/db_dependent/LibraryGroups.t should return green Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 6e14fd52761f709f0644fe3a59700895cb1e7f87 Author: Jonathan Druart Date: Thu Apr 6 16:09:46 2017 -0300 Bug 18403: Add new method Koha::Library->library_group This is more a follow-up for bug 15707. It could be moved on its own bug report if necessary. Test plan: prove t/db_dependent/LibraryGroups.t should return green Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 95d0a17e8b873c493f099fc69772e4c50908a21c Author: Jonathan Druart Date: Tue Apr 4 16:01:41 2017 -0300 Bug 18403: Hide patron information if not part of the logged in user library group This patchset adds a new feature that will allow libraries inside a single Koha installation to restrict access to information of patrons that The group of libraries feature is introduced by bug 15707, see this bug for more information. Let's imagine that 2 groups G1 and G2 are defined and that they include 2 libraries each G1a, G1b and G2c, G2d: logged in users attached to G1a will only see patron's information from G1a and G1b. To add more flexibility, a new user permission named 'view_borrower_infos_from_any_libraries' will drive this behavior. If set, the patron will be able to see patron's information of any libraries. If the restriction is set, the logged in user will not be able to search, show, edit, delete patron's information of patrons attached to groups of libraries outside his own group. In situations we need to refer to a patron, for holds and checkouts for instance, and his information cannot be viewed, a text "A patron from library G1A" will be displayed. Considered unecessary or outside the scope of this bug report: * The report module is not affected by this feature for obvious reasons * The firstname and surname of guarantors, basket (acq) managers, patrons linked to orders are still displayed. * Log viewer: Can only be staff * patron list: you cannot add patrons from another group of librairies, but can see/delete from list (too much rewrite, or we can test for patron one by one?). * "Patron card creator" tool is not impacted by this feature. * Upload patron images is not impacted by this patch, should it be? * Tools: - Upload patrons - Clean borrowers tool (This can can done easily updating Koha::Patrons->search with Koha::Patrons->search_limited in search_upcoming_membership_expires and search_patrons_to_anonymise but we will need to move GetBorrowersToExpunge to Koha::Patrons first) We can discuss these different points but will be other bug reports not to add more complexity to this first patchset. Test plan: You will find a test plan in the following commit messages. Start by creating different group of libraries and patrons with and without the new permission. Open different browser sessions to ease the tests. Note that all patches have to be applied to test the different test plans. Technical notes: For QAers (and others) a techical note will be added to the commit messages of this patchset. I would recommend you to read them one by one to understand the different steps of this development. + Special attention should be payed to the REST api changes + Should we restrict the logged in user to libraries from his group when he wants to set his library (Home ? Circulation ? Set library)? Signed-off-by: Signed-off-by: Jon McGowan Signed-off-by: Jonathan Druart commit 1cd2ad6e052d12e6ccf4d0b098ff2dd7a1fa526a Author: Jonathan Druart Date: Fri Feb 9 15:44:25 2018 -0300 Bug 16735: DBRev 17.12.00.008 Signed-off-by: Jonathan Druart commit a364bb15a7c7c49017d0a928bbe9e02038231419 Author: Jonathan Druart Date: Tue Dec 5 14:09:23 2017 -0300 Bug 16735: DBIC Schema files Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 1a0421dbf78e896d831c8ac5c1caf44b802208c2 Author: Jonathan Druart Date: Fri Feb 9 17:00:44 2018 -0300 Bug 16735: Fix POD format for Koha::Library::Groups methods Signed-off-by: Jonathan Druart commit bb02cd1a7375fe391c37408981662d70c6aa0499 Author: Jonathan Druart Date: Fri Feb 9 11:35:03 2018 -0300 Bug 16735: Remove unecessary use of Koha::LibraryCategories in onboarding This was not used, it has been copied/pasted from admin/branches.pl Signed-off-by: Jonathan Druart commit dc475cceabba7fceb3e53a8021cd9799b46b7d4b Author: Tomas Cohen Arazi Date: Mon Dec 11 13:29:33 2017 -0300 Bug 16735: (QA follow-up) Fix rebase error Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ae870e767a3edbb786e4815220c57ca624e3d5e3 Author: Tomas Cohen Arazi Date: Mon Dec 11 12:46:05 2017 -0300 Bug 16735: (QA follow-up) POD fixes Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ad6a7aaf85d1c10fe74c9c1c503384b04372a29c Author: Kyle M Hall Date: Tue Aug 8 12:40:45 2017 -0400 Bug 16735: Use libraries in all subgroups, not just immediate children Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 6b106a7e7b8cb45a9f3794e325d12ad5799bb0a9 Author: Kyle M Hall Date: Tue Feb 21 13:36:22 2017 +0000 Bug 16735: Filter individual libraries from search group pulldown Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit e667fc1cfc601704a72432c7efafdd1c40a6126f Author: Kyle M Hall Date: Tue Feb 21 12:26:25 2017 +0000 Bug 16735: Remove use of get_categories Feature using it is completely undocumented as far as my research has shown. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 28dccc7a112065fa39d03ca44f864be9e3174c78 Author: Kyle M Hall Date: Tue Feb 21 12:07:18 2017 +0000 Bug 16735: Don't use objects for database update Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 2059f7d8016ab61172830e9b670279d3e28882b7 Author: Kyle M Hall Date: Wed Jun 22 17:10:23 2016 +0000 Bug 16735: Migrate library search groups into the new hierarchical groups Test Plan: 1) Apply this patch set 2) Note your existing search groups have been ported over to the new __SEARCH_GROUPS__ group if you had any 3) Create the group __SEARCH_GROUPS__ if one does not already exist 4) Add some first level subgroups to this group, add libraries to those groups 5) Search the library group searching in the intranet and opac 6) Note you get the same results as pre-patch Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit d3d4820209ca8a35cf5fcce9595a8d7700ca9da9 Author: Kyle M Hall Date: Thu Jun 23 13:24:54 2016 +0000 Bug 16735: Clean up sample data Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit bd81430d4209822e69d970db3aef520a6010c94f Author: Kyle M Hall Date: Thu Jun 23 11:44:15 2016 +0000 Bug 16735: Remove tables no longer needed Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit d1cd3d1e0520e87d373fe154946e95d64705812c Author: Kyle M Hall Date: Wed Jun 22 18:28:03 2016 +0000 Bug 16735: Remove modules no longer needed Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ba4a808015ac1e172983487e590b097469970355 Author: Jonathan Druart Date: Fri Feb 9 15:13:35 2018 -0300 Bug 15707: DBRev 17.12.00.007 Signed-off-by: Jonathan Druart commit bc25710581e4e69abff401757ae6351601c19893 Author: Tomas Cohen Arazi Date: Wed Dec 6 16:12:47 2017 -0300 Bug 15707: (QA follow-up) Style buttons correctly Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 99543e96ab7fca91e9126db1ba9a4d838dc8e01e Author: Jonathan Druart Date: Tue Dec 5 14:05:28 2017 -0300 Bug 15707: DBIC Schema files Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit f32cdb7211705a0950e98897820f3a4a7bc52cd8 Author: Kyle M Hall Date: Wed Mar 1 13:58:54 2017 +0000 Bug 15707: Display error if group title is already used Signed-off-by: Tomas Cohen Arazi Edit: I added !$branchcode && to the checked condition so we can add multiple libraries back. Signed-off-by: Jonathan Druart commit 1c4d57a7906aba9f87c04924eadb231c6f727495 Author: Kyle M Hall Date: Wed Feb 22 19:54:58 2017 +0000 Bug 15707: Updates for Bootstrap 3 Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 3fdb554ad8c349f78399fb14e9a2a2e502ed2ebc Author: Kyle M Hall Date: Tue Feb 21 12:21:12 2017 +0000 Bug 15707: Add UNIQUE constraint to library groups table Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit fbc466f93b3cd6900b8313db3314d2f1b946abdf Author: Kyle M Hall Date: Tue Feb 21 12:16:03 2017 +0000 Bug 15707: Switch datetimes to timestamps Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 4a2e3d1b1499c84fdc900e3fa2cc15e7f63494a2 Author: Josef Moravec Date: Wed Dec 7 01:01:52 2016 +0000 Bug 15707: (follow-up) use cat-search instead of cities-search in header Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 1effa1b90fdf84b23934bb3b6d8f1d18fbd79641 Author: Kyle M Hall Date: Mon Jun 20 11:45:10 2016 +0000 Bug 15707: (QA follow-up) Allow object names to be styled without impeding translation Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 5a02e867449b3f74f9b4dda44c2dfde3972de1be Author: Kyle M Hall Date: Tue Jun 14 13:20:32 2016 +0000 Bug 15707: (QA follow-up) Remove class for treegrid Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 65d4289f129274a4ed504e7fb517623aeee1bb3b Author: Kyle M Hall Date: Tue Jun 14 11:55:25 2016 +0000 Bug 15707: (QA follow-up) Fix UI issues Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit bf232417fc16a366cb1389d9d64b4f978144101d Author: Jonathan Druart Date: Sun Jun 12 10:15:38 2016 +0100 Bug 15707: (QA follow-up) Drop table if exists 1/ DROP table if exists 2/ FAIL spelling decendents ==> descendants Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit bb52f91d3c39944d7aa68b9ee1653e73c4397512 Author: Kyle M Hall Date: Tue Apr 19 13:33:39 2016 +0000 Bug 15707: (QA follow-up) Switch to treetable which Koha already uses Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 2cb369e5d23abfcd797832fb173b33afb9a6dbb2 Author: Jonathan Druart Date: Mon Feb 15 17:24:35 2016 +0000 Bug 15707: Fix conflict with bug 15446 (type vs _type) Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 6f2893c35bcf2aeb65680db3dc3d4dbdd51ab8e5 Author: Kyle M Hall Date: Fri Feb 5 06:53:20 2016 +0000 Bug 15707: Unit Tests Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit ee259d614000e0121f1567fd40b0721b23d100d5 Author: Kyle M Hall Date: Sun Jan 31 11:22:51 2016 +0000 Bug 15707: Add library groups editor Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit bfb5ebc98856c111a6dcf32f1cd4cc0bb5d6c86b Author: Kyle M Hall Date: Sun Jan 31 11:22:19 2016 +0000 Bug 15707: Add Koha::Library::Group(s) modules Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 9d178613ad16d030ca9252d971f7efc615c8925f Author: Kyle M Hall Date: Sun Jan 31 11:21:00 2016 +0000 Bug 15707: Update DB Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 26 +- C4/Circulation.pm | 29 -- C4/Output.pm | 40 ++ C4/SIP/ILS/Transaction/Checkin.pm | 2 +- C4/Utils/DataTables/Members.pm | 42 ++- Koha.pm | 2 +- Koha/ArticleRequests.pm | 39 +- Koha/Hold.pm | 1 + Koha/Libraries.pm | 17 +- Koha/Library.pm | 43 +-- Koha/Library/Group.pm | 208 +++++++++++ Koha/{Serial/Items.pm => Library/Groups.pm} | 48 ++- Koha/LibraryCategories.pm | 52 --- Koha/LibraryCategory.pm | 58 --- Koha/Patron.pm | 96 +++++ Koha/Patron/Discharge.pm | 30 +- Koha/Patron/Modifications.pm | 49 ++- Koha/Patrons.pm | 21 ++ Koha/REST/V1/Patron.pm | 3 +- Koha/Reviews.pm | 23 ++ Koha/Schema/Result/Branch.pm | 44 +-- Koha/Schema/Result/Branchcategory.pm | 116 ------ Koha/Schema/Result/Branchrelation.pm | 115 ------ .../Result/{ClubTemplate.pm => LibraryGroup.pm} | 147 ++++---- Koha/Template/Plugin/Branches.pm | 3 +- Koha/Template/Plugin/{KohaDates.pm => KohaSpan.pm} | 19 +- admin/branches.pl | 85 +---- admin/library_groups.pl | 119 ++++++ api/v1/swagger/paths/holds.json | 2 +- api/v1/swagger/paths/patrons.json | 4 +- catalogue/detail.pl | 13 +- catalogue/issuehistory.pl | 20 +- catalogue/moredetail.pl | 13 +- catalogue/search.pl | 13 +- circ/add_message.pl | 2 +- circ/branchtransfers.pl | 4 - circ/circulation.pl | 5 + circ/del_message.pl | 2 +- circ/overdue.pl | 12 +- circ/returns.pl | 7 - circ/view_holdsqueue.pl | 3 + circ/ysearch.pl | 2 +- edithelp.pl | 2 +- .../data/mysql/en/optional/sample_libraries.sql | 2 - .../data/mysql/es-ES/optional/sample_libraries.sql | 4 - installer/data/mysql/kohastructure.sql | 52 ++- .../mysql/nb-NO/2-Valgfritt/sample_libraries.sql | 4 - .../data/mysql/pl-PL/optional/sample_libraries.sql | 4 - .../data/mysql/ru-RU/optional/example_branches.sql | 19 - installer/data/mysql/updatedatabase.pl | 104 ++++++ installer/data/mysql/userpermissions.sql | 2 + installer/onboarding.pl | 16 - koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 5 + .../prog/en/includes/acquisitions-toolbar.inc | 1 + .../intranet-tmpl/prog/en/includes/admin-menu.inc | 3 +- .../intranet-tmpl/prog/en/includes/adv-search.inc | 4 +- .../prog/en/includes/authorities-toolbar.inc | 1 + .../prog/en/includes/blocking_errors.inc | 10 + .../prog/en/includes/borrower_debarments.inc | 6 +- .../prog/en/includes/budgets-admin-toolbar.inc | 1 + .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 1 + .../intranet-tmpl/prog/en/includes/circ-menu.inc | 16 +- .../intranet-tmpl/prog/en/includes/header.inc | 2 +- .../intranet-tmpl/prog/en/includes/home-search.inc | 4 +- .../prog/en/includes/labels-toolbar.inc | 1 + .../prog/en/includes/members-menu.inc | 2 +- .../prog/en/includes/members-toolbar.inc | 17 +- .../prog/en/includes/patron-search.inc | 2 +- .../prog/en/includes/patron-title.inc | 100 +++-- .../prog/en/includes/patron-toolbar.inc | 1 + .../prog/en/includes/patroncards-toolbar.inc | 1 + .../intranet-tmpl/prog/en/includes/permissions.inc | 2 + .../prog/en/includes/reports-toolbar.inc | 1 + .../en/includes/rotating-collections-toolbar.inc | 1 + .../prog/en/includes/serials-toolbar.inc | 1 + .../prog/en/includes/virtualshelves-toolbar.inc | 2 + .../prog/en/modules/admin/admin-home.tt | 6 +- .../prog/en/modules/admin/branches.tt | 140 +------ .../prog/en/modules/admin/library_groups.tt | 395 ++++++++++++++++++++ .../prog/en/modules/catalogue/advsearch.tt | 22 +- .../prog/en/modules/catalogue/detail.tt | 22 +- .../prog/en/modules/catalogue/issuehistory.tt | 31 +- .../prog/en/modules/circ/article-requests.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 4 +- .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 11 +- .../prog/en/modules/circ/view_holdsqueue.tt | 12 +- .../prog/en/modules/common/patron_search.tt | 2 +- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 8 +- .../prog/en/modules/members/discharge.tt | 4 +- .../prog/en/modules/members/discharges.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/files.tt | 4 +- .../prog/en/modules/members/housebound.tt | 4 - .../prog/en/modules/members/member.tt | 4 +- .../prog/en/modules/members/memberentrygen.tt | 17 +- .../prog/en/modules/members/moremember.tt | 21 +- .../prog/en/modules/members/printfeercpt.tt | 1 + .../prog/en/modules/members/statistics.tt | 6 +- .../prog/en/modules/reserve/request.tt | 8 +- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 26 +- .../bootstrap/en/modules/opac-advsearch.tt | 6 +- labels/label-item-search.pl | 2 +- mainpage.pl | 6 +- members/boraccount.pl | 6 +- members/default_messageprefs.pl | 2 +- members/deletemem.pl | 17 +- members/discharge.pl | 14 +- members/discharges.pl | 10 +- members/files.pl | 14 +- members/guarantor_search.pl | 2 +- members/housebound.pl | 12 +- members/mancredit.pl | 9 +- members/maninvoice.pl | 13 +- members/member-flags.pl | 7 +- members/member-password.pl | 11 +- members/member.pl | 2 +- members/memberentry.pl | 22 +- members/members-home.pl | 2 +- members/members-update-do.pl | 8 +- members/members-update.pl | 2 +- members/mod_debarment.pl | 10 +- members/moremember.pl | 15 +- members/nl-search.pl | 2 +- members/notices.pl | 5 +- members/pay.pl | 11 +- members/paycollect.pl | 9 +- members/print_overdues.pl | 6 + members/printfeercpt.pl | 11 +- members/printinvoice.pl | 11 +- members/printslip.pl | 5 + members/purchase-suggestions.pl | 11 +- members/readingrec.pl | 10 +- members/routing-lists.pl | 9 +- members/setstatus.pl | 26 +- members/statistics.pl | 11 +- members/summary-print.pl | 9 +- members/update-child.pl | 12 +- opac/opac-memberentry.pl | 2 +- opac/opac-overdrive-search.pl | 2 +- opac/opac-search.pl | 10 +- reserve/request.pl | 9 +- reviews/reviewswaiting.pl | 4 +- svc/checkouts | 2 +- svc/members/search | 2 +- t/db_dependent/ArticleRequests.t | 36 +- t/db_dependent/Koha/Libraries.t | 37 +- t/db_dependent/Koha/Patron/Modifications.t | 39 +- t/db_dependent/Koha/Patrons.t | 115 +++++- t/db_dependent/Koha/Reviews.t | 36 +- t/db_dependent/LibraryGroups.t | 126 +++++++ t/db_dependent/Patron/Borrower_Discharge.t | 55 ++- t/db_dependent/RotatingCollections.t | 1 - tools/modborrowers.pl | 58 ++- tools/tools-home.pl | 2 +- 154 files changed, 2229 insertions(+), 1374 deletions(-) create mode 100644 Koha/Library/Group.pm copy Koha/{Serial/Items.pm => Library/Groups.pm} (50%) delete mode 100644 Koha/LibraryCategories.pm delete mode 100644 Koha/LibraryCategory.pm delete mode 100644 Koha/Schema/Result/Branchcategory.pm delete mode 100644 Koha/Schema/Result/Branchrelation.pm copy Koha/Schema/Result/{ClubTemplate.pm => LibraryGroup.pm} (55%) copy Koha/Template/Plugin/{KohaDates.pm => KohaSpan.pm} (71%) create mode 100755 admin/library_groups.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt create mode 100644 t/db_dependent/LibraryGroups.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 12 22:10:21 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 12 Feb 2018 21:10:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-503-g1c5633b 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 1c5633b0ea1e6393d9f31e990d97c6c75f65899a (commit) via 15b46699d5de79cddfcef6a5199355f95d4a6fb3 (commit) via 25c5f3968fde4559898a8f7c6733afa534d3e08a (commit) via c15abaeda937fde619c79e7b437902994e2d7f9b (commit) via 75c0481466f0b3887847e24a2069cd396d8f712c (commit) via a1686054ac3467bc1770de8f0f5485b208a49e6d (commit) via 5373bbaf5d1bdfcf997e0f9b2e67962c40374220 (commit) via ffd7fa3a068ff60976b1cf6f94fd2a48ae2d619c (commit) via 5a43228c547200e4b6d9f03fe25e98d124889226 (commit) via 55af5cdc0052a7cbc10f12b1fffeec26f1e886d4 (commit) via d83f0c1d8aa0da95c77d6d083f5bf2a702a56f66 (commit) via ca161474f3f01e9b1b444a2bc21566de6e17afdb (commit) via e9f096fec335b9a1b453e4c56f30f8d9aa22652b (commit) via bd4992749b75f2d8e57fe3ddce1eb9ff4b004fe1 (commit) via 8070357a4070cbcfb6f854fa421b48482b1c0ab4 (commit) via 09a72046f4c6abc4826db3df5170be72cbb66c4e (commit) via 3f0652056c55b49b712861adffee59ee6fd56119 (commit) via 9fb4aa36c6dda1e206b0c28a4da554c225357305 (commit) via 88735fd8fef786ac10d167e1b027fa7ad9c75a9e (commit) via 4dea9b80f9b2bc38af42ed532297f2554dd10a0a (commit) via 38e8b47e262cfe1c53770d91a6c700594b438e11 (commit) via c2bfe53eea6c4e549f47ad060ff6b5f3aa04ea5d (commit) from 90fea78bc15642798d9f7e9540c6f7f09258ff47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1c5633b0ea1e6393d9f31e990d97c6c75f65899a Author: Jonathan Druart Date: Mon Feb 12 17:55:00 2018 -0300 Bug 19790: DBRev 17.12.00.014 Signed-off-by: Jonathan Druart commit 15b46699d5de79cddfcef6a5199355f95d4a6fb3 Author: Marcel de Rooy Date: Mon Dec 11 10:09:00 2017 +0100 Bug 19790: Add a db revision for existing installs Since many installs may still have the additionalauthors kohafield, this patch adds a dbrev in atomicupdate to clear it. Test plan: [1] Run updatedatabase. Check that you see no additionalauthors anymore in marc_subfield_structure.kohafield. Signed-off-by: Marcel de Rooy Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 25c5f3968fde4559898a8f7c6733afa534d3e08a Author: Marcel de Rooy Date: Mon Dec 11 09:39:37 2017 +0100 Bug 19790: Remove additionalauthors.author from installer files In the upgrade from 2.2 to 3.0 (some time ago already) the table additionalauthors has been dropped. Unfortunately, a reference to this table has not been removed from the MARC framework installer files. This patch clears kohafield for 700$a or 200$g in 32 installer files. Note: The reference to additionalauthors in field kohafield is silently ignored in AddBiblio/ModBiblio since the routines _koha_add_biblio, _koha_add_biblioitem, _koha_modify_biblio and _koha_modify_biblioitem_nonmarc simply do not use it. You can define a Koha to MARC mapping for a biblio/biblioitem field but if the field is not referenced in one of those routines, nothing happens.. Also note that C4::Items::_koha_modify_item does not hardcode all fields and will respond to a new item mapping. Test plan: [1] Run a new install or verify somehow that the change to these sql files is correct. The change is a result of: sed -i -e "s/'additionalauthors.author'/''/g" Signed-off-by: Marcel de Rooy Run a new install with MARC21 and English. This includes the mandatory file marc21_framework_DEFAULT.sql. Verified that 700$a was inserted correctly (without additionalauthors). Signed-off-by: Charles Farmer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit c15abaeda937fde619c79e7b437902994e2d7f9b Author: Jonathan Druart Date: Mon Feb 12 17:43:55 2018 -0300 Bug 18403: Fix POD for C4::Output::output_and_exit_if_error xt/author/podcorrectness.t C4/Output.pm (310): Expected text after =item, not a bullet Signed-off-by: Jonathan Druart commit 75c0481466f0b3887847e24a2069cd396d8f712c Author: Jonathan Druart Date: Mon Feb 12 17:35:53 2018 -0300 Bug 18403: Fix perlcritic on Koha::Patron Perl::Critic found these violations in "Koha/Patron.pm": "return" statement followed by "sort" at line 798, column 5. Behavior is undefined if called in scalar context. (Severity: 5) Signed-off-by: Jonathan Druart commit a1686054ac3467bc1770de8f0f5485b208a49e6d Author: Jonathan Druart Date: Mon Feb 12 17:33:18 2018 -0300 Bug 18403: rename Koha::Patron->can to has_permission I do not exactly why but there is a conflict in the name of the method prove t/db_dependent/api/v1/patrons.t failed with [Mon Feb 12 17:13:16 2018] [error] Can't use string ("TO_JSON") as a HASH ref while "strict refs" in use at /home/vagrant/kohaclone/C4/Auth.pm line 2053. Signed-off-by: Jonathan Druart commit 5373bbaf5d1bdfcf997e0f9b2e67962c40374220 Author: Jonathan Druart Date: Mon Feb 12 17:52:49 2018 -0300 Bug 20175: DBRev 17.12.00.013 Signed-off-by: Jonathan Druart commit ffd7fa3a068ff60976b1cf6f94fd2a48ae2d619c Author: Jonathan Druart Date: Wed Feb 7 11:58:02 2018 -0300 Bug 20175: [sql_modes] (follow-up) Set a correct default value for club_enrollments.date_created From comment 6: """ Can't recreate database, when creating table structure, I got: there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause I am on mysql 5.5.59, which is still default in jessie, more timestamp columns are possible from mysql 5.6.5: https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-5.html """ Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 5a43228c547200e4b6d9f03fe25e98d124889226 Author: Jonathan Druart Date: Mon Feb 5 14:22:59 2018 -0300 Bug 20175: [sql_modes] Set a correct default value for club_enrollments.date_created 0000-00-00 00:00:00 is not a valid timestamp. It will fix the installer and upgrade process Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart commit 55af5cdc0052a7cbc10f12b1fffeec26f1e886d4 Author: Owen Leonard Date: Wed Feb 7 17:23:56 2018 +0000 Bug 20155: (follow-up) Compiled CSS This patch contains the compiled opac.css file. Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit d83f0c1d8aa0da95c77d6d083f5bf2a702a56f66 Author: Owen Leonard Date: Wed Feb 7 17:17:34 2018 +0000 Bug 20155: Improve readability of OPAC header language menu This patch makes some minor HTML and CSS changes in order to make the header's language-chooser menu more readable and consistent with the Lists menu. To test, apply this patch and the patch with the compiled CSS. - Install and enable more than one translation. - Set the OpacLangSelectorMode to either "top" or "both top and footer." - View the OPAC's header menu and confirm that the links and menus look correct whether or not a user is logged in. Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit ca161474f3f01e9b1b444a2bc21566de6e17afdb Author: Marcel de Rooy Date: Fri Feb 9 11:47:52 2018 +0100 Bug 19451: (QA follow-up) Replace weird subquery As requested, we add a JOIN and make the SELECT distinct. Signed-off-by: Marcel de Rooy Tested that no-overwrite still works as expected. Signed-off-by: Jonathan Druart commit e9f096fec335b9a1b453e4c56f30f8d9aa22652b Author: Josef Moravec Date: Wed Feb 7 21:06:10 2018 +0000 Bug 19451: (QA follow-up) Change parameter name no_overwrite to no-overwrite for consistency Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit bd4992749b75f2d8e57fe3ddce1eb9ff4b004fe1 Author: Marcel de Rooy Date: Thu Oct 12 12:19:11 2017 +0200 Bug 19451: Add no_overwrite option to borrowers-force-messaging-defaults.pl This option allows you to add preferences only when they are not yet present. In other words: skip patrons that already set their prefs. Test plan: [1] Delete all borrower messaging prefs for a patron. [2] Run borrowers-force-messaging-defaults.pl -no-overwrite -doit Verify that the patron now has default msg preferences. [3] Change his settings and make them non-default. For instance, increase days in advance. [4] Run borrowers-force-messaging-defaults.pl -no-overwrite -doit Verify that the patron still has the non-default settings. [5] Run borrowers-force-messaging-defaults.pl -doit Verify that the patron msg prefs have been overwritten. Signed-off-by: Marcel de Rooy Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 8070357a4070cbcfb6f854fa421b48482b1c0ab4 Author: Jonathan Druart Date: Mon Feb 12 17:50:33 2018 -0300 Bug 15752: DBRev 17.12.00.012 Signed-off-by: Jonathan Druart commit 09a72046f4c6abc4826db3df5170be72cbb66c4e Author: Josef Moravec Date: Thu Dec 21 19:17:20 2017 +0000 Bug 15752: (QA follow-up) Remove unecessary redirect If the borrowernumber is defined in query, it starts to get information about previous borrower and the new one is taken into account fully on second page reload Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 3f0652056c55b49b712861adffee59ee6fd56119 Author: Jonathan Druart Date: Thu Dec 21 15:14:22 2017 -0300 Bug 15752: (QA follow-up) Remove unecessary redirect We are on circulation.pl, no need to redirect. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 9fb4aa36c6dda1e206b0c28a4da554c225357305 Author: Josef Moravec Date: Fri Aug 18 10:58:51 2017 +0000 Bug 15752: (QA follow-up) Inform user that patron was automatically switched Test plan: 1) Start checking out to some patron - there should be no message about auto switching 2) read the another patrons card - note the patron is switched and there is a message about it at top of the main page content Followed test plan, patch worked as described. Passed QA test tool Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 88735fd8fef786ac10d167e1b027fa7ad9c75a9e Author: Josef Moravec Date: Fri Aug 18 12:20:40 2017 +0200 Bug 15752: (follow-up) Search for patrons only if param barcode is defined Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 4dea9b80f9b2bc38af42ed532297f2554dd10a0a Author: Chad Billman Date: Thu Jan 21 10:59:01 2016 -0500 Bug 15752: Automatically switch to patron when cardnumber is read during circulation With this syspref enabled scanning a patron barcode into the item barcode field during circulation will redirect you to the patron's circulation page. This allows circulation with only a barcode scanner. Testing: - Enable the AutoSwitchPatron syspref - Navigate to a patron's check out screen - Enter a patron barcode into the "Enter item barcode" field Result - Browser should be redirected to the entered patron Signed-off-by: Joel Followed test plan, patch works as described Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart commit 38e8b47e262cfe1c53770d91a6c700594b438e11 Author: Pasi Kallinen Date: Fri Feb 9 08:35:18 2018 +0200 Bug 20166: Untranslatable course reserves delete prompt Having a Template Toolkit statements inside the javascript translation function _() prevents it from being picked for translation. The only example of such is the course reserve delete prompt. Move the TT statement outside the string. Test plan: 1) Update and install language xx-YY. Check that the msgids "Are you sure you want to delete this course? There is %s attached item." and "Are you sure you want to delete this course? There are %s attached items." do not exist in the xx-YY-staff-prog.po 2) Check the translated file intranet-tmpl/prog/fi-FI/modules/course_reserves/course-details.tt It should have two prompt texts above in English 3) Install patch 4) Update the language. Check that the msgids show up in xx-YY-staff-prog.po, translate them, and install the language. 5) Repeat 2, the prompts should now show up in the correct language. 6) Enable UsecourseReserves 7) Go to Home -> Course reserves 8) Create a new course, and add reserves to it 9) See the course details. Click on Delete course, the prompt should be correctly translated 10) Remove all but one of the reserves from the course 11) Repeat 9 To see if there are other such TT statements: rgrep -E '\b_\("[^"]*\[%' koha-tmpl/ Signed-off-by: Pasi Kallinen Signed-off-by: Roch D'Amour Signed-off-by: Jonathan Druart commit c2bfe53eea6c4e549f47ad060ff6b5f3aa04ea5d Author: Indranil Das Gupta (L2C2 Technologies) Date: Sun Jan 21 23:59:35 2018 +0530 Bug 20054: Remove attribute "text/css" for