From gitmaster at git.koha-community.org Mon Dec 4 15:54:12 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Dec 2017 14:54:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-1-gaf7d618 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 af7d618d2b12655631e9febae74c222367495900 (commit) from 2b74d72a2d72f2be1361d3d223c403b992c80fab (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 af7d618d2b12655631e9febae74c222367495900 Author: Jonathan Druart Date: Wed Nov 29 13:50:45 2017 -0300 Koha 17.12 - Panuku (start of a new dev cycle) Panaku is a M?ori word and have the meaning of "movement". It can be used to talk about the unstable/development version of Koha. Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 7 13:43:33 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Dec 2017 12:43:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-15-g7db41b3 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 7db41b379ff2fbf9827a8b752897bf6ee4409026 (commit) via f8a25307c4d748ee3646cec8753d91d73f1cd58d (commit) via e46ab82e2855597274fb927f2eea7265eb4b7565 (commit) via 7d5488ee280137ee216d53df9f82bd27ee8ff663 (commit) via 916b057e91f69c86b92bd416011b87cc614632f2 (commit) via 67741fb69efc071e7dbfea151c919123318089cc (commit) via 68a6b6bba4058f0c9dda79f3789ce3d8a76bcb56 (commit) via 4eebaabc2efe3a57e748c053e933d9632fa91efc (commit) via ebd7c422b48c53fa037b69a9150f8e0460d24418 (commit) via 1beb65ed4f48af9314ce63ea28054425c1139360 (commit) via 42e6716546adfaf5ec9bbc6e01e58f19f6473254 (commit) via 5f7d644001ed0f206d247866e2a461de9a995976 (commit) via a03e9249f09f9580cb225200544314a709685845 (commit) via d5a61798522862cb0d230c7a655d5d6999c6940b (commit) from af7d618d2b12655631e9febae74c222367495900 (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 7db41b379ff2fbf9827a8b752897bf6ee4409026 Author: Mark Tompsett Date: Mon Oct 23 14:00:53 2017 +0000 Bug 10222: Correct and expand to other languages This added column names, and reformated to be a bit more readable. This also adds this change to de-DE, es-ES, fr-CA, and nb-NO. While there was printer_profiles for it-IT, the Italian file seems to not use the same numbers, and does not visibly look like it needs these changes. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit f8a25307c4d748ee3646cec8753d91d73f1cd58d Author: Chris Nighswonger Date: Thu Apr 16 12:07:29 2015 -0400 Bug 10222: Error when saving Demco label templates This patch fixes a bug whereby if you open either of the Demco label templates (loaded by the sample data) and click "save" without making any changes you will get an error: Can't bless non-reference value at C4/Creators/Profile.pm line 92. It also fixes another minor bug in the creator sample data. To test: 1. Install all sample data in a clean database. 2. In the label tool, edit either of the Demco label templates. 3. Save the template and observe the error mentioned above. 4. Drop and recreate the database. 5. Apply the patch. 6. Repeate steps 1-3 and note the successful save. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit e46ab82e2855597274fb927f2eea7265eb4b7565 Author: Nick Clemens Date: Fri Jul 28 11:58:46 2017 +0000 Bug 18990: Overdue Notices are not sending through SMS correctly Bug 18478 fixed sms via email problems under the assumption that to_address was either smsalertnumber or blank. It seems overdues set the to_address to email. This patch changes the code to enforce that an sms sent with emial driver will use the smsalertnumebr and provider defined for the borrower, regardless of what is set in the queue To test: 1 - Define a messaging prefs for a patron to recieve hold notices via SMS 2 - Ensure you have defined an SMS message for an overdue letter 3 - Set an SMS alert number for patron 4 - Set the SMS::Send driver to 'Email' 5 - Checkout an item as overdue to trigger notice above 6 - Run overdue_notices.pl 6 - Check the db and note the address is email 7 - run process_message_queue.pl 8 - Check db - address is email followed by service provider 9 - Apply patch 10 - repeat 11 - Message to_address should be populated with smsalertnumber Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 7d5488ee280137ee216d53df9f82bd27ee8ff663 Author: Owen Leonard Date: Thu Nov 16 19:19:33 2017 +0000 Bug 19643: Pagination buttons on staged marc management are stacking instead of inline This patch modifies the template for staged MARC import management to correct a problem with the style of pagination links. To test you must have more than 25 staged imports. Go to Tools -> Staged MARC management. The pagination links, both at the top and the bottom, should look correct (use multi-page SQL report results for reference). Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 916b057e91f69c86b92bd416011b87cc614632f2 Author: David Bourgault Date: Wed Nov 22 13:58:21 2017 -0500 Bug 19681: Correct result count formatting This simply passes the missing information to the template. Test plan: 0) Apply patch 1) Go to Tools > Label creator > New > Label batch 2) Press 'Add items' 3) Do a search that will return few items 4) The result count will read "Results 1 through X of X" Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 67741fb69efc071e7dbfea151c919123318089cc Author: Simon Pouchol Date: Fri Nov 24 16:53:49 2017 +0100 Bug 19692: fix unclosed div in opac-shelves.tt Test plan: 1. set syspref OpacKohaUrl to "Show" 2. Log into the OPAC 3. /cgi-bin/koha/opac-shelves.pl 4. Notice that "Powered by Koha" is not in the footer in this page. When on the other tabs it's in the footer (out of .main) 5. Apply this patch 6. Notice that "Powered by Koha" now in the footer in the "your lists" page Signed-off-by: Dominic Pichette Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 68a6b6bba4058f0c9dda79f3789ce3d8a76bcb56 Author: Kyle M Hall Date: Thu Oct 26 07:35:53 2017 -0400 Bug 19533: Hold pulldown for itemtype is empty if hold placement needs override Test Plan: 1) Enable AllowHoldPolicyOverride 2) Enable AllowHoldItemTypeSelection 3) Create a situation where adding a hold for a patron would trigger a tooManyReserves warning. 4) Note the itemtype pulldown is empty 5) Apply this patch 6) Reload the page 7) Itemtype pulldown should have values Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 4eebaabc2efe3a57e748c053e933d9632fa91efc Author: Fridolin Somers Date: Wed Jun 21 13:05:40 2017 +0200 Bug 18833: Plugin unimarc_field_210c pagination error In plugin unimarc_field_210c, the editors search results have pagination. First page works but not other pages. The main problem whas mainly because $startfrom var was missused. It is defined in C4::Output::pagination_bar as page number. This patch corrects by using a $offset var. Also removes dead code, obsoleted by using C4::Output::pagination_bar. Also changes hardcoded results per page from 19 to 20. Test plan : - Use UNIMARC catalogue - Define in framework value builder unimarc_field_210c on 210$c - Create autority type EDITORS with heading 200$b - Create 22 authorities of that type - Index those new authorities - Create a new biblio record - Click on 210$c plugin - Click on "Search" - You see 20 results - Click on page 2 => Without patch you get empty table => With patch you get 2 results - Check that you see "Results 21 to 22 of 22" - Delete 2 autorities and retest Works as intended. Signed-off-by: Simon Pouchol Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit ebd7c422b48c53fa037b69a9150f8e0460d24418 Author: Josef Moravec Date: Fri Oct 13 06:44:55 2017 +0000 Bug 19456: Make patron-title ability to be generated with or without html tags Modified pages: circ/circulation.pl circ/circulation_batch_checkouts.pl members/boraccount.pl members/files.pl members/holdshistory.pl members/housebound.pl members/moremember.pl members/notices.pl members/purchase-suggestions.pl members/readingrec.pl members/routing-lists.pl members/statistics.pl Test plan: 0) Do not apply the patch 1) Have a patron with title/salution filled in 2) Confirm bug, go for example to circ/circulation page and see there is html in tag (you can see it in your browser page/window title) 3) Apply the patch 4) Go through circulation/patron pages (see modified page above) and confirm there is no html in <title> tag, but on the page itself the salutation should be in <span class="patron-title"> Signed-off-by: David Bourgalt <david.bourgault at inlibro.com> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 1beb65ed4f48af9314ce63ea28054425c1139360 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Thu Nov 16 15:22:48 2017 +0100 Bug 19640: fix OPAC IdRef webservice display The OPAC webservice IdRef display was broken. The call returns results but citations where empty. Maybe the webservice has changed. This patch corrects the fetch of datas in result. Also fixes a small HTML missing tag tr. Also adds a comment with link to official doc : http://documentation.abes.fr/aideidrefdeveloppeur/index.html#MicroWebBiblio Test plan : 1) Enable system preference IdRef 2) Choose an existing PPN like 032581270 3) Look result on : https://www.idref.fr/services/biblio/032581270.json 4) Call in OPAC website : /cgi-bin/koha/opac-idref.pl?unimarc3=032581270 5) Without patch you see only one role containing empty rows 6) With patch you see all roles with correct rows Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: removed unused @unimarc3 (not to be confused with $unimarc3). Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 42e6716546adfaf5ec9bbc6e01e58f19f6473254 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Fri Nov 24 09:27:14 2017 +0100 Bug 19646: (QA follow-up) Fix tab character Resolve qa tools warning: FAIL koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt FAIL forbidden patterns forbidden pattern: tab char (line 172) Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 5f7d644001ed0f206d247866e2a461de9a995976 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Fri Nov 17 13:38:06 2017 +0100 Bug 19646: fix value_builder marc21_linking_section template When using marc21_linking_section cataloging plugin, you get the error : Template process failed: undef error - The method selected is not covered by tests! at /home/koha/src/C4/Templates.pm line 122. It commes from [% IF ( itypeloo.selected ) %], selected is not defined in itypeloo. This patch removes this condition because all item types are fetched from database, there is not one selected. It sets "All item types" as selected. Also correctes two errors in HTML : ending form and div, "<a_class=" instead of "<a class=" Test plan : 1) Use a MARC21 database 2) Define marc21_linking_section cataloging plugin in framework, on 773$t for example 3) Create a new biblio record 4) Click on icon in 773$t 5) Check plugin works fine Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a03e9249f09f9580cb225200544314a709685845 Author: David Bourgault <david.bourgault at inlibro.com> Date: Wed Nov 22 14:35:27 2017 -0500 Bug 19683: Fix authority types in tools/export template Fixes the bug by correcting the variable names in the template. To test: 1) Tools > Export > Export authority records 2) Authority Types dropdown is not empty Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: Changing the export script and unblessing is not needed. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit d5a61798522862cb0d230c7a655d5d6999c6940b Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 6 16:33:56 2017 -0300 Bug 19766: (bug 19058 follow-up) Fix Preview routing slip This patch fixes the following errors: The method reserve_id is not covered by tests at /home/vagrant/kohaclone/C4/Reserves.pm line 859. The method set is not covered by tests at /home/vagrant/kohaclone/C4/Reserves.pm line 871. Can't call method "store" on an undefined value at /home/vagrant/kohaclone/C4/Reserves.pm line 871. This is caused by commit ba1f2f93ef58c8dd935add3e215facdd4a589d12 Bug 19058: Move C4::Reserves::GetReserveId to the Koha namespace We are calling ->reserve_id on a Koha::Holds set. Test plan: - Serials -> Find subscription -> "Edit routing list" in the sidebar - Add 1+ recipients - Save -> "Save and preview routing slip" Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 4 +- C4/Reserves.pm | 5 +- cataloguing/value_builder/unimarc_field_210c.pl | 52 ++++---------------- .../mysql/de-DE/optional/sample_creator_data.sql | 7 ++- .../data/mysql/en/optional/sample_creator_data.sql | 7 ++- .../mysql/es-ES/optional/sample_creator_data.sql | 7 ++- .../mysql/fr-CA/facultatif/sample_creator_data.sql | 10 ++-- .../nb-NO/2-Valgfritt/sample_creator_data.sql | 7 ++- .../prog/en/includes/patron-title.inc | 16 ++++-- .../value_builder/marc21_linking_section.tt | 15 +++--- .../prog/en/modules/circ/circulation.tt | 2 +- .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/files.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 2 +- .../prog/en/modules/members/housebound.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- .../prog/en/modules/members/notices.tt | 2 +- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/routing-lists.tt | 2 +- .../prog/en/modules/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/export.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-idref.tt | 8 +-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- labels/label-item-search.pl | 2 + opac/opac-idref.pl | 43 +++++++--------- reserve/request.pl | 2 + t/db_dependent/Holds.t | 11 ++++- t/db_dependent/Letters.t | 14 +++++- 31 files changed, 126 insertions(+), 118 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 7 13:55:27 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Dec 2017 12:55:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-16-gf03da28 Message-ID: <E1eMvi3-0001mn-7Q@git.koha-community.org> 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 f03da2810cf9fa0f671243f90d31a915c67d6825 (commit) from 7db41b379ff2fbf9827a8b752897bf6ee4409026 (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 f03da2810cf9fa0f671243f90d31a915c67d6825 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 09:47:28 2017 -0300 Bug 7143: Update about page for new dev - Simon Pouchol Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 7 15:28:22 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Dec 2017 14:28:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-32-g2d10327 Message-ID: <E1eMx9y-0006j0-TV@git.koha-community.org> 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 2d10327e987c9ced850ad5d885370cc9e1e61c34 (commit) via d5292616ace986c72c174c67e838159725f0dcdf (commit) via a8e42c5f2141dca75fbc0e4f80d20898c4df118c (commit) via 8915df00601d525e1823e03026f757a0b0e8de49 (commit) via a6de8f50b14ac8babb6b6c932e7e96396d93903b (commit) via 14f8bce9aeae1126b9fe611a8af5e2ec7a4e72dc (commit) via edc8031f4a2347e65f424eba8a56b7ddd35ca42f (commit) via a1710014dcf8b5b72f82b9388ae70f4dd882a933 (commit) via 9debea25c74de3b0ce48a1b53ef61a7969cd6676 (commit) via 0c4d23a1936fd1b5a06219e3914f8ca76ef01c10 (commit) via 7d77fbd79fc85f9dae92eee2609b570a43a61d29 (commit) via db68a2f432bc3ec92fe5fed230fdd24a5dc91c94 (commit) via 8e61e6ee2c3400e6a01b03a46477ddf5bfe5c10c (commit) via 215226966b7cb3a35cd178244574b6b4d20c3b10 (commit) via daf9d619e5932fce9fe108a72a48450228feb5e6 (commit) via 0d828094e8e12a5c8ee814044a46bafb9897a552 (commit) from f03da2810cf9fa0f671243f90d31a915c67d6825 (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 2d10327e987c9ced850ad5d885370cc9e1e61c34 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 10:52:28 2017 -0300 Bug 19496: ReplytoDefault is a pref, not a C4::Context method Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit d5292616ace986c72c174c67e838159725f0dcdf Author: Aleisha Amohia <aleishaamohia at hotmail.com> Date: Mon Nov 27 21:33:58 2017 +0000 Bug 19496: Fixing to_address for patron notes This patch ensures the patron note to_address is the branch email or the Koha Admin email, and the from_address is the patron's email. To test: 1) Ensure syspref 'allowcheckoutnotes' is turned on 2) Go to OPAC, leave a note on a checkout 3) Confirm that the note is received (in mysql message_queue) but the to_address is the patron's email - this is wrong 4) Apply patch and refresh OPAC 5) Leave a note on a checkout 6) Confirm that the note is received in message queue 7) Confirm that the to_address is one of: - branch email - branch reply to - syspref ReplytoDefault - syspref KohaAdminEmailAddress 8) Confirm that the from_address is one of: - patron email - patron emailpro - patron B_email Sponsored-by: Catalyst IT Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a8e42c5f2141dca75fbc0e4f80d20898c4df118c Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 10:26:32 2017 -0300 Bug 19724: DBIC Schema changes Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 8915df00601d525e1823e03026f757a0b0e8de49 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 10:20:36 2017 -0300 Bug 19724: DBRev 17.12.00.001 Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a6de8f50b14ac8babb6b6c932e7e96396d93903b Author: Mark Tompsett <mtompset at hotmail.com> Date: Thu Jul 6 15:42:43 2017 +0000 Bug 18907: Build has deprecating message Following the instructions at: https://wiki.koha-community.org/wiki/Building_Debian_Packages_-_The_Easy_Way Receiving the following message in the build: dpkg-source: warning: relation < is deprecated: use << or <= This patch tweaks the list-deps. git diff origin/master -- debian/list-deps shows just the one line changed from < to << as per the messages suggestion and eythian's suggestion on IRC: http://irc.koha-community.org/koha/2017-07-06#i_1950698 The control file can be regenerated from the command-line: ./debian/update-control However, it will be attached separately. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 14f8bce9aeae1126b9fe611a8af5e2ec7a4e72dc Author: Victor Grousset <victor.grousset at biblibre.com> Date: Fri Nov 24 12:02:47 2017 +0100 Bug 12497: Fix OPAC search history reachable by URL even when disabled Test plan: 1. Set EnableOpacSearchHistory syspref to "Keep" 2. Make a search in the OPAC 3. Go to /cgi-bin/koha/opac-search-history.pl 4. Set the EnableOpacSearchHistory syspref to "Don't keep" 5. Refresh the OPAC page to show that history is still accessible 6. Apply the patch 7. Refresh the OPAC page, you should end on the 404 page 8. Set EnableOpacSearchHistory syspref to "Keep" 9. Go to /cgi-bin/koha/opac-search-history.pl which should be reachable Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Charles Farmer <charles.farmer at inLibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit edc8031f4a2347e65f424eba8a56b7ddd35ca42f Author: Victor Grousset <victor.grousset at biblibre.com> Date: Thu Nov 23 16:03:14 2017 +0100 Bug 12497: Fix search history non-accessible when OPAC was private (when the user didn't have the "borrowers" permission) Test plan: 1. Set syspref "OpacPublic" to false (Disable) 2. Log in as a user without any permission 3. Try to access the search history. The link is next to "Log out" 4. Then you should see "Access denied" 5. Apply this patch 6. Refresh the page 7. Then you should see the search history Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Charles Farmer <charles.farmer at inLibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a1710014dcf8b5b72f82b9388ae70f4dd882a933 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 21 16:17:32 2017 +0000 Bug 19674: Broken indicators of changed fields in manage staged MARC records template This patch returns some CSS to the manage staged MARC records template which was incorrectly removed by Gug 16538. To test, apply the patch and go to Tools -> Staged MARC management. Choose a staged MARC file. Changing any of the <select> fields in the first section should cause a label to appear showing that the selection has changed, along with a link to reset the option to its original state. Clicking 'Reset' should make the label and the link disappear. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9debea25c74de3b0ce48a1b53ef61a7969cd6676 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Nov 9 16:47:42 2017 +0000 Bug 19602: Add usage statistics link to administration sidebar menu This patch adds a link to the new usage statistics page in the administration sidebar menu. To test, apply the patch and view an administration page which includes the admin sidebar. Confirm that the link to usage statistics is there. Visit the usage statistics page and confirm that the usage statistics link in the sidebar is display in bold. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 0c4d23a1936fd1b5a06219e3914f8ca76ef01c10 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Nov 10 12:59:58 2017 +0000 Bug 19595: Clicking plugin link does not fill item's date acquired field This patch updates the dateaccessioned plugin for the item edit form to return functionality which was removed in a previous patch. To test, apply the patch and open an item for editing. Clicking the "..." link next to the "Date acquired" field should insert the current date, overwriting the existing date. Open a blank item add form. Putting the cursor in the "Date acquired" field should automatically insert the current date. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Added a comment line in set_to_today. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 7d77fbd79fc85f9dae92eee2609b570a43a61d29 Author: Nick Clemens <nick at bywatersolutions.com> Date: Tue Oct 31 13:17:26 2017 +0000 Bug 19551: Fix wrong order of operations in cash register report To test: 1 - Find or create a fine for a patron 2 - Write it off 3 - Home -> Reports -> Cash register 4 - Fill in current date and transaction type 'Write off' 5 - Click Submit -- see your write off 6 - Fill in previous dates and transaction type 'Write off' 7 - Click Submit -- see your write off (bad) 8 - Apply patch 9 - Rerun steps 3-7 -- write only visible for current date. Signed-off-by: Mark Tompsett <mtompset at hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit db68a2f432bc3ec92fe5fed230fdd24a5dc91c94 Author: Mason James <mtj at kohaaloha.com> Date: Thu Nov 16 20:45:03 2017 +1300 Bug 18993: Allow Test::More version 1.302073 Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 8e61e6ee2c3400e6a01b03a46477ddf5bfe5c10c Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Oct 3 12:37:14 2017 -0300 Bug 18993: Bump Test::More to 1.302075 Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 215226966b7cb3a35cd178244574b6b4d20c3b10 Author: Mirko Tietgen <mirko at abunchofthings.net> Date: Mon Jul 31 11:05:00 2017 +0200 Bug 18993: Bump libtest-simple-perl to 1.302075 Signed-off-by: Mason James <mtj at kohaaloha.com> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit daf9d619e5932fce9fe108a72a48450228feb5e6 Author: Julian Maurice <julian.maurice at biblibre.com> Date: Fri Dec 1 12:47:59 2017 +0000 Bug 19724: Add timestamp to biblio_metadata and deletedbiblio_metadata Since bug 17196, biblioitems.timestamp is not always updated after a change in the MARC record. We need to know the last modification time of the MARC record for some features (like OAI-PMH parameters 'from' and 'until' for instance) This patch only adds the missing column in biblio_metadata and deletedbiblio_metadata Test plan: 1. Run updatedatabase.pl 2. Verify that both tables have the new column, its value should be the greatest timestamp value from the corresponding biblio and biblioitems table entries You can verify with the following SQL query: SELECT b.biblionumber, b.timestamp as biblio_ts, bi.timestamp as biblioitems_ts, m.timestamp as biblio_metadata_ts FROM biblio_metadata m LEFT JOIN biblioitems bi ON (bi.biblionumber = m.biblionumber) LEFT JOIN biblio b ON (b.biblionumber = m.biblionumber); Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 0d828094e8e12a5c8ee814044a46bafb9897a552 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 4 15:39:48 2017 -0300 Bug 19638: Remove false positive obsolete reports (auth_header.marcxml) Bug 17898 tries to help users identify reports affected by the move of marcxml to the biblio_metadata table, however, the auth_header table still uses the column name 'marcxml' and so reports as needing updated though it doesn't. C4::Reports::Guided::convert_sql only converts if the sql query contain biblioitems and marcxml. We should use the same regexp in the controler script. Test plan: Use a sql report that use auth_header.marcxml (see https://wiki.koha-community.org/wiki/SQL_Reports_Library) After the this the report should not be longer marked as obsolete on the report list view Replicated bug with the following SQL: select marcxml from auth_header; Patch applied correctly and functioned as expected. Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 2 +- Koha.pm | 2 +- Koha/Schema/Result/BiblioMetadata.pm | 18 ++++++++++++++-- Koha/Schema/Result/DeletedbiblioMetadata.pm | 18 ++++++++++++++-- cataloguing/value_builder/dateaccessioned.pl | 7 ++++--- debian/control | 2 +- debian/control.in | 2 +- debian/list-deps | 2 +- installer/data/mysql/kohastructure.sql | 8 +++++-- installer/data/mysql/updatedatabase.pl | 22 ++++++++++++++++++++ .../intranet-tmpl/prog/en/includes/admin-menu.inc | 1 + .../prog/en/modules/tools/manage-marc-import.tt | 1 + opac/opac-issue-note.pl | 12 ++++++++++- opac/opac-search-history.pl | 6 +++++- opac/svc/patron_notes | 12 ++++++++++- reports/cash_register_stats.pl | 2 +- reports/guided_reports.pl | 2 +- 17 files changed, 100 insertions(+), 19 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 7 15:36:26 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Dec 2017 14:36:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-33-g5b7f106 Message-ID: <E1eMxHm-0006vY-I7@git.koha-community.org> 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 5b7f1069c084d3076b51d9a93289cc6d120c8661 (commit) from 2d10327e987c9ced850ad5d885370cc9e1e61c34 (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 5b7f1069c084d3076b51d9a93289cc6d120c8661 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 11:28:54 2017 -0300 Bug 7143: Update about page for new dev - Victor Grousset Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 7 17:49:38 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Dec 2017 16:49:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-34-g54053cb Message-ID: <E1eMzMf-0005NI-Vz@git.koha-community.org> 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 54053cb475e98b6fe7c944f5e9df8978dfaffd0e (commit) from 5b7f1069c084d3076b51d9a93289cc6d120c8661 (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 54053cb475e98b6fe7c944f5e9df8978dfaffd0e Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 13:41:06 2017 -0300 Bug 19775: Try & prevent Search/History.t to fail randomly # Failed test 'There are still 8 searches after calling delete with an interval = 6 days' # at t/db_dependent/Search/History.t line 185. # got: '6' # expected: '8' # Failed test 'There are still 2 searches after calling delete with an interval = 2 days' # at t/db_dependent/Search/History.t line 191. # got: '0' # expected: '2' # Looks like you failed 2 tests of 27. [15:04:12] t/db_dependent/Search/History.t It looks like it does not longer fail with this change (date comparaison wrongly rounded to second in mysql?) Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Search/History.t | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 7 18:50:15 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Dec 2017 17:50:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-35-gd203cbb Message-ID: <E1eN0JL-0007Tg-7S@git.koha-community.org> 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 d203cbbe8e8c38cfb15437fc3d583bfcaa15d834 (commit) from 54053cb475e98b6fe7c944f5e9df8978dfaffd0e (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 d203cbbe8e8c38cfb15437fc3d583bfcaa15d834 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 14:42:03 2017 -0300 Bug 19776: Fix random failures (category_type vs categorycode='X') Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation.t | 2 +- t/db_dependent/Circulation/MarkIssueReturned.t | 2 +- t/db_dependent/Circulation/NoIssuesChargeGuarantees.t | 2 +- t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 2 +- t/db_dependent/Circulation/dateexpiry.t | 2 +- t/db_dependent/DecreaseLoanHighHolds.t | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Dec 11 09:32:29 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Dec 2017 08:32:29 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.06-2-gefb28c4 Message-ID: <E1eOJVl-0000DB-Ob@git.koha-community.org> 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 efb28c4af16efbe688322415ae06c6a85fd3454b (commit) via f2a828d5519fb346d6e4d768f80e1ebe3f2ead46 (commit) from e8b134d524110b2990cebd0b7fa00f6c2864a8c4 (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 efb28c4af16efbe688322415ae06c6a85fd3454b Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Mon Nov 20 11:05:35 2017 -0500 Bug 19655: Make To.json escape doesn't escape newlines to create valid JSON JSON does not allow real line-breaks. If a field contains them and they are not escaped, a JSON parser will be unable to convert the stringified JSON back into an object. This is clearly exemplified by the guarantor search, where a multi-line note on the guarantor's record will break the ability to select that guarantor. Test Plan: 1) Create Patron A with a "Circulation note" that has multiple lines in it 2) Create Patron B 3) Attempt to set Patron A to be the guarantor for Patron B 4) Note selecting the patron does nothing 5) Apply this patch 6) Repeat step 3 7) Selecting the guarantor now works! Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> (cherry picked from commit 9cd9240c362336e390eed01acf3630f33e73825f) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit f2a828d5519fb346d6e4d768f80e1ebe3f2ead46 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Sun Nov 26 12:55:27 2017 -0300 Bug 19655: Add tests Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> (cherry picked from commit 6a4b36bc3a186adb07679c2a3549e69974e02c18) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> ----------------------------------------------------------------------- Summary of changes: Koha/Template/Plugin/To.pm | 2 + .../Template/Plugin/To.t} | 55 ++++++++++---------- 2 files changed, 30 insertions(+), 27 deletions(-) copy t/{Makefile.t => db_dependent/Template/Plugin/To.t} (54%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Dec 11 15:40:56 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Dec 2017 14:40:56 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-84-gad2bd6a Message-ID: <E1eOPGK-0000jg-Ty@git.koha-community.org> 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 ad2bd6a36dd48626bf64834fee6a800f85d7665c (commit) via e6a4978f19e9e6694aed1d9fe120d15cc60774e0 (commit) via c46e2fe7ac9677216543b848f4f20838e5e25d17 (commit) via 76d9c74ffaea455bdb8b1756b69ee2af1f40d090 (commit) via 44e7d5e84b2e4020011500ccf0f0f53f974af73d (commit) via 9b541824fddcdbf483c80fedc4d25bd25cce9d28 (commit) via 571c236264d5bac4441eb3c20bcf67dd24160fce (commit) via 3c2628616914b3fd7ff7bc6911fc5be9c6a754ea (commit) via 2a8338fb87dd9a3e5fd1466ad63c5e1d8bffc0ba (commit) via 1a9b8a00ae9c98545b8247c91b3c8b406c2ccf06 (commit) via 03e01e670d14b21abc6d16d4a423e396ad3645ae (commit) via cff82b59622adab8307a72d4a1b523f349e84b3c (commit) via 1e746becc277883281923900891fdb3f5ae755c9 (commit) via 0d6dff2b39ad94cd196940c1ed752cb2132e1a5d (commit) via a6abaca8d0d36835e4a5fd4fb9b906cc9e573953 (commit) via cf79a2694eab08613b409bec2b14c8f6949cd8c2 (commit) via 1e40274411a667e2bdbfc5417638c8a75d6e390b (commit) via 634c55aacb752467c6623478a8abdc108ced8e98 (commit) via eaa3287705d607bb9b8e22d3903f5f3a457098e2 (commit) via 9a2002465338a53f8ceb69041a9bb699f8065344 (commit) via 7c5c516844625592ed68ca91be5a76852b4bfdb6 (commit) via 02f46e0a27db0f72bc19e6e7fe99c78090b5f1a0 (commit) via 53594885286620afd8b96bf1b77fa8c54a5ac4c3 (commit) via 76f277930f017b601d30c817b4df796fbf9a2556 (commit) via e110f90c342841dfb57a88b27e4ef882f7ecc39e (commit) via 1e9b7301022f3737f028246d11e9a32883280d53 (commit) via c8ff1254c92374b888aca8b96121ce6294ae7d3d (commit) via 528f647ae81977b017b2cf7d1da983b22d1e2f0b (commit) via 4247994e4636f0747811571371d62626a1427389 (commit) via 4b2aa64950ee387e81a5589e6cd0e00d145efe42 (commit) via c1465eeb737fd4502891daf0616af1e892eb24c4 (commit) via fcbffbbc6153197bed3fcf555c7f09cfa709a462 (commit) via f54693ac86799cb556fffed412968d688877b585 (commit) via 32fcf995a314094e092f4925e58a007a6fa1b57d (commit) via f8537d1aad029f0c0f21bac894b53d1b3f6542ce (commit) via 9adfd29fc1a25f9da95a55e0fd39b1973db11912 (commit) via 93bd78951d64218b711e4ecf472f3d2f12455182 (commit) via 407e58488875b2499c5f2ad72618a2ff2eb5a50c (commit) via 18f4a89ce6108bcabf042e74bfa582f14184e463 (commit) via 5a63523f593736e282d4b8dc590f250f0339c2eb (commit) via 590cae04fd4cb0fc6fa309d6006fd14f48ea4a03 (commit) via 2164fce41fe2835a909cc952a346ac3e145a5390 (commit) via 2a74db9e6b862a67dc9b90131e3784d6a5a6b51e (commit) via 24c0c49ab357531e4ffc2ee6d6fc034bcfbb5393 (commit) via 9dfff3ab1993aac03873c5f87543df05c778c353 (commit) via 54467a76d73e4ee9f82b039b6db0295ffa7e50ef (commit) via e9a4e52077cee5d150dac0c39db49930b8cff994 (commit) via db32f394a636848488de4d1637d9efc5b7fcf004 (commit) via 01fbe2be9925f8586b9a2cb4dc908fc856b672a8 (commit) from d203cbbe8e8c38cfb15437fc3d583bfcaa15d834 (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 ad2bd6a36dd48626bf64834fee6a800f85d7665c Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Tue Oct 10 15:50:24 2017 +0200 Bug 19439: (follow-up) Remove four spaces from lines 133-149 Speaks for itself. No test plan. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e6a4978f19e9e6694aed1d9fe120d15cc60774e0 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Mon Oct 9 15:12:05 2017 +0200 Bug 19439: Remove eval with exit statements from opac/unapi The script contains some error responses that get lost when using them in an eval statement. (Since exit should not be used within an eval construction.) The eval is removed now. Test plan: [1] Before applying this patch, you could look at the current responses from unapi for the calls in the next steps. Apply the patch now. [2] Call http(s)://[your-server]/cgi-bin/koha/unapi with only a format parameter. Check if you have a 400 status response. (In Firefox, look at Network tab of Developer Tools.) Note: Have to admit (reluctantly) that MS Edge shows the status code in the browser rightaway in contrast with Firefox. [3] Call unapi with a format=marcxml&id=999 The wrong id parameter should trigger a 404 response. [4] Call unapi with format=marcxml&id=koha:biblionumber:[notexist] where notexist is a biblionumber that not exists. This should trigger again a 404 response. [5] Call unapi with format=marcxmlx&id=koha:biblionumber:[exist] where exist should be a good biblionumber. The wrong format should trigger a 406 response. [6] Bonus: The 500 response can be tested by manipulating a XSLT file. Create invalid xml in the file for marcxml (identity.xsl in intranet xslt folder). Call unapi with format=marcxml&id=koha:biblionumber:[exist]. You should get a 500 response and have warnings in your logfile. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c46e2fe7ac9677216543b848f4f20838e5e25d17 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Dec 1 13:53:16 2017 +0000 Bug 19726: Move admin templates JavaScript to the footer: Preferences This patch modifies the staff client's system preferences templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of both the standard and local use system preferences: - WYSIWYG editor - Confirmation messages - Table sorting - Multiple selects (CoceProviders for example) Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 76d9c74ffaea455bdb8b1756b69ee2af1f40d090 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 28 19:04:43 2017 +0000 Bug 19710: Move plugins templates javascript to the footer This patch modifies the staff client plugins template so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified template: - The plugins link should be bold in the sidebar menu. - Choosing "Uninstall" for an installed plugin should trigger a confirmation alert. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 44e7d5e84b2e4020011500ccf0f0f53f974af73d Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Nov 27 15:15:06 2017 +0000 Bug 19700: Move template JavaScript to the footer: Some circulation pages This patch modifies some staff client circulation templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Article requests (enable ArticleRequests system preference, have at least one outstanding article request) - Request article (Bibliographic detail page -> Request article). - Item circulation statistics (Bibliographic detail page -> Items -> View item's checkout history). - On-site checkouts (enable OnSiteCheckouts system preference; Check out some items as on-site checkouts; Go to Circulation -> Pending on-site checkouts - Overdues report (Circulation -> Overdues). - Holds to pull (Circulation -> Holds to pull). - Renew - Holds ratios (Circulation -> Holds ratios). - Check in - Transfers to receive (Circulation -> Transfers to receive). - Holds queue (Circulation -> Holds queue). - Holds awaiting pickup (Circulation -> Holds awaiting pickup). Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9b541824fddcdbf483c80fedc4d25bd25cce9d28 Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Nov 27 12:51:16 2017 +0000 Bug 19697: Move template JavaScript to the footer: Search results This patch modifies the staff client catalog search results template so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the various JavaScript-driven features of the results page: Floating toolbar, cart, lists, cover images, search to hold, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 571c236264d5bac4441eb3c20bcf67dd24160fce Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Nov 22 19:03:15 2017 +0000 Bug 19680: Move JS to the footer: Patron and circulation tools This patch modifies more staff client patrons and circulation tools templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. - Batch patron deletion/anonymization - Overdue notice/status triggers - Batch patron modification Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 3c2628616914b3fd7ff7bc6911fc5be9c6a754ea Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Nov 22 15:53:42 2017 +0000 Bug 19679: Move templates JavaScript to the footer: More tools templates This patch modifies more staff client tools templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. Export data Inventory Notices & slips Upload local cover image Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 2a8338fb87dd9a3e5fd1466ad63c5e1d8bffc0ba Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 21 15:14:58 2017 +0000 Bug 19672: Move tools templates JavaScript to the footer: More MARC tools This patch modifies some staff client templates from the "Tools" section so that JavaScript is included in the footer instead of the header. - Automatic item modifications by age - MARC modification templates - Stage MARC records for import - Staged MARC record management To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 1a9b8a00ae9c98545b8247c91b3c8b406c2ccf06 Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Nov 20 18:05:14 2017 +0000 Bug 19659: Move JS to the footer: Suggestions and tags This patch modifies the staff client's suggestions and tags templates so that JavaScript is included in the footer instead of the header. This patch adds a new JS file, acquisitions-menu.js, which will be added to each template which has the Acquisitions sidebar menu (in this case, suggestions). Highlighting of the current page in the sidebar menu will be broken for pages which have not been modified to use this file. To test, apply the patch and test the JavaScript-driven features of suggestions and tags pages: All button controls, DataTables functionality, form validation, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 03e01e670d14b21abc6d16d4a423e396ad3645ae Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Nov 20 17:05:10 2017 +0000 Bug 19657: Move lists templates JS to the footer This patch modifies the staff client's lists templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the lists page: All button controls, DataTables functionality, form validation, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit cff82b59622adab8307a72d4a1b523f349e84b3c Author: Josef Moravec <josef.moravec at gmail.com> Date: Wed Dec 6 16:14:51 2017 +0000 Bug 19656: (QA follow-up) Add bold style to rotating colections menu item Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 1e746becc277883281923900891fdb3f5ae755c9 Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Nov 20 16:41:33 2017 +0000 Bug 19656: Move rotating collections templates JS to the footer This patch modifies the staff client's rotating collections templates so that JavaScript is included in the footer instead of the header. The patch moves JavaScript from each template and the rotating collections toolbar into a single external JavaScript file. To test, apply the patch and test the JavaScript-driven features of each page: All button controls, DataTables functionality, form validation, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 0d6dff2b39ad94cd196940c1ed752cb2132e1a5d Author: Josef Moravec <josef.moravec at gmail.com> Date: Wed Dec 6 15:19:46 2017 +0000 Bug 19653: (QA follow-up) Add bold style to quotes menu item on quotes-upload page Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a6abaca8d0d36835e4a5fd4fb9b906cc9e573953 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 28 15:41:54 2017 +0000 Bug 19653: Move tools templates JavaScript to the footer: Additional tools This patch modifies the staff client "Additional tools" templates so that JavaScript is included in the footer instead of the header: - Calendar - CSV profiles - Log viewer - News - Task scheduler - Edit quotes for QOTD feature - Upload Note that the log viewer template has been modified so that the "interface" variable (passed to the template to provide the correct path to staff client assets) isn't overwritten by an "interface" variable required by the log viewer. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit cf79a2694eab08613b409bec2b14c8f6949cd8c2 Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Nov 15 16:08:57 2017 +0000 Bug 19628: Move course reserves templates JS to the footer This patch modifies the staff client course reserves templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each page: All button controls, DataTables, autocomplete, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 1e40274411a667e2bdbfc5417638c8a75d6e390b Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Nov 9 13:53:19 2017 +0000 Bug 19601: Move admin templates JavaScript to the footer: Additional parameters This patch modifies the staff client "additional parameters" administration templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each page: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 634c55aacb752467c6623478a8abdc108ced8e98 Author: Josef Moravec <josef.moravec at gmail.com> Date: Tue Dec 5 10:58:11 2017 +0000 Bug 19600: (QA follow-up) Apply css to menu item for item_search_field page Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit eaa3287705d607bb9b8e22d3903f5f3a457098e2 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Nov 9 13:24:04 2017 +0000 Bug 19600: Move admin templates JavaScript to the footer: Other catalog pages This patch modifies the staff client catalog-related administration templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9a2002465338a53f8ceb69041a9bb699f8065344 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Nov 17 16:32:56 2017 +0000 Bug 19647: Move patron lists templates JS to the footer This patch modifies the staff client patron lists templates so that JavaScript is included in the footer instead of the header. This patch adds a new JS file, tools-menu.js, which will be added to each template which has the Tools sidebar menu. Highlighting of the current page in the sidebar menu will be broken for pages which have not been modified to use this file. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. resolved the issue, sorry about that, everything is working fine!Signed-off-by: Dominic Pichette <dominic at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 7c5c516844625592ed68ca91be5a76852b4bfdb6 Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Nov 8 17:40:55 2017 +0000 Bug 19594: Move admin templates JavaScript to the footer: MARC-related This patch modifies the staff client MARC-related administration templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the cart: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 02f46e0a27db0f72bc19e6e7fe99c78090b5f1a0 Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Nov 8 15:55:23 2017 +0000 Bug 19592: Move admin templates JavaScript to the footer: Acquisitions This patch modifies the staff client acquisitions-related adminisration templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the cart: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 53594885286620afd8b96bf1b77fa8c54a5ac4c3 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Sep 27 14:30:20 2017 -0300 Bug 12227: Remove the demo functionality This is a legacy mode that did not really work. Test plan: Play with frameworks and sysprefs and confirm the changes (add/del/update) are taken into account. Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 76f277930f017b601d30c817b4df796fbf9a2556 Author: Josef Moravec <josef.moravec at gmail.com> Date: Fri Oct 6 07:26:31 2017 +0000 Bug 19292: Add MARC code column on libraries list Test plan: 0) Apply the patch 1) Go to admin/branches.pl 2) In the list of libraries, you should see new column "MARC Organization Code" 3) Insert some codes to some libraries 4) Confirm they are shown in new column Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Fixed capitalization. Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e110f90c342841dfb57a88b27e4ef882f7ecc39e Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Sep 11 12:49:33 2017 -0300 Bug 19299: Replace C4::Reserves::GetReservesForBranch with Koha::Holds->waiting GetReservesForBranch simply returns the waiting holds, for a specific branch of not. This can easily be replaced with a call to Koha::Holds->waiting To avoid any regressions, I reuse the exact conditions (priority = 0), but I do not think it is useful. Test plan: Make sure the holds information are correctly displayed on the waiting holds screen. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 1e9b7301022f3737f028246d11e9a32883280d53 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Dec 5 15:26:58 2017 +0000 Bug 19751: Holds awaiting pickup report should not be fixed-width This patch changes the grid used for the holds awaiting pickup report so that the results are full page and fluid instead of fixed-width. To test, apply this patch and the patch for Bug 19700 if necessary. View the holds awaiting pickup report. The report should fluidly fill the page width. Test with the CircSidebar system preference enabled and disabled. Signed-off-by: George Williams <george at nekls.org> Signed-off-by: BWS Sandboxes <ByWaterSandboxes at gmail.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c8ff1254c92374b888aca8b96121ce6294ae7d3d Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Nov 29 15:18:31 2017 -0300 Bug 10021: DBRev 17.12.00.003 Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 528f647ae81977b017b2cf7d1da983b22d1e2f0b Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Fri Nov 3 13:40:38 2017 -0300 Bug 10021: (QA follow-up) Rename variables To avoid $account, $accounts and @accounts variables in the same scope Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 4247994e4636f0747811571371d62626a1427389 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Oct 24 18:45:31 2017 -0300 Bug 10021: Restore "Pay fines" list Previous changes were wrong, the notify_id was always equal to 1 and GetBorNotifyAcctRecord was used to retrieved the account lines to pay Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 4b2aa64950ee387e81a5589e6cd0e00d145efe42 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Oct 24 18:25:38 2017 -0300 Bug 10021: Remove notify columns in circ/branchoverdues.tt Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c1465eeb737fd4502891daf0616af1e892eb24c4 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Oct 23 12:27:58 2017 -0300 Bug 10021: Remove accountlines columns - DBIC Schema changes Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit fcbffbbc6153197bed3fcf555c7f09cfa709a462 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Oct 23 12:27:33 2017 -0300 Bug 10021: Update DB changes Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit f54693ac86799cb556fffed412968d688877b585 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Oct 18 10:43:17 2017 -0300 Bug 10021: Drop columns notify_id and notify_level from accountlines It appears that has never worked. Could someone confirm? Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 32fcf995a314094e092f4925e58a007a6fa1b57d Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Aug 8 16:24:21 2016 +0100 Bug 10021: Drop table notifys and related code This patch drops the notifys table and its related code in C4::Overdues. A second patch should remove the 2 columns notify_id and notify_level from the accountlines table. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit f8537d1aad029f0c0f21bac894b53d1b3f6542ce Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 11 11:22:41 2017 -0300 Bug 19096: DBRev 17.12.00.002 Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9adfd29fc1a25f9da95a55e0fd39b1973db11912 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Aug 17 10:57:28 2017 +0200 Bug 19096: Add update DB entry to sync kohafield in all frameworks Squashed the last four follow-ups into one patch. Instead of adding two routines to Koha::MarcSubfieldStructures, and instead of moving them to Koha::Util::Dbrev, we finally ended up with converting the code to raw SQL queries (thx Jonathan). No need to 'pollute' the git history with all this moving around. As Jonathan pointed out, there is a risk in using DBIx calls (with Koha objects) while running database revisions. See also bug 17292 and bug 19789. I tested the resulting db revision by adding a few fields to the Default framework and adding deviating kohafields in other frameworks. And confirm that it works as expected. Please read the remainder of this commit message in the light of the above: === The dbrev will use two new routines in MarcSubfieldStructures: [1] get_kohafield_exceptions is used to report deviating kohafields in the additional frameworks, [2] sync_kohafield is used to reset kohafield in the other frameworks to the mapping in Default. Test plan: Unit test and database revision: [1] Run t/db_dependent/Koha/MarcSubfieldStructures.t [2] Verify that your Default 100a is mapped to biblio.author. Go to another framework and clear the mapping via mysql command line: UPDATE marc_subfield_structure SET kohafield=NULL WHERE frameworkcode=[your_framework] AND tagfield='100' AND tagsubfield='a'; [3] Run the db revision. It should report that 100a was adjusted. [4] Check in admin/marc_subfield_structure that your 100a is mapped to biblio.author again in that framework. Additional interface testing (ensuring that the changes on this report do not interfere with multiple mappings): [5] Make two mappings for copyrightdate: 260c and 264a. And make two mappings for biblioitems.pages: 300a and say 300g. Toggle with some field values in those fields in the cataloging editor and verify the contents of biblio.copyrightdate and biblioitems.pages. The former should contain one year (due to additional logic) and the latter should contain A | B if both fields are filled. Remove the mapping for 300g. [6] Set AcqCreateItem to ordering or placing. Verify that you can still add or receive an order as usual. [7] Add a mapping for itemcallnumber to 952f (this should remove the one for coded_location_qualifier). This is very unusual but serves well in testing multiple mappings for items. Add or receive an order (fill 952f and 952o) with same and/or different values. Verify the contents of items.callnumber. (Check with regular item editor; see note.) Do a similar edit in the regular item editor. Note: You should expect to see A | B in both 952f and 925o if both fields are filled with a different value. Set items.coded_location_qualifier back to 952f in koha2marclinks. Note: When AcqCreateItem==ordering, you will not see A|B in the callno field when adding an item on neworderempty.pl. But when you submit the main form, addorder.pl is called. At that time an item is created and you will see that A|B is in both fields (952f and 952o). Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Bug 19096: (QA follow-up) Move two routines out of Koha::MSS As requested by RM, this patch moves sync_kohafield and get_kohafield_exceptions from Koha/MarcSubfieldStructures.pm. At this moment they are only used in a database revision; it is not clear if they may be of use later on. In order to keep them in a module and not remove the unit tests, this patch adds a Koha::Util module Dbrev.pm. It is now required in the atomic update, but could be added in a use statement in updatedatabase.pl. Test plan: [1] Run updatedatabase.pl [2] Run t/db_dependent/Koha/MarcSubfieldStructures.t Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Bug 19096: Use raw SQL queries instead for the update DB entry I strongly thing we must not use C4 or Koha subroutine in the update DB process, only sql queries. Especially not DBIC Schema files as they will change. For instance the update DB 17.12.00.00X is using a specific Koha::Schema::RS::MSS representing the current schema, but in X months/years, this schema will change and the ->search we used may failed. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Bug 19096: Move the sql queries to the update DB entry Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: Print "Field 700$a" instead of "Field 700.a" in the dbrev. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 93bd78951d64218b711e4ecf472f3d2f12455182 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Aug 17 11:44:18 2017 +0200 Bug 19096: Restructure MarcSubfieldStructures.t first Before adding more tests, move all current tests in one subtest. Test plan: Run t/db_dependent/Koha/MarcSubfieldStructures.t Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 407e58488875b2499c5f2ad72618a2ff2eb5a50c Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Wed Aug 16 14:37:06 2017 +0200 Bug 19096: Online help changes On the page admin/marc_subfields_structure we now tell that Koha link has been disabled and refer to the help for koha2marclinks. On the page admin/koha2marclinks we mention that the Default mapping is considered authoritative now. Test plan: Read these online help pages and verify that the changes make sense. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 18f4a89ce6108bcabf042e74bfa582f14184e463 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Mon Aug 7 15:02:10 2017 +0200 Bug 19096: Do not allow changes to kohafield within MARC frameworks This patch makes two changes in the script for managing the MARC frameworks in order to support making the Default authoritative as for Koha to MARC mappings: [1] Disable the kohafield select combo. Add a hidden input to save value. [2] When a new subfield is added, the kohafield is still empty and should be overwritten with its Default counterpart. Note: Although we could leave the field empty, since Koha looks at the Default framework only, it does not cost much to keep these fields in sync with Default and perhaps catch a bug when someone somewhere looks in the wrong framework. Note: The description of Koha to MARC mapping on admin-home has been adjusted accordingly (removing last two lines). Test plan: [1] Add a new tag and subfield in Default. [2] Map it to a kohafield in koha2marclinks.pl [3] Add the same tag and subfield in another framework. Verify that the kohafield is updated after you saved the subfield. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 5a63523f593736e282d4b8dc590f250f0339c2eb Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Aug 10 10:59:07 2017 +0200 Bug 19096: Adjusts unit tests The subroutines listed in the former patch are extensively tested in Biblio.t, TransformKohaToMarc.t and TransformMarcToKoha.t. These tests do no longer use new frameworks to add mappings. In Biblio.t and TransformMarcToKoha.t we also test passing an individual framework code (for an empty framework) to see if Default is still used. Note that this parameter will be removed later on. In Items.t the cache keys MarcStructure-0- and MarcStructure-1- are not touched, so they do not need to be cleared. The cache key default_value_for_mod_marc- should be used without framework now. Similar adjustments in Items/AutomaticItemModificationByAge.t and Reserves.t. Furthermore the subtest for _build_default_values_for_mod_marc in Items.t is adjusted since framework is no longer relevant. The biblio record with items is created in a new framework, but the mappings from Default are consulted. Test plan: Run all adjusted unit tests. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 590cae04fd4cb0fc6fa309d6006fd14f48ea4a03 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Aug 10 10:59:07 2017 +0200 Bug 19096: Make Default authoritative in core modules After feedback from the dev mailing list, it seems appropriate here to propose making the Default framework authoritative for Koha to MARC mappings. This implies checking only the Default framework in the routines: [1] GetMarcFromKohaField: The parameter frameworkcode is removed. A follow-up report (19097) will update the calls not adjusted here. This is safe since the parameter is silently ignored. [2] GetMarcSubfieldStructureFromKohaField: Framework parameter is removed and calls are adjusted. Includes acquisitions_stats.pl. [3] TransformKohaToMarc: The parameter is removed; all calls are verified or adjusted. [4] TransformMarcToKoha: The parameter is no longer used and will be removed in a follow-up report (19097). It always goes to Default now. [5] TransformMarcToKohaOneField: The parameter is removed and all calls are adjusted. Including: Breeding, XISBN and MetadataRecord modules. [6] C4::Koha::IsKohaFieldLinked: This routine was called only once (in C4::Items::_build_default_values_for_mod_marc. It can be replaced by calling GetMarcFromKohaField. If there is no kohafield linked, undef is returned. (Corresponding unit test is removed here.) [7] C4::Items::ModItemFromMarc: The helper routine _build_default_values_for_mod_marc does no longer have a framework parameter. The cache key default_value_for_mod_marc- is no longer combined with a frameworkcode. Three admin scripts are adjusted accordingly; some tests will be corrected in the next patch. Test plan: See next patch. That patch adjusts all tests involved. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 2164fce41fe2835a909cc952a346ac3e145a5390 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Mon Oct 23 12:07:04 2017 +0200 Bug 10306: (QA follow-up) More feedback for admins in koha2marclinks As requested by Tomas, this patch does: [1] Add a js alert when you did not type field,subfield [2] Print a yellow alert div when the field,subfield is not found. [3] Bonus: Make it little bit more secure by demanding a POST. (Leaving CSRF etc. for another report.) Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 2a74db9e6b862a67dc9b90131e3784d6a5a6b51e Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Aug 24 12:23:29 2017 +0200 Bug 10306: (QA follow-up) Correct a TestBuilder call In order to create a new framework, MarcSubfieldStructure was used as source. This works since that table contains a FK for frameworkcode. But obviously, we should use BiblioFramework as source. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 24c0c49ab357531e4ffc2ee6d6fc034bcfbb5393 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Jul 27 13:18:39 2017 +0200 Bug 10306: Adjusted online help text for koha2marclinks Test plan: Click on Help. Read the text. Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9dfff3ab1993aac03873c5f87543df05c778c353 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Mon Jul 24 19:09:17 2017 +0200 Bug 10306: Support for multiple mappings in koha2marclinks This actually refactors koha2marclinks.pl in order to support multiple mappings per kohafield. Instead of three separate mapping pages for biblio, biblioitems and items, the script now lists them together. This gives a complete overview of all mappings rightaway. Changes are applied immediately across all frameworks. Note: This report handles the Default mappings just like it did before. In this script Koha already considered them as authoritative, although other parts of Koha did not. Follow-up report 19096 makes Default mappings authoritative throughout all Koha. On each line two buttons are provided, Add and Remove, in order to add or remove an individual mapping. We do no longer provide a separate form with the names of MARC tags. Since this form is targeted for administrators, it should be enough to ask for a field tag and subfield code. Note: The mappings for biblionumber, biblioitemnumber and itemnumber are so vital that this form marks them as readonly. It is not recommended to change them. Test plan: [1] Add a mapping. Verify via Frameworks or mysql command line that the kohafield is saved to the other frameworks too. [2] Remove the mapping again. Check Frameworks or mysql cl again. [3] Test adding a second mapping. Map copyrightdate to 260c and 264c. And map biblioitems.place to 260a and 264a. [4] Edit biblio record 1: Put 1980 in 260c. Do not include 264c. Edit biblio record 2: Put 1990 in 264c. Do not include 260c. Edit biblio record 3: Put 2000 in both 260c and 264c. Put CityA in 260a and in 264a. Edit biblio record 4: Put 2010 in 260c, and 2015 in 264c (which you should refuse normally). Put CityA in 260a, and CityB in 264a. [5] Create a report that shows biblioitems.place and biblio.copyrightdate for those biblio records. Record 4 should have 2010 in copyrightdate (since TransformMarcToKoha picks the first year for copyrightdate). Record 3 should have place CityA; record 4 should have CityA | CityB. Note: The CityA | CityB example illustrates that we should add some additional handling in TransformMarcToKoha for multiple 264s. [6] Add these four biblio records to a new list. Sort by Year. With OPACXSLTListsDisplay==default, check if the order = 1,2,3,4. (The order is based on biblio.copyrightdate.) Note that (RDA) record 2 would be on top without this patch set, since copyrightdate would have been null. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 54467a76d73e4ee9f82b039b6db0295ffa7e50ef Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Aug 3 12:56:08 2017 +0200 Bug 10306: Restructure TransformMarcToKoha and update some POD lines This patch makes the following changes: [1] Added POD for CountItemsIssued, GetBiblioItemData [2] Moved TransformMarcToKohaOneField closer to TransformMarcToKoha (before sub CountItemsIssued) [3] Restructured TransformMarcToKoha by extracting individual kohafields via TransformMarcToKohaOneField. The latter does no longer call the former. This small optimization avoids traversing the whole MARC record again and again. [4] Moved adjusting copyrightdate/publicationyear to separate helper routine _adjust_pubyear [5] Removed obsolete sub _get_inverted_marc_field_map. Test plan: Run t/db_dependent/Biblio/TransformMarcToKoha.t Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e9a4e52077cee5d150dac0c39db49930b8cff994 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Wed Jul 19 16:54:40 2017 +0200 Bug 10306: Add tests for module changes GetMarcSubfieldStructure: In Biblio.t we are adding a subtest that checks the structure returned by this routine. Is it a hashref pointing to arrayrefs of hashrefs? ;) In Search.t this routine was mocked. The change in the returned structure is now applied to this mock too (moving the marc tag hashes into arrayrefs). GetMarcFromKohaField: In Biblio.t we add a subtest for it. We are checking if it returns multiple mappings (per kohafield) and calling it in scalar context too. GetMarcSubfieldStructureFromKohaField: The existing subtest in Biblio.t is expanded to also test the call in list context. TransformKohaToMarc: This sub has its own test script. We are adding a subtest in TransformKohaToMarc.t for a test with multiple mappings, and for mapping to a control field in another framework. This also tests the additional framework parameter. Additionally, we add a test for the new no_split option used for items. TransformMarcToKoha: This implicitly tests its helper sub _get_inverted. This patch adds a new test script for this routine. TransformMarcToKohaOneField: A few tests are added to the previous new test script. Test plan: [1] Run t/db_dependent/Biblio.t [2] Run t/db_dependent/Biblio/TransformKohaToMarc.t [3] Run t/db_dependent/Biblio/TransformMarcToKoha.t [4] Run t/db_dependent/Search.t Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit db32f394a636848488de4d1637d9efc5b7fcf004 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Jul 20 12:37:56 2017 +0200 Bug 10306: Allow controlfields in TransformKohaToMarc Since the interface allows you to connect a kohafield to a MARC controlfield, this routine should be able to handle that. Unfortunately it did not. Test plan: Change will be tested in Biblio/TransformKohaToMarc.t in the next patch. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 01fbe2be9925f8586b9a2cb4dc908fc856b672a8 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Wed Jul 19 16:25:04 2017 +0200 Bug 10306: Core module changes for multiple mappings In order to allow multiple Koha to MARC mappings (for one kohafield), we need to adjust a few key routines in C4/Biblio.pm. This results in a few changes in dependent modules too. Note: Multiple mappings also include 'alternating' mappings. Such as the case of MARC21 260 and 264: only one of both fields will be used. Sub TransformMarcToKoha will handle that just fine; the opposite transformation is harder, since we do no longer know which field was the source. In that case TransformKohaToMarc will fill both fields. We only use that operation in Koha for items (in Acquisition and Cataloging). Sub GetMarcSubfieldStructure This sub used a selectall_hashref, which is fine as long as we have only one mapping for each kohafield. But as DBI states it: If a row has the same key as an earlier row then it replaces the earlier row. In other words, we lose the first mapping if we have two. This patch uses selectall_arrayref with Slice and rearranges the output so that the returned hash returns an arrayref of hashrefs for each kohafield. In order to improve consistency, we add an order clause to the SQL statement used too. Sub GetMarcFromKohaField This sub just returned one tag and subfield, but in case of multiple mappings we should return them all now. Note: Many calls still expect just one result and will work just fine: my ($tag, $sub) = GetMarcFromKohaField(...) A possible second mapping would be silently ignored. Often the sub is called for biblionumber or itemnumber. I would not recommend the use of multiple mappings for such fields btw. In case the sub is called in scalar context, it will return only the first tag (instead of the number of tags and subfields). Sub GetMarcSubfieldStructureFromKohaField This sub previously returned the hash for one kohafield. In scalar context it will behave like before: it returns the first hashref in the arrayref that comes from GetMarcSubfieldStructure. In list context, it returns an array of all hashrefs (incl. multiple mappings). The sub is not used in C4::Ris. Removed the use statement. Sub TransformKohaToMarc This sub got a second parameter: frameworkcode. Historically, Koha more or less assumes kohafields to be defined across all frameworks (see Koha to MARC mappings). Therefore it falls back to Default when it is not passed. When going thru all mappings in building a MARC record, it also supports multiple mappings. Note that Koha uses this routine in Acquisition and in Cataloging for items. Normally the MARC record is leading however and the Koha fields are derivatives for optimization and reporting. The added third parameter allows for passing a new option no_split => 1. We use this option in C4::Items::Item2Marc; if two item fields are mapped to one kohafield but would have different values (which would be very unusual), these values are glued together. When transforming to MARC again, we do not want to duplicate the item subfields, but we keep the glued value in both subfields. This operation only affects items, since we are not doing this reverse operation for biblio and biblioitem fields. Sub _get_inverted_marc_field_map This sub is a helper routine of TransformMarcToKoha, the opposite transformation. When saving a MARC record, all kohafields are extracted including multiple mappings. Suppose that you had both 260c and 264c in your record (which you won't), than both values get saved initially into copyrightdate like A | B. The additional code for copyrightdate will extract the first year from this string. A small fix in TransformMarcToKoha makes that it only saves a value in a kohafield if it is defined and not empty. (Same for concatenation.) Sub TransformMarcToKohaOneField This sub now just calls TransformMarcToKoha and extracts the requested field. Note that since we are caching the structure, this does not result in additional database access and is therefore performance-wise insignificant. We simplify code and maintenance. Instead of modifying the passed hashref, it simply returns a value. A call in C4::Breeding is adjusted accordingly. The routine getKohaField in Koha::MetadataRecord is redirected to TransformMarcToKohaOneField. NOTE: The fourth patch restructures/optimizes TransformMarcToKoha[OneField]. Sub get_koha_field_from_marc This sub can be removed. A call is replaced by TransformMarcToKohaOneField in C4::XISBN. Note: The commented lines for sub ModZebrafiles are removed (directly under TransformMarcToKohaOneField). Test plan: For unit tests and interface tests, please see follow-ups. Run qa tools in order to verify that the modules still compile well. Read the code changes and verify that they make sense. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 15 +- C4/Auth.pm | 14 - C4/Biblio.pm | 369 +++++------- C4/Breeding.pm | 4 +- C4/InstallAuth.pm | 10 - C4/Items.pm | 22 +- C4/Koha.pm | 26 - C4/Members.pm | 46 -- C4/Overdues.pm | 153 +---- C4/Reserves.pm | 36 -- C4/Ris.pm | 1 - C4/XISBN.pm | 2 +- Koha.pm | 2 +- Koha/MetadataRecord.pm | 27 +- Koha/Schema/Result/Accountline.pm | 20 +- Koha/Schema/Result/Notify.pm | 94 --- admin/auth_subfields_structure.pl | 8 +- admin/auth_tag_structure.pl | 54 +- admin/biblio_framework.pl | 4 +- admin/koha2marclinks.pl | 185 +++--- admin/marc_subfields_structure.pl | 111 ++-- admin/marctagstructure.pl | 76 ++- admin/preferences.pl | 12 +- admin/systempreferences.pl | 5 +- circ/branchoverdues.pl | 53 +- circ/waitingreserves.pl | 47 +- installer/data/mysql/kohastructure.sql | 17 - installer/data/mysql/updatedatabase.pl | 105 ++++ .../prog/en/includes/acquisitions-menu.inc | 7 - .../intranet-tmpl/prog/en/includes/admin-menu.inc | 16 +- .../en/includes/rotating-collections-toolbar.inc | 46 +- .../intranet-tmpl/prog/en/includes/tools-menu.inc | 17 - .../prog/en/includes/virtualshelves-toolbar.inc | 28 - .../prog/en/modules/admin/admin-home.tt | 3 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 286 +++++---- .../prog/en/modules/admin/aqbudgets.tt | 516 ++++++++-------- .../prog/en/modules/admin/aqcontract.tt | 86 +-- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 114 ++-- .../prog/en/modules/admin/audio_alerts.tt | 17 +- .../en/modules/admin/auth_subfields_structure.tt | 18 +- .../prog/en/modules/admin/auth_tag_structure.tt | 30 +- .../prog/en/modules/admin/authtypes.tt | 35 +- .../prog/en/modules/admin/biblio_framework.tt | 27 +- .../prog/en/modules/admin/branches.tt | 4 +- .../prog/en/modules/admin/checkmarc.tt | 5 + .../prog/en/modules/admin/classsources.tt | 5 + .../prog/en/modules/admin/columns_settings.tt | 36 +- .../prog/en/modules/admin/didyoumean.tt | 98 +-- .../prog/en/modules/admin/fieldmapping.tt | 25 +- .../prog/en/modules/admin/items_search_field.tt | 7 +- .../prog/en/modules/admin/items_search_fields.tt | 16 +- .../prog/en/modules/admin/koha2marclinks.tt | 141 ++--- .../en/modules/admin/marc_subfields_structure.tt | 13 +- .../prog/en/modules/admin/marctagstructure.tt | 45 +- .../prog/en/modules/admin/matching-rules.tt | 295 ++++----- .../prog/en/modules/admin/oai_set_mappings.tt | 75 +-- .../prog/en/modules/admin/oai_sets.tt | 79 +-- .../prog/en/modules/admin/preferences.tt | 93 ++- .../prog/en/modules/admin/sms_providers.tt | 21 +- .../prog/en/modules/admin/systempreferences.tt | 152 ++--- .../prog/en/modules/admin/usage_statistics.tt | 83 ++- .../prog/en/modules/admin/z3950servers.tt | 147 ++--- .../prog/en/modules/catalogue/results.tt | 517 ++++++++-------- .../prog/en/modules/circ/article-requests.tt | 191 +++--- .../prog/en/modules/circ/bookcount.tt | 16 +- .../prog/en/modules/circ/branchoverdues.tt | 58 +- .../en/modules/circ/circulation_batch_checkouts.tt | 48 +- .../prog/en/modules/circ/on-site_checkouts.tt | 52 +- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 140 ++--- .../prog/en/modules/circ/pendingreserves.tt | 131 ++-- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 24 +- .../prog/en/modules/circ/request-article.tt | 171 +++--- .../prog/en/modules/circ/reserveratios.tt | 50 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 252 ++++---- .../prog/en/modules/circ/transferstoreceive.tt | 40 +- .../prog/en/modules/circ/view_holdsqueue.tt | 71 ++- .../prog/en/modules/circ/waitingreserves.tt | 40 +- .../en/modules/course_reserves/course-details.tt | 80 +-- .../en/modules/course_reserves/course-reserves.tt | 21 +- .../prog/en/modules/course_reserves/course.tt | 105 ++-- .../prog/en/modules/help/admin/koha2marclinks.tt | 12 +- .../modules/help/admin/marc_subfields_structure.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/pay.tt | 13 +- .../prog/en/modules/members/paycollect.tt | 8 - .../prog/en/modules/patron_lists/add-modify.tt | 5 + .../prog/en/modules/patron_lists/list.tt | 122 ++-- .../prog/en/modules/patron_lists/lists.tt | 103 ++-- .../prog/en/modules/plugins/plugins-home.tt | 24 +- .../en/modules/rotating_collections/addItems.tt | 15 +- .../rotating_collections/editCollections.tt | 7 + .../rotating_collections/rotatingCollections.tt | 30 +- .../rotating_collections/transferCollection.tt | 7 + .../prog/en/modules/suggestion/suggestion.tt | 356 +++++------ .../intranet-tmpl/prog/en/modules/tags/list.tt | 48 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 47 +- .../tools/automatic_item_modification_by_age.tt | 40 +- .../prog/en/modules/tools/cleanborrowers.tt | 82 +-- .../prog/en/modules/tools/csv-profiles.tt | 56 +- .../intranet-tmpl/prog/en/modules/tools/export.tt | 59 +- .../prog/en/modules/tools/holidays.tt | 402 ++++++------ .../prog/en/modules/tools/inventory.tt | 251 ++++---- .../prog/en/modules/tools/koha-news.tt | 134 ++-- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 326 +++++----- .../prog/en/modules/tools/manage-marc-import.tt | 257 ++++---- .../modules/tools/marc_modification_templates.tt | 37 +- .../prog/en/modules/tools/modborrowers.tt | 252 ++++---- .../prog/en/modules/tools/overduerules.tt | 39 +- .../prog/en/modules/tools/quotes-upload.tt | 602 +++++++++--------- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 352 ++++++----- .../prog/en/modules/tools/scheduler.tt | 21 +- .../prog/en/modules/tools/showdiffmarc.tt | 25 +- .../prog/en/modules/tools/stage-marc-import.tt | 164 ++--- .../prog/en/modules/tools/upload-images.tt | 98 +-- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 323 +++++----- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 19 +- .../prog/en/modules/virtualshelves/shelves.tt | 637 ++++++++++---------- koha-tmpl/intranet-tmpl/prog/js/acq.js | 5 + .../intranet-tmpl/prog/js/acquisitions-menu.js | 4 + koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 14 + .../intranet-tmpl/prog/js/rotating-collections.js | 27 + koha-tmpl/intranet-tmpl/prog/js/tools-menu.js | 20 + members/pay.pl | 28 +- members/paycollect.pl | 4 - opac/unapi | 42 +- reports/acquisitions_stats.pl | 2 +- t/db_dependent/Biblio.t | 87 ++- t/db_dependent/Biblio/TransformKohaToMarc.t | 72 ++- t/db_dependent/Biblio/TransformMarcToKoha.t | 98 +++ t/db_dependent/Items.t | 85 +-- .../Items/AutomaticItemModificationByAge.t | 6 +- t/db_dependent/Koha/IsKohaFieldLinked.t | 44 -- t/db_dependent/Koha/MarcSubfieldStructures.t | 44 +- t/db_dependent/Reserves.t | 4 +- t/db_dependent/Search.t | 76 +-- 134 files changed, 5745 insertions(+), 6003 deletions(-) delete mode 100644 Koha/Schema/Result/Notify.pm create mode 100644 koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js create mode 100644 koha-tmpl/intranet-tmpl/prog/js/admin-menu.js create mode 100644 koha-tmpl/intranet-tmpl/prog/js/rotating-collections.js create mode 100644 koha-tmpl/intranet-tmpl/prog/js/tools-menu.js create mode 100644 t/db_dependent/Biblio/TransformMarcToKoha.t delete mode 100644 t/db_dependent/Koha/IsKohaFieldLinked.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Dec 11 16:59:25 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Dec 2017 15:59:25 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.06-4-g24a6ef2 Message-ID: <E1eOQUH-0003IG-OJ@git.koha-community.org> 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 24a6ef2ba16f18923a5fd9d9439cfe7c84d9ca20 (commit) via dd2f28fab4853d917cc1c47e8fab5351335171fa (commit) from efb28c4af16efbe688322415ae06c6a85fd3454b (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 24a6ef2ba16f18923a5fd9d9439cfe7c84d9ca20 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Mon Aug 28 12:13:26 2017 +0200 Bug 19190: [Follow-up] Do not rely on the return of ModItem touch_all_items looks at the return of ModItem to determine if the operation was successful. But ModItem does not return a meaningful value. This patch puts the ModItem call in an eval and looks at $@. Test plan: Run touch_all_items with a where condition and verbose option. Put print 1/0; at the end of ModItem. Run touch_all_items again. You should see: ERROR WITH ITEM xxx !!!! Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> (cherry picked from commit 1fc0b652548510ef00a7e072cdf923357d5610aa) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit dd2f28fab4853d917cc1c47e8fab5351335171fa Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Mon Aug 28 11:59:19 2017 +0200 Bug 19190: Silly calculation of average time in touch_all scripts When you want to calculate average time, do not divide count by time :) Test plan: Run the script with a where condition and verbose option and see that the average time is meaningful. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> (cherry picked from commit b3b86caaa5473ea51dc7223146e4c7cf0db431dc) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> ----------------------------------------------------------------------- Summary of changes: misc/maintenance/touch_all_biblios.pl | 2 +- misc/maintenance/touch_all_items.pl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Dec 11 18:56:22 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Dec 2017 17:56:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-99-g03dd826 Message-ID: <E1eOSJS-0006ZM-Vz@git.koha-community.org> 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 03dd8267575559caadcc892a488ed74cd7c35e2b (commit) via bc900d81c555bd133c40b859bda390c1592e0e71 (commit) via 8dd884f13869036ce666cf5a5b430aaa62065df0 (commit) via 22d708894b31d63fbac23df65eeb7d6597e6af61 (commit) via a0e44e192003541c2132c94df92cf8372ec30b92 (commit) via f57c3b36ea55612d81da7eaa8f75efe9126f9703 (commit) via 0ab5a3cf929505a393060f212a4a0399abd9245d (commit) via 9125722e38e330a0c45b56844d0aac583509f67f (commit) via 20b8568a998264b874bd9baa884ed11cce1e7223 (commit) via 203ddfd9edf69d86d0f6b930c4be292bbbe4b25b (commit) via e1ba8d344ddfff53d24fa6b3a1966e17bdd13a7c (commit) via db776c34d23ddd0d4a78e83a983d5b0c906c188a (commit) via 963eaeab7bda800ca8bbc123d94a7b4ccaa9de0c (commit) via 34cdd536cb16436b407947eecd6975b8d4f44467 (commit) via ff9a69ccbd61f862965094ac2332874d895aef11 (commit) from ad2bd6a36dd48626bf64834fee6a800f85d7665c (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 03dd8267575559caadcc892a488ed74cd7c35e2b Author: Julian Maurice <julian.maurice at biblibre.com> Date: Fri Dec 8 15:31:49 2017 +0100 Bug 17182: (QA follow-up) Fix call to GetMarcBiblio Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit bc900d81c555bd133c40b859bda390c1592e0e71 Author: Nick Clemens <nick at bywatersolutions.com> Date: Wed Jul 19 14:10:05 2017 +0000 Bug 17182: Allow Keyword to MARC mapping for acquisitions searches This patchset adds the 'subtitle' field to the results display on acquistions search for adding an order form an existing item. Any field mapped to 'subtitle' in 'Keyword to MARC mapping' will be fetched and displayed in the results To test: 1 - Perform an acquisitions search for existing record 2 - Note record subtitles are not displayed 3 - Map 245$b and 245$n to 'subtitle' in 'Keyword to MARC mapping' 4 - Note they are still not displayed ion acq results 5 - Apply patch 6 - subtitle fields should now display Sponsored by: Round Rock Public Library <https://www.roundrocktexas.gov/departments/library/> Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 8dd884f13869036ce666cf5a5b430aaa62065df0 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 11 14:28:26 2017 -0300 Bug 19542: Use comma to separate indices Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 22d708894b31d63fbac23df65eeb7d6597e6af61 Author: Nick Clemens <nick at bywatersolutions.com> Date: Thu Dec 7 15:35:42 2017 +0000 Bug 19542: (QA follow-up) Remove debug warn Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a0e44e192003541c2132c94df92cf8372ec30b92 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Oct 31 11:29:28 2017 -0300 Bug 19542: Add Elasticsearch information in the 'About' page This patch adds Elasticsearch related information to the 'About' page. The information is gathered and displayed only when the 'SearchEngine' syspref is set to 'Elasticsearch'. It displays configured nodes, and the status: - Running - Not running In case it is running, it displays the defined indices and the document count on each. If there are configuration problems, exceptions are catch and a convenient warning message is displayed. To test: - Apply this patches - Run: $ kshell k$ prove t/Koha/SearchEngine/Elasticsearch.t => SUCCESS: Tests pass! - Have ES configured in your koha-conf.xml file (by default in kohadevbox) - Set the 'SearchEngine' syspref to 'Elasticsearch' - Comment out pieces of the elasticsearch-specific entries (server, index_name, the whole elasticsearch block). Reload on each change. => SUCCESS: Warning messages are displayed and make sense in the context of your changes. ----> the rest of the tests require having ES running on the dev env. This can be easily achieved by creating the kohadevbox using: $ KOHA_ELASTICSEARCH=1 vagrant up - Stop the 'elasticsearch' service: $ sudo service elasticsearch stop - Reload about.pl => SUCCESS: The configured nodes are displayed, and the status is 'not running' - Start the 'elasticsearch' service: $ sudo service elasticsearch start - Reload about.pl => SUCCESS: The configured nodes are displayed, the status is 'running' and created indices info is displayed, along with the document count on each index. - Sign off :-D Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit f57c3b36ea55612d81da7eaa8f75efe9126f9703 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Oct 31 11:26:36 2017 -0300 Bug 19542: Add a check for ES configuration health This patch adds a new statuc function to Koha::SearchEngine::ElasticSearch which is instended to replace most of get_elasticsearch_params. This function reads the configuration from C4::Context->config('elasticsearch') and raises relevant exceptions when mandatory entries are missing. Its behaviour is covered by tests. To test: - Run: $ kshell k$ prove t/Koha/SearchEngine/Elasticsearch.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 0ab5a3cf929505a393060f212a4a0399abd9245d Author: David Bourgault <david.bourgault at inlibro.com> Date: Mon Sep 25 13:05:01 2017 -0400 Bug 11210: Writeoff partial amounts Minor changes to pay.pl and paycollect.tt to allow writing off a partial amount of a fine. Test plan: 0) Go to the Fines tab of a test patron's profile 1) Create a fine if there are none (under the Manual invoice tab) 2) Go to the "Pay fines" tab 3) Press the write off button on the corresponding account line Without patch, you'll be asked to confirm, but will not be able to edit the amount With patch, you'll be able to edit the amount. Followed test plan, patch worked as described. Also ran QA test tool and modified files passed Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9125722e38e330a0c45b56844d0aac583509f67f Author: Claire Gravely <claire.gravely at bsz-bw.de> Date: Thu Dec 7 07:35:37 2017 +0000 Bug 19769: 'Pickup library is different' message does not display library branch name when placing hold When placing a hold for a patron whose pickup library and home library are different, the message displayed only shows the branch code and not the branch name. This patch displays the branch name as well as the branch code. To test: 1. Search for an item 2. Click 'place hold' 3. Enter patron name/card number for a patron whose home library is different to the item's 4. Note the message displayed only shows the branch code but not the name 5. Apply Patch 6. Repeat 1-3 7. Message should now also display the branch name https://bugs.koha-community.org/show_bug.cgi?id=19769 Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 20b8568a998264b874bd9baa884ed11cce1e7223 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 4 16:07:52 2017 -0300 Bug 19746: Remove debug statements in returns.pl From bug commit bb6277ffcc593685554112d770ac273c9efeda33 Bug 14464: Add ability to cancel waiting holds from checkin screen +use Carp 'verbose'; +$SIG{ __DIE__ } = sub { Carp::confess( @_ ) }; See also http://lists.koha-community.org/pipermail/koha-devel/2017-November/044168.html Test plan: Read the changes and make sure they make sense Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 203ddfd9edf69d86d0f6b930c4be292bbbe4b25b Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Oct 26 15:41:47 2017 -0300 Bug 3841: Add the ACQ framework for new installations This patch adds the acquisition frameworks (frameworkcode=ACQ) for new installations. It copies the 952 (MARC21) or 995 (UNIMARC) fields from the default framework (frameworkcode='') Test plan: Create a new installation and make sure the ACQ framework exists. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e1ba8d344ddfff53d24fa6b3a1966e17bdd13a7c Author: Nick Clemens <nick at bywatersolutions.com> Date: Fri Nov 17 12:13:55 2017 +0000 Bug 19563: (follow-up) Restore checking sort variable This code seems a bit odd, $self->sort_fields()->{$name} is checking if there is any mapping in ES for a field, so if one marc field in an index is marked as sortable this will exists. We need to check the individual marc field to see if it should be added to the sort index here. If you apply the first patch, reindex, and view a record in es: curl -XGET 'localhost:9200/koha_kohadev_biblios/data/19/?pretty' | grep -A 10 author__sort You will see that 245$c is included in the record without that additional check Apply this, reindex again, and that field should not be included Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit db776c34d23ddd0d4a78e83a983d5b0c906c188a Author: Nick Clemens <nick at bywatersolutions.com> Date: Fri Nov 17 12:12:32 2017 +0000 Bug 19563: Unit tests To test: 1 - Apply first patch and this patch 2 - prove -v t/db_dependent/Koha_Elasticsearch.t 3 - New tests will fail 4 - Apply followup patch 5 - Tests shuld pass Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 963eaeab7bda800ca8bbc123d94a7b4ccaa9de0c Author: David Gustafsson <david.gustafsson at ub.gu.se> Date: Thu Nov 2 13:44:13 2017 +0100 Bug 19563: Generation of sort_fields uses incorrect condition Fix incorrect condition for if clause for generating <field>__sort mappings for Elasticsearch. Also remove redundant check for same condition when generating fixer rules. Test plan: 1. Inspect current mappings for example by viewing: http://<elasticsearch_host>:9200/koha_<koha_instance_name>_biblios/_mapping. 2. If using the default configuraion only "author" has a sort field (author__sort). 4. Appy patch. 5. Reindex using rebuild_elastic_search.pl. 6. All fields except those with sort sort set to "0" should now have sort fields, which in the default configuration is all but "author". Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 34cdd536cb16436b407947eecd6975b8d4f44467 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 11 13:57:39 2017 -0300 Bug 10021: Only display outstanding fines in 'Pay fines' Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit ff9a69ccbd61f862965094ac2332874d895aef11 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 11 13:32:09 2017 -0300 Bug 10021: Remove notify headers from pay*.tt Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: Koha/Exceptions/Config.pm | 16 ++++ Koha/SearchEngine/Elasticsearch.pm | 74 +++++++++++++++-- about.pl | 65 +++++++++++++++ acqui/neworderbiblio.pl | 1 + circ/returns.pl | 3 - .../optional/marc21_simple_bib_frameworks.sql | 8 ++ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 8 ++ .../optional/marc21_simple_bib_frameworks.sql | 8 ++ .../Optionnel/marc21_simple_bib_frameworks.sql | 6 ++ .../Obligatoire/framework_DEFAULT.sql | 8 ++ .../Obligatoire/framework_DEFAULT.sql | 8 ++ .../optional/marc21_simple_bib_frameworks.sql | 8 ++ .../optional/marc21_simple_bib_frameworks.sql | 6 ++ .../unimarc_bibliographic_DEFAULT_general.sql | 8 ++ .../marc21_bibliographic_DEFAULT_general.sql | 8 ++ .../unimarc_bibliographic_DEFAULT_general.sql | 8 ++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 26 ++++++ .../prog/en/modules/acqui/neworderbiblio.tt | 1 + .../prog/en/modules/members/paycollect.tt | 23 +++--- .../prog/en/modules/reserve/request.tt | 2 +- members/pay.pl | 4 +- t/Koha/SearchEngine/Elasticsearch.t | 86 ++++++++++++++++++++ t/db_dependent/Koha_Elasticsearch.t | 17 +++- 23 files changed, 375 insertions(+), 27 deletions(-) create mode 100644 Koha/Exceptions/Config.pm create mode 100644 t/Koha/SearchEngine/Elasticsearch.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Dec 11 21:53:34 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Dec 2017 20:53:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-121-g233b83c Message-ID: <E1eOV4w-0005JX-55@git.koha-community.org> 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 233b83ca5d6632e6d84f82e9fe50306b30212f49 (commit) via ec9f74791364906dea243a67a661645ae02d4567 (commit) via f1163dba9d70bfd463c0abe2f70528c66d12d7e7 (commit) via 86706c3b349e77bd2e67ced763dabec3b74c5b72 (commit) via 9f5b10126d3d2a2522277b64dd7a1996ca82181d (commit) via dda7b2ce4d8e7a7460740fb9e01257e9150bb608 (commit) via 7805ef2c01bf8a566daeb805b3c2f8943dafc80d (commit) via 8430a541af9302ae6cef247253000c1469ae2f33 (commit) via 254883608912456bc15f57cf282099b8641faf54 (commit) via 5a31321676e8bfd02d3a7c1888b89a7fc01166f4 (commit) via 2485afc57cb26ce331be60f413a519644ce29796 (commit) via 4b07ae3f41df33c73cfe2f5989b4a50be6efce3d (commit) via 296442d2d5d8d506ae299b136ddbd834f5123880 (commit) via 96f442badd65f672ddc2ba425e851e11a42112ad (commit) via 54880b1a4ef8a656d270182d368d4254bc811042 (commit) via a7d333f3cde9b6fe7cdd0f816b9c357e741ce8e9 (commit) via 5fd7834394fb0d4996bbd93e206c2337d922333f (commit) via 538536da73681719a1c2d7349a6d729bad7f39f4 (commit) via 83ca8fb600e598995b3547912092ec6df2dd3cac (commit) via d9046b76843b426d7a62a687f4fa62d6a222bc05 (commit) via cea8b9c7c5465a66cd2510117e88468259bc3983 (commit) via 656efc09dc55d639258741e3b0bcfc8e38dd7dcb (commit) from 03dd8267575559caadcc892a488ed74cd7c35e2b (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 233b83ca5d6632e6d84f82e9fe50306b30212f49 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 11 17:12:05 2017 -0300 Bug 19410: (follow-up) Move build_query_params_from_api into a helper Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit ec9f74791364906dea243a67a661645ae02d4567 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Dec 5 15:40:56 2017 -0300 Bug 19410: (follow-up) Add reserved params definitions This patch re-adds some parameters I left out during some rebasing tasks and ended up on a separate patchset (bug 18731). The introduced parameters definitions are only used on endpoint definitions that implement (at least) pagination. No need to test them here but easier adding them here than on a patch implementing a new enpoint, which would become a dependency for other endpoints. Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit f1163dba9d70bfd463c0abe2f70528c66d12d7e7 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Nov 21 16:12:08 2017 -0300 Bug 19410: Move build_query_params_from_api into a helper This patch creates the 'build_query_params' helper, instead of the original function in Koha::Objects. Unit tests are removed for Koha::Objects::_build_query_params_from_api and written for the helper plugin. The objects.search helper gets a call to build_query_params added. Tests for it updated to match this behaviour change. To test: - Apply this patches - Run: $ kshell k$ prove t/Koha/REST/Plugin/Query.t \ t/db_dependent/Koha/Objects.t \ t/db_dependent/Koha/REST/Plugin/Objects.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 86706c3b349e77bd2e67ced763dabec3b74c5b72 Author: Julian Maurice <julian.maurice at biblibre.com> Date: Tue Nov 21 14:36:49 2017 +0000 Bug 19410: Move search_for_api into a Mojo helper Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9f5b10126d3d2a2522277b64dd7a1996ca82181d Author: Lari Taskula <lari.taskula at jns.fi> Date: Sat Oct 7 12:55:56 2017 +0000 Bug 19410: (follow-up) Fix typo in POD Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit dda7b2ce4d8e7a7460740fb9e01257e9150bb608 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Fri Oct 6 12:49:27 2017 -0300 Bug 19410: Unit tests Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 7805ef2c01bf8a566daeb805b3c2f8943dafc80d Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Wed Oct 4 15:41:35 2017 -0300 Bug 19410: Add Koha::Objects->search_for_api Following the discussion about the best way to make things simpler for developing the REST api, I quote Lari's email: "As many other endpoint will have the exact same usage, by looking at your example, I would prefer to avoid writing parameter / pagination / sorting / header handling for each list operation in our API controllers. Do you think it's possible to centralize all of this e.g. by passing $c into a customized search sub? Perhaps in Koha::Objects? so instead we could have something like (ignore my bad choice of naming)...: sub list_vendors { my $c = shift->openapi->valid_input or return; my $args = $c->validation->output; my $vendors; return try { $vendors = Koha::Acquisition::Booksellers->api_list_search($c); return $c->render(status => 200, openapi => $vendors); } catch { ... } }" We all agreed we neeed something like that. Here's a possible implementation. I take advantage of the previously written Mojo helpers, that are fully covered by tests. I submit this early so anyone can take a look and gather ideas to make it even better. I'm already using it (effectively) for the /acquisitions/orders endpoint I'm writing on bug 18731. Thanks! Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 8430a541af9302ae6cef247253000c1469ae2f33 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Thu Nov 23 10:45:59 2017 -0300 Bug 19370: (QA follow-up) Use OpenAPI's handling of pipe separated values This patch makes the helper handling _order_by params expect a list of values instead of a (to-be-splitted) string. The idea is that the OpenAPI plugin will take care of splitting pipe-delimited values if the spec is correctly defined. Note: In the process I noticed + on the URL represents a space, so the helper function is updated to handle both + and %2B as ascending. To test: - Run: $ kshell k$ prove t/Koha/REST/Plugin/Query.t => SUCCESS: Tests pass! - Sign off :-D Edit: Removed rebasing leftover making the tests fail. Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 254883608912456bc15f57cf282099b8641faf54 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Oct 3 17:03:54 2017 -0300 Bug 19370: Remove undefined variable warning Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 5a31321676e8bfd02d3a7c1888b89a7fc01166f4 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Sep 26 15:17:43 2017 -0300 Bug 19370: Add helper function for order_by attribute generation This patch introduces a helper function called 'dbic_merge_sorting' to Koha::REST::Plugin::Query. This simple function adds SQL::Abstract order_by attribute to the passed $filter hashref, as explained in the POD. It introduces a syntax for passing sorting params on the request to the REST api. The proposed syntax has been found in the wild, and is pretty trivial to parse/work with: GET /api/v1/<endpoint>?order_by=+column_1|-column_2|column_3 As explained on the POD, + stands for 'asc' and - for 'desc'. If ommited, it defaults to the DB engine default (usually asc). To test: - Apply this patches - Run: $ sudo koha-shell kohadev k$ cd kohaclone k$ prove t/Koha/REST/Plugin/Query.t => SUCCESS: Tests pass! And they make sense! :-P - Sign off :-D Edit: renamed params to match DBIC terminology. My bad :-D (tcohen) Sponsored-by: Camden County Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 2485afc57cb26ce331be60f413a519644ce29796 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Sep 26 15:17:01 2017 -0300 Bug 19370: Unit tests Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 4b07ae3f41df33c73cfe2f5989b4a50be6efce3d Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 11 17:30:49 2017 -0300 Bug 19278: DBRev 17.12.00.004 Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 296442d2d5d8d506ae299b136ddbd834f5123880 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Fri Sep 22 19:15:43 2017 -0300 Bug 19278: Mention RESTdefaultPageSize in POD This patch adds information about RESTdefaultPageSize usage when the per_page parameter is absent on the query. Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 96f442badd65f672ddc2ba425e851e11a42112ad Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 11 17:42:15 2017 -0300 Bug 19278: (follow-up) Make the pagination plugin use RESTdefaultPageSize Use 20 as default for RESTdefaultPageSize (just in case) Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 54880b1a4ef8a656d270182d368d4254bc811042 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Fri Sep 8 12:20:20 2017 -0300 Bug 19278: Make the pagination plugin use RESTdefaultPageSize This bug introduces a new syspref RESTdefaultPageSize that is used on the Koha::REST::Plugin::Pagination plugin to default to a valid value for the page size if the param is not present on the query. This patch also considers the situation in which no 'page' param is passed, and no header should be added. To test: - Run: $ sudo koha-shell kohadev k$ cd kohaclone k$ prove t/Koha/REST/Plugin/Pagination.t => FAIL: Tests fail because the plugin doesn't behave as the tests expect. - Apply this patch - Run: k$ prove t/Koha/REST/Plugin/Pagination.t => SUCCESS: Tests pass! - Sign off :-D Sponsored-by: Camden County Sponsored-by: ByWater Solutions Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a7d333f3cde9b6fe7cdd0f816b9c357e741ce8e9 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Fri Sep 8 12:18:35 2017 -0300 Bug 19278: Unit tests This patch introduces tests for a behaviour change in Koha::REST::Plugin::Pagination. To test: - Run: $ sudo koha-shell kohadev k$ cd kohaclone k$ prove t/Koha/REST/Plugin/Pagination.t => FAIL: Tests should fail without the followup patch applied Sponsored-by: Camden County Sponsored-by: Bywater Solutions Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 5fd7834394fb0d4996bbd93e206c2337d922333f Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Fri Sep 8 12:18:21 2017 -0300 Bug 19278: Add RESTdefaultPageSize syspref Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 538536da73681719a1c2d7349a6d729bad7f39f4 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Sep 26 15:12:19 2017 -0300 Bug 19369: Add helper function for pagination attributes generation This patch introduces a new helper function to the Koha::REST::Plugin::Pagination plugin, called 'dbic_merge_pagination'. This simple function adds SQL::Abstract pagination attributes ('page' and 'rows') to the passed $filter hashref. To test: - Apply this patches - Run: $ koha-shell kohadev k$ cd kohaclone k$ prove t/Koha/REST/Plugin/Pagination.t => SUCCESS: Tests pass! - Sign off :-D Sponsored-by: Camden County Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 83ca8fb600e598995b3547912092ec6df2dd3cac Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Sep 26 15:11:38 2017 -0300 Bug 19369: Unit tests Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit d9046b76843b426d7a62a687f4fa62d6a222bc05 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Fri Sep 1 12:01:08 2017 -0300 Bug 19234: (follow-up) Make Query plugin available to endpoints Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit cea8b9c7c5465a66cd2510117e88468259bc3983 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Fri Sep 1 11:53:35 2017 -0300 Bug 19234: Add query parameters handling helpers This patch introduces a Mojolicious plugin to be used on the REST api. It adds a helper method: generate_dbic_query =================== When used, it generates what's needed to perform a search on DBIC/Koha::Objects like this: my $params = $c->validation->output; my ($filtered_params, $reserved_params) = $c->extract_reserved_params($params); my $filter = do_smth($filtered_params, $reserved_params); my $attributes = do_smth_reserved($reserved_params); my $patrons = Koha::Patrons->search( $filter, $attributes ); It introduces reserved param names: - _match - _order_by - _page - _per_page They are reserved for later usage (pagination, matching algorithm on building DB queries) All the plugin's behaviour is tested. To test: - Run: $ sudo koha-shell kohadev k$ cd kohaclone k$ prove t/Koha/REST/Plugin/Query.t => SUCCESS: Tests pass! - Sign off :-D Sponsored-by: ByWater solutions Sponsored-by: Camden County Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 656efc09dc55d639258741e3b0bcfc8e38dd7dcb Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Fri Sep 1 11:52:29 2017 -0300 Bug 19234: Unit tests for query parameters handling helpers This patch adds unit tests for the new query parameters handling Mojo plugin. Sponsored-by: Camden County Sponsored-by: ByWater Solutions Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Lari Taskula <lari.taskula at jns.fi> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/REST/Plugin/Objects.pm | 86 +++++++++ Koha/REST/Plugin/Pagination.pm | 34 +++- Koha/REST/Plugin/Query.pm | 187 ++++++++++++++++++++ Koha/REST/V1.pm | 2 + api/v1/swagger/parameters.json | 40 ++++- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 12 ++ .../en/modules/admin/preferences/web_services.pref | 6 + t/Koha/REST/Plugin/Pagination.t | 63 ++++++- t/Koha/REST/Plugin/Query.t | 185 +++++++++++++++++++ t/db_dependent/Koha/Objects.t | 3 +- t/db_dependent/Koha/REST/Plugin/Objects.t | 125 +++++++++++++ 13 files changed, 740 insertions(+), 6 deletions(-) create mode 100644 Koha/REST/Plugin/Objects.pm create mode 100644 Koha/REST/Plugin/Query.pm create mode 100644 t/Koha/REST/Plugin/Query.t create mode 100644 t/db_dependent/Koha/REST/Plugin/Objects.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Dec 12 09:29:41 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Dec 2017 08:29:41 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.14-2-g8155644 Message-ID: <E1eOfwb-0005rQ-GB@git.koha-community.org> 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, 16.11.x has been updated via 8155644625a70304de022a2867c5e0cc0ea99c80 (commit) via 8c0692139e23395df5c082a953c1121d8e6624d5 (commit) from 9dce677e333331636e4736e806c6315404fe0f38 (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 8155644625a70304de022a2867c5e0cc0ea99c80 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Mon Nov 20 11:05:35 2017 -0500 Bug 19655: Make To.json escape doesn't escape newlines to create valid JSON JSON does not allow real line-breaks. If a field contains them and they are not escaped, a JSON parser will be unable to convert the stringified JSON back into an object. This is clearly exemplified by the guarantor search, where a multi-line note on the guarantor's record will break the ability to select that guarantor. Test Plan: 1) Create Patron A with a "Circulation note" that has multiple lines in it 2) Create Patron B 3) Attempt to set Patron A to be the guarantor for Patron B 4) Note selecting the patron does nothing 5) Apply this patch 6) Repeat step 3 7) Selecting the guarantor now works! Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> (cherry picked from commit 9cd9240c362336e390eed01acf3630f33e73825f) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> (cherry picked from commit efb28c4af16efbe688322415ae06c6a85fd3454b) Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> commit 8c0692139e23395df5c082a953c1121d8e6624d5 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Sun Nov 26 12:55:27 2017 -0300 Bug 19655: Add tests Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> (cherry picked from commit 6a4b36bc3a186adb07679c2a3549e69974e02c18) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> (cherry picked from commit f2a828d5519fb346d6e4d768f80e1ebe3f2ead46) Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- Summary of changes: Koha/Template/Plugin/To.pm | 2 ++ .../Template/Plugin/To.t} | 32 +++++++++++++++----- 2 files changed, 27 insertions(+), 7 deletions(-) copy t/{RotatingCollections.t => db_dependent/Template/Plugin/To.t} (53%) mode change 100755 => 100644 hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Dec 13 18:50:22 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 13 Dec 2017 17:50:22 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.00-1-g5a458a6 Message-ID: <E1ePBAk-0005v0-ER@git.koha-community.org> 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 5a458a6e771f4d4675f3c99cd04dae0a387e1fd8 (commit) from 2b74d72a2d72f2be1361d3d223c403b992c80fab (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 5a458a6e771f4d4675f3c99cd04dae0a387e1fd8 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 6 16:33:56 2017 -0300 Bug 19766: (bug 19058 follow-up) Fix Preview routing slip This patch fixes the following errors: The method reserve_id is not covered by tests at /home/vagrant/kohaclone/C4/Reserves.pm line 859. The method set is not covered by tests at /home/vagrant/kohaclone/C4/Reserves.pm line 871. Can't call method "store" on an undefined value at /home/vagrant/kohaclone/C4/Reserves.pm line 871. This is caused by commit ba1f2f93ef58c8dd935add3e215facdd4a589d12 Bug 19058: Move C4::Reserves::GetReserveId to the Koha namespace We are calling ->reserve_id on a Koha::Holds set. Test plan: - Serials -> Find subscription -> "Edit routing list" in the sidebar - Add 1+ recipients - Save -> "Save and preview routing slip" Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 5 +++-- t/db_dependent/Holds.t | 11 ++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 14 13:30:36 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Dec 2017 12:30:36 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.00-26-g7e691bc Message-ID: <E1ePSeq-0008Gu-Kt@git.koha-community.org> 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 7e691bc6d8695377e12896be085039c81115e4d0 (commit) via d8a16dd89a2853837e87eec1b1ec0d419ede1b55 (commit) via b90824527b47e78e56e2f602199481325beeec15 (commit) via adb37ce8cf10fee1c81ee35d703ec3a81c82697d (commit) via ca95a10d90ebfec7a82b6224569f29df6059fd5b (commit) via 9d79d463250c430678f724f265500776f541cd42 (commit) via 18897829e4bd585d5adb16681ce6dd648b368c66 (commit) via 8aea1ca0f62acf00b8ffdb881b7293f7c598acd3 (commit) via f2a74a7f13f236ade27d62275a0dfe51c5aa97e1 (commit) via 4db611b5dc83e2d865aaba4afe04cd5aaa89904e (commit) via fff0065785b0cd7e664eac3285a5f051cb94871a (commit) via 5c58ba6bcc13e7592d8599ab90d3068dc2c127b2 (commit) via fdde85a52164168d998d995ce41b4421b4a3ffbb (commit) via d3eef921f501634d3656b9d08abafa55b3ed6c07 (commit) via a7aab6d30b0a14c58bc0ab355ff284bd60750103 (commit) via e0c3780634ef35ad937f69721aaeafa7bf9a4fee (commit) via ef8c92ce21e1ea983da3445045236939b1de90fe (commit) via 30f2b40f3c408a1f81eae57c5012e6283eccb3d0 (commit) via e2d05f3fdfde20977ca5525510e8f4c0daa964f1 (commit) via 455d94eec9c41f7bad718ac62c2367bea6202452 (commit) via 20b5caa20b06b548b1a521c1a0762f7104427fec (commit) via 803c70cef8e88dae25394ca7d2fc645f1b514ad8 (commit) via 58b6f1cd9e466c375526b01b801bb5de61e37706 (commit) via 5a852cadaf9fddc38618e22d4fad1e1b7a3f9120 (commit) via 47f65da22e63a35fdecf6857016983869d6855cb (commit) from 5a458a6e771f4d4675f3c99cd04dae0a387e1fd8 (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 7e691bc6d8695377e12896be085039c81115e4d0 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 10:26:32 2017 -0300 Bug 19724: DBIC Schema changes Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit d8a16dd89a2853837e87eec1b1ec0d419ede1b55 Author: Mark Tompsett <mtompset at hotmail.com> Date: Thu Jul 6 15:42:43 2017 +0000 Bug 18907: Build has deprecating message Following the instructions at: https://wiki.koha-community.org/wiki/Building_Debian_Packages_-_The_Easy_Way Receiving the following message in the build: dpkg-source: warning: relation < is deprecated: use << or <= This patch tweaks the list-deps. git diff origin/master -- debian/list-deps shows just the one line changed from < to << as per the messages suggestion and eythian's suggestion on IRC: http://irc.koha-community.org/koha/2017-07-06#i_1950698 The control file can be regenerated from the command-line: ./debian/update-control However, it will be attached separately. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit b90824527b47e78e56e2f602199481325beeec15 Author: Victor Grousset <victor.grousset at biblibre.com> Date: Fri Nov 24 12:02:47 2017 +0100 Bug 12497: Fix OPAC search history reachable by URL even when disabled Test plan: 1. Set EnableOpacSearchHistory syspref to "Keep" 2. Make a search in the OPAC 3. Go to /cgi-bin/koha/opac-search-history.pl 4. Set the EnableOpacSearchHistory syspref to "Don't keep" 5. Refresh the OPAC page to show that history is still accessible 6. Apply the patch 7. Refresh the OPAC page, you should end on the 404 page 8. Set EnableOpacSearchHistory syspref to "Keep" 9. Go to /cgi-bin/koha/opac-search-history.pl which should be reachable Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Charles Farmer <charles.farmer at inLibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit adb37ce8cf10fee1c81ee35d703ec3a81c82697d Author: Victor Grousset <victor.grousset at biblibre.com> Date: Thu Nov 23 16:03:14 2017 +0100 Bug 12497: Fix search history non-accessible when OPAC was private (when the user didn't have the "borrowers" permission) Test plan: 1. Set syspref "OpacPublic" to false (Disable) 2. Log in as a user without any permission 3. Try to access the search history. The link is next to "Log out" 4. Then you should see "Access denied" 5. Apply this patch 6. Refresh the page 7. Then you should see the search history Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Charles Farmer <charles.farmer at inLibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit ca95a10d90ebfec7a82b6224569f29df6059fd5b Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 21 16:17:32 2017 +0000 Bug 19674: Broken indicators of changed fields in manage staged MARC records template This patch returns some CSS to the manage staged MARC records template which was incorrectly removed by Gug 16538. To test, apply the patch and go to Tools -> Staged MARC management. Choose a staged MARC file. Changing any of the <select> fields in the first section should cause a label to appear showing that the selection has changed, along with a link to reset the option to its original state. Clicking 'Reset' should make the label and the link disappear. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 9d79d463250c430678f724f265500776f541cd42 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Nov 9 16:47:42 2017 +0000 Bug 19602: Add usage statistics link to administration sidebar menu This patch adds a link to the new usage statistics page in the administration sidebar menu. To test, apply the patch and view an administration page which includes the admin sidebar. Confirm that the link to usage statistics is there. Visit the usage statistics page and confirm that the usage statistics link in the sidebar is display in bold. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 18897829e4bd585d5adb16681ce6dd648b368c66 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Nov 10 12:59:58 2017 +0000 Bug 19595: Clicking plugin link does not fill item's date acquired field This patch updates the dateaccessioned plugin for the item edit form to return functionality which was removed in a previous patch. To test, apply the patch and open an item for editing. Clicking the "..." link next to the "Date acquired" field should insert the current date, overwriting the existing date. Open a blank item add form. Putting the cursor in the "Date acquired" field should automatically insert the current date. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Added a comment line in set_to_today. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 8aea1ca0f62acf00b8ffdb881b7293f7c598acd3 Author: Nick Clemens <nick at bywatersolutions.com> Date: Tue Oct 31 13:17:26 2017 +0000 Bug 19551: Fix wrong order of operations in cash register report To test: 1 - Find or create a fine for a patron 2 - Write it off 3 - Home -> Reports -> Cash register 4 - Fill in current date and transaction type 'Write off' 5 - Click Submit -- see your write off 6 - Fill in previous dates and transaction type 'Write off' 7 - Click Submit -- see your write off (bad) 8 - Apply patch 9 - Rerun steps 3-7 -- write only visible for current date. Signed-off-by: Mark Tompsett <mtompset at hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit f2a74a7f13f236ade27d62275a0dfe51c5aa97e1 Author: Nick Clemens <nick at bywatersolutions.com> Date: Thu Dec 14 12:03:10 2017 +0000 Bug 19724: DBRev 17.11.00.001 Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 4db611b5dc83e2d865aaba4afe04cd5aaa89904e Author: Nick Clemens <nick at bywatersolutions.com> Date: Thu Dec 14 12:01:38 2017 +0000 Bug 19724: Add timestamp to biblio_metadata and deletedbiblio_metadata Since bug 17196, biblioitems.timestamp is not always updated after a change in the MARC record. We need to know the last modification time of the MARC record for some features (like OAI-PMH parameters 'from' and 'until' for instance) This patch only adds the missing column in biblio_metadata and deletedbiblio_metadata Test plan: 1. Run updatedatabase.pl 2. Verify that both tables have the new column, its value should be the greatest timestamp value from the corresponding biblio and biblioitems table entries You can verify with the following SQL query: SELECT b.biblionumber, b.timestamp as biblio_ts, bi.timestamp as biblioitems_ts, m.timestamp as biblio_metadata_ts FROM biblio_metadata m LEFT JOIN biblioitems bi ON (bi.biblionumber = m.biblionumber) LEFT JOIN biblio b ON (b.biblionumber = m.biblionumber); Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druat <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit fff0065785b0cd7e664eac3285a5f051cb94871a Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 4 15:39:48 2017 -0300 Bug 19638: Remove false positive obsolete reports (auth_header.marcxml) Bug 17898 tries to help users identify reports affected by the move of marcxml to the biblio_metadata table, however, the auth_header table still uses the column name 'marcxml' and so reports as needing updated though it doesn't. C4::Reports::Guided::convert_sql only converts if the sql query contain biblioitems and marcxml. We should use the same regexp in the controler script. Test plan: Use a sql report that use auth_header.marcxml (see https://wiki.koha-community.org/wiki/SQL_Reports_Library) After the this the report should not be longer marked as obsolete on the report list view Replicated bug with the following SQL: select marcxml from auth_header; Patch applied correctly and functioned as expected. Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 5c58ba6bcc13e7592d8599ab90d3068dc2c127b2 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 09:47:28 2017 -0300 Bug 7143: Update about page for new dev - Simon Pouchol Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit fdde85a52164168d998d995ce41b4421b4a3ffbb Author: Mark Tompsett <mtompset at hotmail.com> Date: Mon Oct 23 14:00:53 2017 +0000 Bug 10222: Correct and expand to other languages This added column names, and reformated to be a bit more readable. This also adds this change to de-DE, es-ES, fr-CA, and nb-NO. While there was printer_profiles for it-IT, the Italian file seems to not use the same numbers, and does not visibly look like it needs these changes. Signed-off-by: Mark Tompsett <mtompset at hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit d3eef921f501634d3656b9d08abafa55b3ed6c07 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Thu Apr 16 12:07:29 2015 -0400 Bug 10222: Error when saving Demco label templates This patch fixes a bug whereby if you open either of the Demco label templates (loaded by the sample data) and click "save" without making any changes you will get an error: Can't bless non-reference value at C4/Creators/Profile.pm line 92. It also fixes another minor bug in the creator sample data. To test: 1. Install all sample data in a clean database. 2. In the label tool, edit either of the Demco label templates. 3. Save the template and observe the error mentioned above. 4. Drop and recreate the database. 5. Apply the patch. 6. Repeate steps 1-3 and note the successful save. Signed-off-by: Mark Tompsett <mtompset at hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit a7aab6d30b0a14c58bc0ab355ff284bd60750103 Author: Nick Clemens <nick at bywatersolutions.com> Date: Fri Jul 28 11:58:46 2017 +0000 Bug 18990: Overdue Notices are not sending through SMS correctly Bug 18478 fixed sms via email problems under the assumption that to_address was either smsalertnumber or blank. It seems overdues set the to_address to email. This patch changes the code to enforce that an sms sent with emial driver will use the smsalertnumebr and provider defined for the borrower, regardless of what is set in the queue To test: 1 - Define a messaging prefs for a patron to recieve hold notices via SMS 2 - Ensure you have defined an SMS message for an overdue letter 3 - Set an SMS alert number for patron 4 - Set the SMS::Send driver to 'Email' 5 - Checkout an item as overdue to trigger notice above 6 - Run overdue_notices.pl 6 - Check the db and note the address is email 7 - run process_message_queue.pl 8 - Check db - address is email followed by service provider 9 - Apply patch 10 - repeat 11 - Message to_address should be populated with smsalertnumber Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit e0c3780634ef35ad937f69721aaeafa7bf9a4fee Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Nov 16 19:19:33 2017 +0000 Bug 19643: Pagination buttons on staged marc management are stacking instead of inline This patch modifies the template for staged MARC import management to correct a problem with the style of pagination links. To test you must have more than 25 staged imports. Go to Tools -> Staged MARC management. The pagination links, both at the top and the bottom, should look correct (use multi-page SQL report results for reference). Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit ef8c92ce21e1ea983da3445045236939b1de90fe Author: David Bourgault <david.bourgault at inlibro.com> Date: Wed Nov 22 13:58:21 2017 -0500 Bug 19681: Correct result count formatting This simply passes the missing information to the template. Test plan: 0) Apply patch 1) Go to Tools > Label creator > New > Label batch 2) Press 'Add items' 3) Do a search that will return few items 4) The result count will read "Results 1 through X of X" Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 30f2b40f3c408a1f81eae57c5012e6283eccb3d0 Author: Simon Pouchol <simon.pouchol at biblibre.com> Date: Fri Nov 24 16:53:49 2017 +0100 Bug 19692: fix unclosed div in opac-shelves.tt Test plan: 1. set syspref OpacKohaUrl to "Show" 2. Log into the OPAC 3. /cgi-bin/koha/opac-shelves.pl 4. Notice that "Powered by Koha" is not in the footer in this page. When on the other tabs it's in the footer (out of .main) 5. Apply this patch 6. Notice that "Powered by Koha" now in the footer in the "your lists" page Signed-off-by: Dominic Pichette <dominic at inlibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit e2d05f3fdfde20977ca5525510e8f4c0daa964f1 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Thu Oct 26 07:35:53 2017 -0400 Bug 19533: Hold pulldown for itemtype is empty if hold placement needs override Test Plan: 1) Enable AllowHoldPolicyOverride 2) Enable AllowHoldItemTypeSelection 3) Create a situation where adding a hold for a patron would trigger a tooManyReserves warning. 4) Note the itemtype pulldown is empty 5) Apply this patch 6) Reload the page 7) Itemtype pulldown should have values Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 455d94eec9c41f7bad718ac62c2367bea6202452 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Wed Jun 21 13:05:40 2017 +0200 Bug 18833: Plugin unimarc_field_210c pagination error In plugin unimarc_field_210c, the editors search results have pagination. First page works but not other pages. The main problem whas mainly because $startfrom var was missused. It is defined in C4::Output::pagination_bar as page number. This patch corrects by using a $offset var. Also removes dead code, obsoleted by using C4::Output::pagination_bar. Also changes hardcoded results per page from 19 to 20. Test plan : - Use UNIMARC catalogue - Define in framework value builder unimarc_field_210c on 210$c - Create autority type EDITORS with heading 200$b - Create 22 authorities of that type - Index those new authorities - Create a new biblio record - Click on 210$c plugin - Click on "Search" - You see 20 results - Click on page 2 => Without patch you get empty table => With patch you get 2 results - Check that you see "Results 21 to 22 of 22" - Delete 2 autorities and retest Works as intended. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 20b5caa20b06b548b1a521c1a0762f7104427fec Author: Josef Moravec <josef.moravec at gmail.com> Date: Fri Oct 13 06:44:55 2017 +0000 Bug 19456: Make patron-title ability to be generated with or without html tags Modified pages: circ/circulation.pl circ/circulation_batch_checkouts.pl members/boraccount.pl members/files.pl members/holdshistory.pl members/housebound.pl members/moremember.pl members/notices.pl members/purchase-suggestions.pl members/readingrec.pl members/routing-lists.pl members/statistics.pl Test plan: 0) Do not apply the patch 1) Have a patron with title/salution filled in 2) Confirm bug, go for example to circ/circulation page and see there is html in <title> tag (you can see it in your browser page/window title) 3) Apply the patch 4) Go through circulation/patron pages (see modified page above) and confirm there is no html in <title> tag, but on the page itself the salutation should be in <span class="patron-title"> Signed-off-by: David Bourgalt <david.bourgault at inlibro.com> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 803c70cef8e88dae25394ca7d2fc645f1b514ad8 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Thu Nov 16 15:22:48 2017 +0100 Bug 19640: fix OPAC IdRef webservice display The OPAC webservice IdRef display was broken. The call returns results but citations where empty. Maybe the webservice has changed. This patch corrects the fetch of datas in result. Also fixes a small HTML missing tag tr. Also adds a comment with link to official doc : http://documentation.abes.fr/aideidrefdeveloppeur/index.html#MicroWebBiblio Test plan : 1) Enable system preference IdRef 2) Choose an existing PPN like 032581270 3) Look result on : https://www.idref.fr/services/biblio/032581270.json 4) Call in OPAC website : /cgi-bin/koha/opac-idref.pl?unimarc3=032581270 5) Without patch you see only one role containing empty rows 6) With patch you see all roles with correct rows Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: removed unused @unimarc3 (not to be confused with $unimarc3). Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 58b6f1cd9e466c375526b01b801bb5de61e37706 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Fri Nov 24 09:27:14 2017 +0100 Bug 19646: (QA follow-up) Fix tab character Resolve qa tools warning: FAIL koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt FAIL forbidden patterns forbidden pattern: tab char (line 172) Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 5a852cadaf9fddc38618e22d4fad1e1b7a3f9120 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Fri Nov 17 13:38:06 2017 +0100 Bug 19646: fix value_builder marc21_linking_section template When using marc21_linking_section cataloging plugin, you get the error : Template process failed: undef error - The method selected is not covered by tests! at /home/koha/src/C4/Templates.pm line 122. It commes from [% IF ( itypeloo.selected ) %], selected is not defined in itypeloo. This patch removes this condition because all item types are fetched from database, there is not one selected. It sets "All item types" as selected. Also correctes two errors in HTML : ending form and div, "<a_class=" instead of "<a class=" Test plan : 1) Use a MARC21 database 2) Define marc21_linking_section cataloging plugin in framework, on 773$t for example 3) Create a new biblio record 4) Click on icon in 773$t 5) Check plugin works fine Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 47f65da22e63a35fdecf6857016983869d6855cb Author: David Bourgault <david.bourgault at inlibro.com> Date: Wed Nov 22 14:35:27 2017 -0500 Bug 19683: Fix authority types in tools/export template Fixes the bug by correcting the variable names in the template. To test: 1) Tools > Export > Export authority records 2) Authority Types dropdown is not empty Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: Changing the export script and unblessing is not needed. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 4 +- Koha/Schema/Result/BiblioMetadata.pm | 18 ++++++- Koha/Schema/Result/DeletedbiblioMetadata.pm | 18 ++++++- cataloguing/value_builder/dateaccessioned.pl | 7 +-- cataloguing/value_builder/unimarc_field_210c.pl | 52 ++++---------------- debian/list-deps | 2 +- docs/history.txt | 2 + .../mysql/de-DE/optional/sample_creator_data.sql | 7 ++- .../data/mysql/en/optional/sample_creator_data.sql | 7 ++- .../mysql/es-ES/optional/sample_creator_data.sql | 7 ++- .../mysql/fr-CA/facultatif/sample_creator_data.sql | 10 ++-- installer/data/mysql/kohastructure.sql | 8 ++- .../nb-NO/2-Valgfritt/sample_creator_data.sql | 7 ++- installer/data/mysql/updatedatabase.pl | 22 +++++++++ .../intranet-tmpl/prog/en/includes/admin-menu.inc | 1 + .../prog/en/includes/patron-title.inc | 16 ++++-- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +- .../value_builder/marc21_linking_section.tt | 15 +++--- .../prog/en/modules/circ/circulation.tt | 2 +- .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/files.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 2 +- .../prog/en/modules/members/housebound.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- .../prog/en/modules/members/notices.tt | 2 +- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/routing-lists.tt | 2 +- .../prog/en/modules/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/export.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 7 ++- .../opac-tmpl/bootstrap/en/modules/opac-idref.tt | 8 +-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- labels/label-item-search.pl | 2 + opac/opac-idref.pl | 43 +++++++--------- opac/opac-search-history.pl | 6 ++- reports/cash_register_stats.pl | 2 +- reports/guided_reports.pl | 2 +- reserve/request.pl | 2 + t/db_dependent/Letters.t | 14 +++++- 41 files changed, 191 insertions(+), 129 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 14 19:22:48 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Dec 2017 18:22:48 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.00-34-gdc06795 Message-ID: <E1ePY9g-0002oW-Co@git.koha-community.org> 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 dc06795ff74f7cb5e9fd9b992b72b7487b2ce7de (commit) via 8b4a24670afb9ddb9b5e9d49a4fc755a3fde4553 (commit) via d93a2c3005514c108ce0b72e43930c98ba5215d9 (commit) via 232b3cf25374f07ee2966231c5e5294ef16965a4 (commit) via 68a6d049869789618af1ddba9802b6d593593d09 (commit) via a48cf73e9aaaf8aaac9937734dfcdbbcd2fff631 (commit) via 4f2c6084c34187142630ad4c900d23fc716fad3b (commit) via de3b3115b610d43bf320aa0bfb9902c9d417ea2d (commit) from 7e691bc6d8695377e12896be085039c81115e4d0 (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 dc06795ff74f7cb5e9fd9b992b72b7487b2ce7de Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Tue Oct 10 15:50:24 2017 +0200 Bug 19439: (follow-up) Remove four spaces from lines 133-149 Speaks for itself. No test plan. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 8b4a24670afb9ddb9b5e9d49a4fc755a3fde4553 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Mon Oct 9 15:12:05 2017 +0200 Bug 19439: Remove eval with exit statements from opac/unapi The script contains some error responses that get lost when using them in an eval statement. (Since exit should not be used within an eval construction.) The eval is removed now. Test plan: [1] Before applying this patch, you could look at the current responses from unapi for the calls in the next steps. Apply the patch now. [2] Call http(s)://[your-server]/cgi-bin/koha/unapi with only a format parameter. Check if you have a 400 status response. (In Firefox, look at Network tab of Developer Tools.) Note: Have to admit (reluctantly) that MS Edge shows the status code in the browser rightaway in contrast with Firefox. [3] Call unapi with a format=marcxml&id=999 The wrong id parameter should trigger a 404 response. [4] Call unapi with format=marcxml&id=koha:biblionumber:[notexist] where notexist is a biblionumber that not exists. This should trigger again a 404 response. [5] Call unapi with format=marcxmlx&id=koha:biblionumber:[exist] where exist should be a good biblionumber. The wrong format should trigger a 406 response. [6] Bonus: The 500 response can be tested by manipulating a XSLT file. Create invalid xml in the file for marcxml (identity.xsl in intranet xslt folder). Call unapi with format=marcxml&id=koha:biblionumber:[exist]. You should get a 500 response and have warnings in your logfile. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit d93a2c3005514c108ce0b72e43930c98ba5215d9 Author: Josef Moravec <josef.moravec at gmail.com> Date: Fri Oct 6 07:26:31 2017 +0000 Bug 19292: Add MARC code column on libraries list Test plan: 0) Apply the patch 1) Go to admin/branches.pl 2) In the list of libraries, you should see new column "MARC Organization Code" 3) Insert some codes to some libraries 4) Confirm they are shown in new column Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Fixed capitalization. Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 232b3cf25374f07ee2966231c5e5294ef16965a4 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Dec 5 15:26:58 2017 +0000 Bug 19751: Holds awaiting pickup report should not be fixed-width This patch changes the grid used for the holds awaiting pickup report so that the results are full page and fluid instead of fixed-width. To test, apply this patch and the patch for Bug 19700 if necessary. View the holds awaiting pickup report. The report should fluidly fill the page width. Test with the CircSidebar system preference enabled and disabled. Signed-off-by: George Williams <george at nekls.org> Signed-off-by: BWS Sandboxes <ByWaterSandboxes at gmail.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 68a6d049869789618af1ddba9802b6d593593d09 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 13:41:06 2017 -0300 Bug 19775: Try & prevent Search/History.t to fail randomly # Failed test 'There are still 8 searches after calling delete with an interval = 6 days' # at t/db_dependent/Search/History.t line 185. # got: '6' # expected: '8' # Failed test 'There are still 2 searches after calling delete with an interval = 2 days' # at t/db_dependent/Search/History.t line 191. # got: '0' # expected: '2' # Looks like you failed 2 tests of 27. [15:04:12] t/db_dependent/Search/History.t It looks like it does not longer fail with this change (date comparaison wrongly rounded to second in mysql?) Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit a48cf73e9aaaf8aaac9937734dfcdbbcd2fff631 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 11:28:54 2017 -0300 Bug 7143: Update about page for new dev - Victor Grousset Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 4f2c6084c34187142630ad4c900d23fc716fad3b Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 10:52:28 2017 -0300 Bug 19496: ReplytoDefault is a pref, not a C4::Context method Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit de3b3115b610d43bf320aa0bfb9902c9d417ea2d Author: Aleisha Amohia <aleishaamohia at hotmail.com> Date: Mon Nov 27 21:33:58 2017 +0000 Bug 19496: Fixing to_address for patron notes This patch ensures the patron note to_address is the branch email or the Koha Admin email, and the from_address is the patron's email. To test: 1) Ensure syspref 'allowcheckoutnotes' is turned on 2) Go to OPAC, leave a note on a checkout 3) Confirm that the note is received (in mysql message_queue) but the to_address is the patron's email - this is wrong 4) Apply patch and refresh OPAC 5) Leave a note on a checkout 6) Confirm that the note is received in message queue 7) Confirm that the to_address is one of: - branch email - branch reply to - syspref ReplytoDefault - syspref KohaAdminEmailAddress 8) Confirm that the from_address is one of: - patron email - patron emailpro - patron B_email Sponsored-by: Catalyst IT Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 3 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +- .../prog/en/modules/admin/branches.tt | 4 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- opac/opac-issue-note.pl | 12 +++++- opac/svc/patron_notes | 12 +++++- opac/unapi | 42 ++++++++++---------- t/db_dependent/Search/History.t | 8 ++-- 8 files changed, 55 insertions(+), 31 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 14 20:17:56 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Dec 2017 19:17:56 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-122-g441585a Message-ID: <E1ePZ12-0003up-EZ@git.koha-community.org> 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 441585a6cc402340977948338dddc6090c1b541f (commit) from 233b83ca5d6632e6d84f82e9fe50306b30212f49 (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 441585a6cc402340977948338dddc6090c1b541f Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 14 16:01:33 2017 -0300 Bug 19776: (follow-up) remove dup category_type keys The previous patch was obviously wrong, the category_type key appeared twice. categories.category_type is a varchar(1) and 'P' is not 'X'. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation.t | 2 +- t/db_dependent/Circulation/MarkIssueReturned.t | 2 +- t/db_dependent/Circulation/NoIssuesChargeGuarantees.t | 2 +- t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 2 +- t/db_dependent/Circulation/dateexpiry.t | 2 +- t/db_dependent/DecreaseLoanHighHolds.t | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 14 21:05:36 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Dec 2017 20:05:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-137-ge66a78d Message-ID: <E1ePZlA-0007mj-NX@git.koha-community.org> 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 e66a78d1075ed5a1af995f79bd92b1ffc10036d7 (commit) via 400804ada19be4e6865d356e3671f6119ad56357 (commit) via 54de74c6f67c1caa6e1126ceae7e6d67d6f17e03 (commit) via cebadca9c30df1134ec05117f24850a3b66b3c25 (commit) via cfb372c30884dc85e31a8ca5159611dcab2ba98e (commit) via 214cae8d3daf131e733b71453d56bec6f03f6162 (commit) via a52b0f596f5890c147992120edd6f0227073a571 (commit) via 00cfd934c1095bfb2f5cee6296955d3a4de4950b (commit) via 04d79ba063bafcb15ae9c2fbb33bd7c7c96b4e60 (commit) via 666a1b276097785c2a7c33e718f26f5512b3d972 (commit) via 512c5f0c0d64cd4cf7a50c006416b42856202d41 (commit) via cc4cf2bde45a91ba94980182f40b8c3894f5a11b (commit) via 6ea21c395ae012792feb87c3f452f7cdf510c34f (commit) via 48bf229cc804b0624555137687527e1e23fa22f8 (commit) via e224182cc3581fa61331f3b6742d9be0e6707cda (commit) from 441585a6cc402340977948338dddc6090c1b541f (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 e66a78d1075ed5a1af995f79bd92b1ffc10036d7 Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Dec 11 16:47:00 2017 +0000 Bug 19767: Remove unused serial-issues.pl script This patch removes three unused files: serials/serial-issues.pl ...and its associated templates: koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tt koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tt To test, apply the patch and search the Koha codebase for references to any of those files. None should exist. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 400804ada19be4e6865d356e3671f6119ad56357 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Dec 12 18:35:47 2017 -0300 Bug 18330: (follow-up) Adapt holds.t to match the new datetime format Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 54de74c6f67c1caa6e1126ceae7e6d67d6f17e03 Author: Lari Taskula <lari.taskula at jns.fi> Date: Fri Mar 24 15:29:30 2017 +0200 Bug 18330: Handle date-time in Koha::Object->TO_JSON This patch formats timestamps and datetimes to meet date-time definition in RFC3339, as required by Swagger documentation. Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no> Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit cebadca9c30df1134ec05117f24850a3b66b3c25 Author: Lari Taskula <lari.taskula at jns.fi> Date: Fri Mar 24 16:29:46 2017 +0200 Bug 18330: Add RFC3339 to Koha::DateUtils To test: 1. prove t/DateUtils.t Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no> Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit cfb372c30884dc85e31a8ca5159611dcab2ba98e Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Nov 20 19:43:11 2017 +0000 Bug 19663: Move JS to the footer: Reports This patch modifies the staff client's reports templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of reports pages: All button controls, DataTables functionality, form validation, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Fix for QA: Remove unused Dopop function. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 214cae8d3daf131e733b71453d56bec6f03f6162 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Dec 7 13:25:11 2017 +0000 Bug 19627: (follow-up) Include tools-menu.js on required templates This follow-up adds tools-menu.js to the two patron clubs templates which include the tools sidebar menu. The patch also modifies tools-menu.js so that the correct sidebar link is highlighted when editing or viewing club enrollments. To test, apply the patch and view the patron clubs main page and the patron clubs enrollments page. The sidebar menu should have the correct link highlighted in both cases. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a52b0f596f5890c147992120edd6f0227073a571 Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Nov 15 14:13:46 2017 +0000 Bug 19627: Move patron clubs templates JS to the footer This patch modifies the staff client's patron clubs templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each page: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 00cfd934c1095bfb2f5cee6296955d3a4de4950b Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Nov 10 13:23:43 2017 +0000 Bug 19607: Move admin templates JavaScript to the footer: Basic parameters This patch modifies the staff client catalog-related administration templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Edit: Rebased on Bug 19560 Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 04d79ba063bafcb15ae9c2fbb33bd7c7c96b4e60 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Dec 8 16:04:15 2017 +0000 Bug 19778: Move template JavaScript to the footer: Serials, part 4 This patch modifies more and more staff client serials templates so that JavaScript is included in the footer instead of the header. This patch adds a new JavaScript include, showpredictionpattern.js, which is used by subscription-add.tt and subscription-numberpatterns.tt. it also adds subscription-add.js, moving most of the JS embedded in subscription-add.tt into an external file. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Serials -> New subscription - Date pickers - Popup search windows for vendors and bibliographic records - Next / Previous buttons - Form validation - Prediction pattern operations Test with new subscriptions, editing existing subscriptions, and duplicating subscriptions. - Serials -> Manage Numbering Patterns - Datatable - Delete confirmation -> Edit - Datepicker, test pattern - Serials -> Manage frequencies - Delete confirmation -> Edit - Form validation - Serials -> Subscription details -> Planning tab -> Edit history -> Datepicker - Serials -> Subscription details -> Renew - Datepicker Signed-off-by: Dominic Pichette <dominic at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 666a1b276097785c2a7c33e718f26f5512b3d972 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Dec 7 19:00:12 2017 +0000 Bug 19777: Move template JavaScript to the footer: Serials, part 3 This patch modifies even more staff client serials templates so that JavaScript is included in the footer instead of the header. This patch adds a new JavaScript include, serials-toolbar.js, which is required on pages which include serials-toolbar.inc. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Serials - Search for a subscription - Tabs, datatables, date pickers - Open a subscription for viewing - Tabs, toolbar buttons for delete, renew, and close. - Serial collection (in the sidebar menu) - Select all / clear all - Datatable - Print slip - Generate next Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 512c5f0c0d64cd4cf7a50c006416b42856202d41 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Dec 7 17:20:48 2017 +0000 Bug 19761: Move template JavaScript to the footer: Serials, part 2 This patch modifies more staff client serials templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Serials -> Subscription detail -> Edit routing list - Add recipients - Save - "Save and preview routing slip" should trigger preview - In preview popup: Print and Close buttons should work correctly Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit cc4cf2bde45a91ba94980182f40b8c3894f5a11b Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Dec 6 15:52:37 2017 +0000 Bug 19758: Move template JavaScript to the footer: Serials, part 1 This patch modifies some staff client serials templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Serials -> New subscription - Search for a vendor - "Choose" link and "Cancel" button should work correctly - Search for record - "Choose" link and "Cancel" button should word correctly - Serials -> Add subscription fields - Datatable, delete confirmation - Edit - Form validation (submit both authorised value and MARC field) - Serials -> Check expiration - Date picker in search form - Search - Renew button triggers popup - Serials -> Claims -> Search results - Date picker, datatable, form validation - Select all/none; Download claims Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 6ea21c395ae012792feb87c3f452f7cdf510c34f Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Nov 6 12:22:59 2017 -0300 Bug 19514: Add client-side check Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 48bf229cc804b0624555137687527e1e23fa22f8 Author: Alex Buckley <alexbuckley at catalyst.net.nz> Date: Sat Oct 21 00:54:23 2017 +0000 Bug 19514: Implement password restrictions into onboarding tool Test plan: 1. Drop and recreate your database 2. Restart memcached 3. Go through the web installer 4. In the onboarding tool create a patron with a password of only 2 characters in length 5. Notice the patron is successfully created and no warning message is displayed 6. Repeat step 1,2,3 and create a patron with a password of 3 characters none of which are a uppercase letter or number and notice the patron is successfully created and no warning message is displayed 7. Apply patch 8. Repeat steps 1,2,3 and create a patron with a password consisting of 2 characters, notice that after submitting the form the same form is loaded again and there is a warning message at the top of the page informing you the patron wasn't created 9. Repeat steps 1,2,3 and create a patron with a password consisting of 3 characters (all lower case) and submit the form, notice the same form is reloaded and a warning message at the top of the page informs you that the patron wasn't created because the password was weak 10. Repeat steps 1,2,3 and create a patron with a password consisting of 3 characters (one lower case letter, one upper case letter and one number) and submit the form and notice this time the next form in the onboarding is displayed with the message at the top of the screen informing you that the patron was successfully created Sponsored-By: Catalyst IT Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e224182cc3581fa61331f3b6742d9be0e6707cda Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Nov 29 15:24:40 2017 -0300 Bug 19560: Correctly escape branchcode in admin/branches.pl Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/InstallAuth.pm | 4 + Koha/DateUtils.pm | 20 + Koha/Object.pm | 21 + installer/onboarding.pl | 9 +- .../prog/en/includes/onboarding_messages.inc | 6 + .../prog/en/includes/reports-toolbar.inc | 10 - .../prog/en/includes/serials-toolbar.inc | 37 -- .../prog/en/modules/admin/authorised_values.tt | 70 ++- .../prog/en/modules/admin/branches.tt | 111 ++-- .../prog/en/modules/admin/itemtypes.tt | 58 ++- .../prog/en/modules/clubs/club-enrollments.tt | 35 +- .../prog/en/modules/clubs/clubs-add-modify.tt | 6 +- .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 121 ++--- .../prog/en/modules/onboarding/onboardingstep3.tt | 3 + .../prog/en/modules/reports/acquisitions_stats.tt | 72 +-- .../prog/en/modules/reports/bor_issues_top.tt | 79 ++- .../prog/en/modules/reports/borrowers_out.tt | 20 +- .../prog/en/modules/reports/borrowers_stats.tt | 8 +- .../prog/en/modules/reports/cash_register_stats.tt | 105 ++-- .../prog/en/modules/reports/cat_issues_top.tt | 77 +-- .../prog/en/modules/reports/catalogue_stats.tt | 78 +-- .../prog/en/modules/reports/dictionary.tt | 42 +- .../en/modules/reports/guided_reports_start.tt | 496 +++++++++--------- .../prog/en/modules/reports/issues_avg_stats.tt | 72 +-- .../prog/en/modules/reports/issues_stats.tt | 8 +- .../prog/en/modules/reports/itemslost.tt | 45 +- .../prog/en/modules/reports/itemtypes.tt | 30 +- .../prog/en/modules/reports/orders_by_budget.tt | 40 +- .../prog/en/modules/reports/reserves_stats.tt | 160 +++--- .../prog/en/modules/reports/serials_stats.tt | 32 +- .../prog/en/modules/reviews/reviewswaiting.tt | 6 + .../prog/en/modules/serials/acqui-search-result.tt | 38 +- .../prog/en/modules/serials/acqui-search.tt | 11 +- .../prog/en/modules/serials/add_fields.tt | 67 +-- .../prog/en/modules/serials/checkexpiration.tt | 36 +- .../prog/en/modules/serials/claims.tt | 242 ++++----- .../prog/en/modules/serials/result.tt | 37 +- .../en/modules/serials/routing-preview-slip.tt | 23 +- .../prog/en/modules/serials/routing-preview.tt | 32 +- .../prog/en/modules/serials/routing.tt | 65 +-- .../prog/en/modules/serials/serial-issues-full.tt | 97 ---- .../prog/en/modules/serials/serial-issues.tt | 122 ----- .../prog/en/modules/serials/serials-collection.tt | 133 +++-- .../prog/en/modules/serials/serials-home.tt | 14 +- .../prog/en/modules/serials/serials-search.tt | 81 +-- .../en/modules/serials/showpredictionpattern.tt | 22 +- .../prog/en/modules/serials/subscription-add.tt | 531 ++------------------ .../prog/en/modules/serials/subscription-detail.tt | 50 +- .../en/modules/serials/subscription-frequencies.tt | 141 +++--- .../en/modules/serials/subscription-history.tt | 8 +- .../modules/serials/subscription-numberpatterns.tt | 173 +++---- .../prog/en/modules/serials/subscription-renew.tt | 7 +- koha-tmpl/intranet-tmpl/prog/js/onboarding.js | 18 + koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js | 43 ++ .../intranet-tmpl/prog/js/showpredictionpattern.js | 16 + .../intranet-tmpl/prog/js/subscription-add.js | 499 ++++++++++++++++++ koha-tmpl/intranet-tmpl/prog/js/tools-menu.js | 2 + serials/serial-issues.pl | 108 ---- t/DateUtils.t | 12 +- t/db_dependent/Koha/Object.t | 26 +- t/db_dependent/api/v1/holds.t | 33 +- 61 files changed, 2261 insertions(+), 2307 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js create mode 100644 koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js create mode 100644 koha-tmpl/intranet-tmpl/prog/js/subscription-add.js delete mode 100755 serials/serial-issues.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 14 22:34:24 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Dec 2017 21:34:24 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.14-3-gf1a72bb Message-ID: <E1ePb96-0001VE-J3@git.koha-community.org> 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, 16.11.x has been updated via f1a72bba4c02a8add0cd8b1480d141c724014cff (commit) from 8155644625a70304de022a2867c5e0cc0ea99c80 (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 f1a72bba4c02a8add0cd8b1480d141c724014cff Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 12 10:28:40 2017 -0300 Bug 19655: Use ->build instead of build_object in 16.11.x The build_object method of TestBuilder has been added by bug 18182, which is not in 16.11.x Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Template/Plugin/To.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Dec 18 03:52:47 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 18 Dec 2017 02:52:47 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.14-4-gdcc91c8 Message-ID: <E1eQlXr-00059X-TL@git.koha-community.org> 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, 16.11.x has been updated via dcc91c883fd4af2c6ccfbea55de226435d9fc3f5 (commit) from f1a72bba4c02a8add0cd8b1480d141c724014cff (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 dcc91c883fd4af2c6ccfbea55de226435d9fc3f5 Author: Gwendal Joncour <gwendal.joncour at univ-rennes2.fr> Date: Wed Nov 8 12:21:58 2017 +0100 Bug 19593 Basketcount correction on Bookseller.pm To test: 1/ go to /cgi-bin/koha/acqui/booksellers.pl or /cgi-bin/koha/acqui/supplier.pl 2/ Note that it displays the delete vendor button instead of the receive shipments button 3/ Apply patch 4/ Reload the page and notice the button is fixed Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> ----------------------------------------------------------------------- Summary of changes: Koha/Acquisition/Bookseller.pm | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Dec 18 16:23:32 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 18 Dec 2017 15:23:32 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-149-g6325f9e Message-ID: <E1eQxGO-000094-0W@git.koha-community.org> 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 6325f9ed55705f6be55f6fef6d5c94be87b6e58a (commit) via 4a439d052872a7031c3301b149d1dcf42cb78a74 (commit) via 25e050e2ef084afb18d09d24ce68a086b4826923 (commit) via a8f4aacb1db5820b530b2b1dc4072df624f9f1f5 (commit) via dcc2c5e2d93945e35a7138a832f81bc8178c523d (commit) via d3cc2a1a9dbb63d080d121c7c2c6f882d03084e8 (commit) via 63cfdf700b3701fda882989add55bd4562e03e97 (commit) via 405b0f14a4a629e900df71d19bd4369f1ed94e3f (commit) via 54d13ca4afb169111cf6bb386f99eb005565b2ac (commit) via bdccbfcbab7df56d396e667ac6049499a62acf20 (commit) via 0c07f63e5faf475b937bca8673e691390de91cf4 (commit) via 6d6c628d85e845da796359de72ef9013ccbb2ebd (commit) from e66a78d1075ed5a1af995f79bd92b1ffc10036d7 (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 6325f9ed55705f6be55f6fef6d5c94be87b6e58a Author: Julian Maurice <julian.maurice at biblibre.com> Date: Fri Dec 15 10:08:11 2017 +0100 Bug 19444: (QA follow-up) Remove repeating condition Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 4a439d052872a7031c3301b149d1dcf42cb78a74 Author: Julian Maurice <julian.maurice at biblibre.com> Date: Fri Dec 15 09:46:54 2017 +0100 Bug 19444: (QA follow-up) Fix tests for UNIMARC Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 25e050e2ef084afb18d09d24ce68a086b4826923 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 5 10:23:09 2017 -0300 Bug 19444: Display error message for auto_account_expired Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a8f4aacb1db5820b530b2b1dc4072df624f9f1f5 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Oct 25 16:51:28 2017 -0300 Bug 19444: Do not auto renew if patron is expired and BlockExpiredPatronOpacActions is set If the patron's account has expired and BlockExpiredPatronOpacActions is set, we expect auto renewal to be rejected. Test plan: Use the automatic_renewals.pl cronjob script to auto renew a checkout Before this patch, if the patron's account has expired the auto renew was done. With this patch, it will only be auto renewed if BlockExpiredPatronOpacActions is not set. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit dcc2c5e2d93945e35a7138a832f81bc8178c523d Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Dec 13 15:46:10 2017 +0000 Bug 19805: Add DataTables to Koha to MARC mapping page This patch adds sorting and filtering to the Koha to MARC mapping table using DataTables. Also changed: Font awesome icons on "Add" and "Remove" buttons; Minor markup correction to breadcrumbs. To test, apply the patch and go to Administration -> Koha to MARC mapping. - Table should be sorted by default on Koha field. - Sorting and filtering should work correctly. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit d3cc2a1a9dbb63d080d121c7c2c6f882d03084e8 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Dec 12 14:38:01 2017 +0000 Bug 19654: Move tools templates JavaScript to the footer: Batch MARC tools This patch modifies the staff client patron lists templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. Revised: My original patch included changes to batchMod-edit.tt but didn't take into account the MARC plugins which are loaded in the item edit form. I have discarded those changes for now. Tools -> Batch record modification - Page highlighting in the sidebar - Patron autocomplete in the "Check out" tab - Submit records for deletion - Page highlighting in the sidebar - Checkbox selection links - Warning when no records selected - Patron autocomplete in the "Check out" tab Tools -> Batch item modification - Page highlighting in the sidebar - Patron autocomplete in the "Check out" tab Tools -> Batch item deletion - Page highlighting in the sidebar - Patron autocomplete in the "Check out" tab - Submit items for deletion - Patron autocomplete in the "Check out" tab - Checkbox selection links - Column-hiding checkboxes - Datatables Tools -> Batch record modification - Page highlighting in the sidebar - Patron autocomplete in the "Check out" tab - Submit records for modification - Page highlighting in the sidebar - Patron autocomplete in the "Check out" tab - Checkbox selection links - Datatables - MARC preview - Warning when no records selected - Progress bar after submitting items for modification Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 63cfdf700b3701fda882989add55bd4562e03e97 Author: Nick Clemens <nick at bywatersolutions.com> Date: Thu Dec 14 12:54:14 2017 +0000 Bug 19806: Add classes to itemnotes in issues table To test: 1 - Checkout an item with both public and non-public notes 2 - Note the notes display and both have circ-hlt class 3 - Apply patch 4 - Ensure display has not changed 5 - Note notes now have classes 'item-note-public' and 'item-note-nonpublic' 6 - Sign off Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 405b0f14a4a629e900df71d19bd4369f1ed94e3f Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Tue Oct 31 15:57:13 2017 +0100 Bug 19554: The inventory table should jump to detail instead of MARCdetail This patch just replaces the link to detail. Detail provides item information needed in case of inventory problems. Test plan: Go to Tools/Inventory. Create an inventory list without barcode file. Check if the link goes to detail now. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Mark Tompsett <mtompset at hotmail.com> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 54d13ca4afb169111cf6bb386f99eb005565b2ac Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 6 13:03:15 2017 -0300 Bug 19759: Make TestBuilder generates only 2 decimals for float For instance items.replacementprice is decimal(8,2) but more than 2 decimals are generated. It leads to issues when we compare expected objects: # got: '135623.866142537' # expected: '135623.87' Test plan: prove t/db_dependent/TestBuilder.t must return green Signed-off-by: Dominic Pichette <dominic at inlibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Somehow I have the feeling that we should allow more decimals sometimes and perhaps have a number of decimals parameter or so. Think of fields like currency or discount. But the current issues justify this change. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit bdccbfcbab7df56d396e667ac6049499a62acf20 Author: Josef Moravec <josef.moravec at gmail.com> Date: Sun Dec 17 07:24:53 2017 +0000 Bug 19706: (QA follow-up) Hide the collection code selector if no value is defined (for consistency) Test plan: 0) Go to item search 1) Do have some authorized values in CCODE category -> selector of collection is visible 2) Don't have any authorized value in CCODE category -> selector of collection is not visible Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 0c07f63e5faf475b937bca8673e691390de91cf4 Author: Nick Clemens <nick at bywatersolutions.com> Date: Tue Dec 12 11:15:34 2017 +0000 Bug 19706: Fix bad json formed when there are no CCODE values To test: 1 - Delete all ccode values in your system 2 - Load the item search page 3 - View the console and note a js error 4 - Try to perform an item search to screen 5 - Internal server error ("unsupported format 'html'" in logs) 6 - Apply patch 7 - Reload page 8 - Note js error is gone 9 - Perform search to screen, success! To test there is no regression: 1 - Have some values in CCODE authorised values 2 - Ensure collection drop down on item search displays correctly 3 - Ensure item search returns results ot screen with no js errors Signed-off-by Owen Leonard <oleonard at myacpl.org> Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 6d6c628d85e845da796359de72ef9013ccbb2ebd Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 18 12:12:09 2017 -0300 Bug 18330: (follow-up) Do not return undef explicitely This patch fixes a perl critic issue, hopefully it will not break something else. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 5 + Koha/Object.pm | 2 +- .../intranet-tmpl/prog/en/includes/strings.inc | 1 + .../prog/en/modules/admin/koha2marclinks.tt | 19 +- .../prog/en/modules/catalogue/itemsearch.tt | 10 +- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 ++ .../prog/en/modules/tools/batchMod-del.tt | 217 ++++++++++---------- .../prog/en/modules/tools/batchMod.tt | 30 +-- .../prog/en/modules/tools/batch_delete_records.tt | 157 +++++++------- .../en/modules/tools/batch_record_modification.tt | 149 +++++++------- .../prog/en/modules/tools/inventory.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 11 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 + misc/cronjobs/automatic_renewals.pl | 1 + t/db_dependent/Circulation.t | 153 +++++++++----- t/db_dependent/TestBuilder.t | 5 +- t/lib/TestBuilder.pm | 2 +- 17 files changed, 452 insertions(+), 327 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Dec 18 18:55:39 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 18 Dec 2017 17:55:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-150-g130ace3 Message-ID: <E1eQzdb-0004us-9n@git.koha-community.org> 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 130ace389919ee986f2cdcb82ebb9791bb914980 (commit) from 6325f9ed55705f6be55f6fef6d5c94be87b6e58a (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 130ace389919ee986f2cdcb82ebb9791bb914980 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 18 14:47:37 2017 -0300 Bug 19759: Fix failing test in Chargelostitem.t t/db_dependent/Circulation/Chargelostitem.t .. 1/6 # Failed test 'The accountline amount should be precessfee value ' # at t/db_dependent/Circulation/Chargelostitem.t line 71. # got: '4.5968041848873e+20' # expected: '459680418488730451968.00' Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation/Chargelostitem.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Dec 19 15:22:49 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Dec 2017 14:22:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-152-geddc1ac Message-ID: <E1eRInB-0001JR-IC@git.koha-community.org> 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 eddc1acd709b13e5804e51cafd487ce506fabadf (commit) via e243c36db651c790190ee8c95e2d8fe1ee34cac1 (commit) from 130ace389919ee986f2cdcb82ebb9791bb914980 (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 eddc1acd709b13e5804e51cafd487ce506fabadf Author: Jessica Freeman <jessicafreeman at catalyst.net.nz> Date: Mon Dec 18 22:40:08 2017 +0000 Bug 19714: Removing 2 occurrences of memberofinstitution To Test: 1/grep for memberofinstitution 2/Notice it occurs in C4/UsageStats.pm and t/db_dependent/UsageStats.t 3/grep again, notice they have been removed Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e243c36db651c790190ee8c95e2d8fe1ee34cac1 Author: Chris Weeks <chrisweeks at catalyst.net.nz> Date: Mon Dec 18 22:10:05 2017 +0000 Bug 19510: Add description for edi_manage in acquistion permissions Test Plan: 1/ Login 2/ Select patrons 3/ Search for a patron by name or card number that exists in the system 4/ Click More -> Set permissions 5/ Expand 'acquistions' and notice that 'edi_manage' has no description 6/ Apply patch 7/ Refresh the permissions page or repeat steps 2 to 5. 8/ Notice that 'edi_manage' now has a description of 'Manage EDIFACT transmissions' Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/UsageStats.pm | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 1 + t/db_dependent/UsageStats.t | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Dec 19 15:38:33 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Dec 2017 14:38:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-154-ga7456c3 Message-ID: <E1eRJ2P-0001j5-5Q@git.koha-community.org> 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 a7456c32a755b5c775dbe17084736b91317e63ee (commit) via b0303f8730609d4b1393d6f4f500b2df244599c0 (commit) from eddc1acd709b13e5804e51cafd487ce506fabadf (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 a7456c32a755b5c775dbe17084736b91317e63ee Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 19 11:30:06 2017 -0300 Bug 7143: Update about page for new dev - Jessica Freeman Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit b0303f8730609d4b1393d6f4f500b2df244599c0 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 19 11:27:41 2017 -0300 Bug 7143: Update about page for new dev - Chris Weeks Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 ++ 2 files changed, 4 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Dec 19 22:49:02 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Dec 2017 21:49:02 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.14-5-g1755613 Message-ID: <E1eRPl0-0006b0-3D@git.koha-community.org> 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, 16.11.x has been updated via 1755613eeaceba699fb2e793796b2b35c9153e72 (commit) from dcc91c883fd4af2c6ccfbea55de226435d9fc3f5 (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 1755613eeaceba699fb2e793796b2b35c9153e72 Author: Chris Cormack <chrisc at catalyst.net.nz> Date: Wed Dec 20 10:40:39 2017 +1300 Bug 19593: follow up to fix tests ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Bookseller.t | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Dec 20 09:20:10 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Dec 2017 08:20:10 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.06-9-g6423550 Message-ID: <E1eRZbm-00044z-0U@git.koha-community.org> 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 642355033e38bfb60144c4384f08e7a4b01b3e23 (commit) via aa3d1a469d4af69bdd5676cfc963905572574ae6 (commit) via 6187322aa265345199b086b62401c9d1ea7c3f6b (commit) via db0e8e6e8f38189ba29465dc20f4a0514d082c14 (commit) via aca184c05391d3502d8b898a022a84e295f8956d (commit) from 24a6ef2ba16f18923a5fd9d9439cfe7c84d9ca20 (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 642355033e38bfb60144c4384f08e7a4b01b3e23 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Wed Jun 21 13:05:40 2017 +0200 Bug 18833: Plugin unimarc_field_210c pagination error In plugin unimarc_field_210c, the editors search results have pagination. First page works but not other pages. The main problem whas mainly because $startfrom var was missused. It is defined in C4::Output::pagination_bar as page number. This patch corrects by using a $offset var. Also removes dead code, obsoleted by using C4::Output::pagination_bar. Also changes hardcoded results per page from 19 to 20. Test plan : - Use UNIMARC catalogue - Define in framework value builder unimarc_field_210c on 210$c - Create autority type EDITORS with heading 200$b - Create 22 authorities of that type - Index those new authorities - Create a new biblio record - Click on 210$c plugin - Click on "Search" - You see 20 results - Click on page 2 => Without patch you get empty table => With patch you get 2 results - Check that you see "Results 21 to 22 of 22" - Delete 2 autorities and retest Works as intended. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 455d94eec9c41f7bad718ac62c2367bea6202452) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit aa3d1a469d4af69bdd5676cfc963905572574ae6 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Thu Nov 16 15:22:48 2017 +0100 Bug 19640: fix OPAC IdRef webservice display The OPAC webservice IdRef display was broken. The call returns results but citations where empty. Maybe the webservice has changed. This patch corrects the fetch of datas in result. Also fixes a small HTML missing tag tr. Also adds a comment with link to official doc : http://documentation.abes.fr/aideidrefdeveloppeur/index.html#MicroWebBiblio Test plan : 1) Enable system preference IdRef 2) Choose an existing PPN like 032581270 3) Look result on : https://www.idref.fr/services/biblio/032581270.json 4) Call in OPAC website : /cgi-bin/koha/opac-idref.pl?unimarc3=032581270 5) Without patch you see only one role containing empty rows 6) With patch you see all roles with correct rows Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: removed unused @unimarc3 (not to be confused with $unimarc3). Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 803c70cef8e88dae25394ca7d2fc645f1b514ad8) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 6187322aa265345199b086b62401c9d1ea7c3f6b Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Fri Nov 24 09:27:14 2017 +0100 Bug 19646: (QA follow-up) Fix tab character Resolve qa tools warning: FAIL koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt FAIL forbidden patterns forbidden pattern: tab char (line 172) Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 58b6f1cd9e466c375526b01b801bb5de61e37706) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit db0e8e6e8f38189ba29465dc20f4a0514d082c14 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Fri Nov 17 13:38:06 2017 +0100 Bug 19646: fix value_builder marc21_linking_section template When using marc21_linking_section cataloging plugin, you get the error : Template process failed: undef error - The method selected is not covered by tests! at /home/koha/src/C4/Templates.pm line 122. It commes from [% IF ( itypeloo.selected ) %], selected is not defined in itypeloo. This patch removes this condition because all item types are fetched from database, there is not one selected. It sets "All item types" as selected. Also correctes two errors in HTML : ending form and div, "<a_class=" instead of "<a class=" Test plan : 1) Use a MARC21 database 2) Define marc21_linking_section cataloging plugin in framework, on 773$t for example 3) Create a new biblio record 4) Click on icon in 773$t 5) Check plugin works fine Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 5a852cadaf9fddc38618e22d4fad1e1b7a3f9120) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit aca184c05391d3502d8b898a022a84e295f8956d Author: David Bourgault <david.bourgault at inlibro.com> Date: Wed Nov 22 14:35:27 2017 -0500 Bug 19683: Fix authority types in tools/export template Fixes the bug by correcting the variable names in the template. To test: 1) Tools > Export > Export authority records 2) Authority Types dropdown is not empty Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: Changing the export script and unblessing is not needed. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 47f65da22e63a35fdecf6857016983869d6855cb) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> ----------------------------------------------------------------------- Summary of changes: cataloguing/value_builder/unimarc_field_210c.pl | 52 ++++---------------- .../value_builder/marc21_linking_section.tt | 15 +++--- .../intranet-tmpl/prog/en/modules/tools/export.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-idref.tt | 8 +-- opac/opac-idref.pl | 43 +++++++--------- 5 files changed, 38 insertions(+), 82 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Dec 20 09:42:16 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Dec 2017 08:42:16 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.06-12-g3789dd1 Message-ID: <E1eRZxA-0004xT-AQ@git.koha-community.org> 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 3789dd122c57d660cdac39e14ab774eb7fd2a444 (commit) via 6c2b701b7b856a2db91ad07d6fe845598eeb1e98 (commit) via 0b8790dc91e04fc5933babaec91789fe37499d60 (commit) from 642355033e38bfb60144c4384f08e7a4b01b3e23 (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 3789dd122c57d660cdac39e14ab774eb7fd2a444 Author: David Bourgault <david.bourgault at inlibro.com> Date: Wed Nov 22 13:58:21 2017 -0500 Bug 19681: Correct result count formatting This simply passes the missing information to the template. Test plan: 0) Apply patch 1) Go to Tools > Label creator > New > Label batch 2) Press 'Add items' 3) Do a search that will return few items 4) The result count will read "Results 1 through X of X" Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit ef8c92ce21e1ea983da3445045236939b1de90fe) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 6c2b701b7b856a2db91ad07d6fe845598eeb1e98 Author: Simon Pouchol <simon.pouchol at biblibre.com> Date: Fri Nov 24 16:53:49 2017 +0100 Bug 19692: fix unclosed div in opac-shelves.tt Test plan: 1. set syspref OpacKohaUrl to "Show" 2. Log into the OPAC 3. /cgi-bin/koha/opac-shelves.pl 4. Notice that "Powered by Koha" is not in the footer in this page. When on the other tabs it's in the footer (out of .main) 5. Apply this patch 6. Notice that "Powered by Koha" now in the footer in the "your lists" page Signed-off-by: Dominic Pichette <dominic at inlibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 30f2b40f3c408a1f81eae57c5012e6283eccb3d0) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 0b8790dc91e04fc5933babaec91789fe37499d60 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Thu Oct 26 07:35:53 2017 -0400 Bug 19533: Hold pulldown for itemtype is empty if hold placement needs override Test Plan: 1) Enable AllowHoldPolicyOverride 2) Enable AllowHoldItemTypeSelection 3) Create a situation where adding a hold for a patron would trigger a tooManyReserves warning. 4) Note the itemtype pulldown is empty 5) Apply this patch 6) Reload the page 7) Itemtype pulldown should have values Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit e2d05f3fdfde20977ca5525510e8f4c0daa964f1) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- labels/label-item-search.pl | 2 ++ reserve/request.pl | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Dec 20 12:38:24 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Dec 2017 11:38:24 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.00-41-g689db31 Message-ID: <E1eRchc-000135-5E@git.koha-community.org> 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 689db3115c42dad8d02aaf27f80814564e1de826 (commit) via 313803ac03358c7c4b049561f55b911843058b83 (commit) via 7a49adacf9c77fd3de6d60f0d76da99dc338223c (commit) via bb91d7b848696608e5093983c77bfa9e6bf4f03a (commit) via 9418010d63d04090fc1e317096e16e264eb593c6 (commit) via 3b2669c90d4bdaa9f98eb442ec5e78eb08bd9957 (commit) via 6dca540053020860f62d86a9e02d2ad0d45af0df (commit) from dc06795ff74f7cb5e9fd9b992b72b7487b2ce7de (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 689db3115c42dad8d02aaf27f80814564e1de826 Author: Nick Clemens <nick at bywatersolutions.com> Date: Wed Dec 20 11:30:14 2017 +0000 Update version after bug 19724 Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 313803ac03358c7c4b049561f55b911843058b83 Author: Claire Gravely <claire.gravely at bsz-bw.de> Date: Thu Dec 7 07:35:37 2017 +0000 Bug 19769: 'Pickup library is different' message does not display library branch name when placing hold When placing a hold for a patron whose pickup library and home library are different, the message displayed only shows the branch code and not the branch name. This patch displays the branch name as well as the branch code. To test: 1. Search for an item 2. Click 'place hold' 3. Enter patron name/card number for a patron whose home library is different to the item's 4. Note the message displayed only shows the branch code but not the name 5. Apply Patch 6. Repeat 1-3 7. Message should now also display the branch name https://bugs.koha-community.org/show_bug.cgi?id=19769 Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 7a49adacf9c77fd3de6d60f0d76da99dc338223c Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 4 16:07:52 2017 -0300 Bug 19746: Remove debug statements in returns.pl From bug commit bb6277ffcc593685554112d770ac273c9efeda33 Bug 14464: Add ability to cancel waiting holds from checkin screen +use Carp 'verbose'; +$SIG{ __DIE__ } = sub { Carp::confess( @_ ) }; See also http://lists.koha-community.org/pipermail/koha-devel/2017-November/044168.html Test plan: Read the changes and make sure they make sense Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit bb91d7b848696608e5093983c77bfa9e6bf4f03a Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Oct 26 15:41:47 2017 -0300 Bug 3841: Add the ACQ framework for new installations This patch adds the acquisition frameworks (frameworkcode=ACQ) for new installations. It copies the 952 (MARC21) or 995 (UNIMARC) fields from the default framework (frameworkcode='') Test plan: Create a new installation and make sure the ACQ framework exists. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 9418010d63d04090fc1e317096e16e264eb593c6 Author: Nick Clemens <nick at bywatersolutions.com> Date: Fri Nov 17 12:13:55 2017 +0000 Bug 19563: (follow-up) Restore checking sort variable This code seems a bit odd, $self->sort_fields()->{$name} is checking if there is any mapping in ES for a field, so if one marc field in an index is marked as sortable this will exists. We need to check the individual marc field to see if it should be added to the sort index here. If you apply the first patch, reindex, and view a record in es: curl -XGET 'localhost:9200/koha_kohadev_biblios/data/19/?pretty' | grep -A 10 author__sort You will see that 245$c is included in the record without that additional check Apply this, reindex again, and that field should not be included Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 3b2669c90d4bdaa9f98eb442ec5e78eb08bd9957 Author: Nick Clemens <nick at bywatersolutions.com> Date: Fri Nov 17 12:12:32 2017 +0000 Bug 19563: Unit tests To test: 1 - Apply first patch and this patch 2 - prove -v t/db_dependent/Koha_Elasticsearch.t 3 - New tests will fail 4 - Apply followup patch 5 - Tests shuld pass Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> commit 6dca540053020860f62d86a9e02d2ad0d45af0df Author: David Gustafsson <david.gustafsson at ub.gu.se> Date: Thu Nov 2 13:44:13 2017 +0100 Bug 19563: Generation of sort_fields uses incorrect condition Fix incorrect condition for if clause for generating <field>__sort mappings for Elasticsearch. Also remove redundant check for same condition when generating fixer rules. Test plan: 1. Inspect current mappings for example by viewing: http://<elasticsearch_host>:9200/koha_<koha_instance_name>_biblios/_mapping. 2. If using the default configuraion only "author" has a sort field (author__sort). 4. Appy patch. 5. Reindex using rebuild_elastic_search.pl. 6. All fields except those with sort sort set to "0" should now have sort fields, which in the default configuration is all but "author". Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/SearchEngine/Elasticsearch.pm | 12 ++++-------- circ/returns.pl | 3 --- .../marc21/optional/marc21_simple_bib_frameworks.sql | 8 ++++++++ .../marc21/mandatory/marc21_framework_DEFAULT.sql | 8 ++++++++ .../marc21/optional/marc21_simple_bib_frameworks.sql | 8 ++++++++ .../marc21/Optionnel/marc21_simple_bib_frameworks.sql | 6 ++++++ .../unimarc_complet/Obligatoire/framework_DEFAULT.sql | 8 ++++++++ .../Obligatoire/framework_DEFAULT.sql | 8 ++++++++ .../marc21/optional/marc21_simple_bib_frameworks.sql | 8 ++++++++ .../marc21/optional/marc21_simple_bib_frameworks.sql | 6 ++++++ .../unimarc_bibliographic_DEFAULT_general.sql | 8 ++++++++ .../marc21_bibliographic_DEFAULT_general.sql | 8 ++++++++ .../unimarc_bibliographic_DEFAULT_general.sql | 8 ++++++++ .../intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- t/db_dependent/Koha_Elasticsearch.t | 17 ++++++++++++++--- 16 files changed, 104 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Dec 20 13:44:46 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Dec 2017 12:44:46 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.06-19-gad91d8f Message-ID: <E1eRdjq-0003jf-F5@git.koha-community.org> 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 ad91d8f732dd2d92a9d0b2bcbf4050ea5d9574b5 (commit) via de025f76271460864b757c7976a15cde704bf673 (commit) via 6f443b31fac8e9518ea81210281a796bc5cbbaf5 (commit) via ba1af627c73b4d17ceaf397f0c52477faf12b98f (commit) via 6279d087a5095766e7961f35d773b4d155e30d93 (commit) via e3f20fa795c68b3ef235a52b86ca7dca59e8ab14 (commit) via 6f88fba191588c16194fe79a7acfc1b84c9af119 (commit) from 3789dd122c57d660cdac39e14ab774eb7fd2a444 (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 ad91d8f732dd2d92a9d0b2bcbf4050ea5d9574b5 Author: Fridolin Somers <fridolin.somers at biblibre.com> Date: Wed Dec 20 12:25:32 2017 +0100 Bug 19724: DBRev 17.05.06.001 commit de025f76271460864b757c7976a15cde704bf673 Author: Nick Clemens <nick at bywatersolutions.com> Date: Thu Dec 14 12:01:38 2017 +0000 Bug 19724: Add timestamp to biblio_metadata and deletedbiblio_metadata Since bug 17196, biblioitems.timestamp is not always updated after a change in the MARC record. We need to know the last modification time of the MARC record for some features (like OAI-PMH parameters 'from' and 'until' for instance) This patch only adds the missing column in biblio_metadata and deletedbiblio_metadata Test plan: 1. Run updatedatabase.pl 2. Verify that both tables have the new column, its value should be the greatest timestamp value from the corresponding biblio and biblioitems table entries You can verify with the following SQL query: SELECT b.biblionumber, b.timestamp as biblio_ts, bi.timestamp as biblioitems_ts, m.timestamp as biblio_metadata_ts FROM biblio_metadata m LEFT JOIN biblioitems bi ON (bi.biblionumber = m.biblionumber) LEFT JOIN biblio b ON (b.biblionumber = m.biblionumber); Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druat <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 4db611b5dc83e2d865aaba4afe04cd5aaa89904e) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 6f443b31fac8e9518ea81210281a796bc5cbbaf5 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 4 15:39:48 2017 -0300 Bug 19638: Remove false positive obsolete reports (auth_header.marcxml) Bug 17898 tries to help users identify reports affected by the move of marcxml to the biblio_metadata table, however, the auth_header table still uses the column name 'marcxml' and so reports as needing updated though it doesn't. C4::Reports::Guided::convert_sql only converts if the sql query contain biblioitems and marcxml. We should use the same regexp in the controler script. Test plan: Use a sql report that use auth_header.marcxml (see https://wiki.koha-community.org/wiki/SQL_Reports_Library) After the this the report should not be longer marked as obsolete on the report list view Replicated bug with the following SQL: select marcxml from auth_header; Patch applied correctly and functioned as expected. Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit fff0065785b0cd7e664eac3285a5f051cb94871a) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit ba1af627c73b4d17ceaf397f0c52477faf12b98f Author: Mark Tompsett <mtompset at hotmail.com> Date: Mon Oct 23 14:00:53 2017 +0000 Bug 10222: Correct and expand to other languages This added column names, and reformated to be a bit more readable. This also adds this change to de-DE, es-ES, fr-CA, and nb-NO. While there was printer_profiles for it-IT, the Italian file seems to not use the same numbers, and does not visibly look like it needs these changes. Signed-off-by: Mark Tompsett <mtompset at hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit fdde85a52164168d998d995ce41b4421b4a3ffbb) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 6279d087a5095766e7961f35d773b4d155e30d93 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Thu Apr 16 12:07:29 2015 -0400 Bug 10222: Error when saving Demco label templates This patch fixes a bug whereby if you open either of the Demco label templates (loaded by the sample data) and click "save" without making any changes you will get an error: Can't bless non-reference value at C4/Creators/Profile.pm line 92. It also fixes another minor bug in the creator sample data. To test: 1. Install all sample data in a clean database. 2. In the label tool, edit either of the Demco label templates. 3. Save the template and observe the error mentioned above. 4. Drop and recreate the database. 5. Apply the patch. 6. Repeate steps 1-3 and note the successful save. Signed-off-by: Mark Tompsett <mtompset at hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit d3eef921f501634d3656b9d08abafa55b3ed6c07) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit e3f20fa795c68b3ef235a52b86ca7dca59e8ab14 Author: Nick Clemens <nick at bywatersolutions.com> Date: Fri Jul 28 11:58:46 2017 +0000 Bug 18990: Overdue Notices are not sending through SMS correctly Bug 18478 fixed sms via email problems under the assumption that to_address was either smsalertnumber or blank. It seems overdues set the to_address to email. This patch changes the code to enforce that an sms sent with emial driver will use the smsalertnumebr and provider defined for the borrower, regardless of what is set in the queue To test: 1 - Define a messaging prefs for a patron to recieve hold notices via SMS 2 - Ensure you have defined an SMS message for an overdue letter 3 - Set an SMS alert number for patron 4 - Set the SMS::Send driver to 'Email' 5 - Checkout an item as overdue to trigger notice above 6 - Run overdue_notices.pl 6 - Check the db and note the address is email 7 - run process_message_queue.pl 8 - Check db - address is email followed by service provider 9 - Apply patch 10 - repeat 11 - Message to_address should be populated with smsalertnumber Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit a7aab6d30b0a14c58bc0ab355ff284bd60750103) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 6f88fba191588c16194fe79a7acfc1b84c9af119 Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Nov 16 19:19:33 2017 +0000 Bug 19643: Pagination buttons on staged marc management are stacking instead of inline This patch modifies the template for staged MARC import management to correct a problem with the style of pagination links. To test you must have more than 25 staged imports. Go to Tools -> Staged MARC management. The pagination links, both at the top and the bottom, should look correct (use multi-page SQL report results for reference). Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit e0c3780634ef35ad937f69721aaeafa7bf9a4fee) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 4 ++-- Koha.pm | 2 +- .../mysql/de-DE/optional/sample_creator_data.sql | 7 ++++++- .../data/mysql/en/optional/sample_creator_data.sql | 7 ++++++- .../mysql/es-ES/optional/sample_creator_data.sql | 7 ++++++- .../mysql/fr-CA/facultatif/sample_creator_data.sql | 10 +++++---- installer/data/mysql/kohastructure.sql | 8 +++++-- .../nb-NO/2-Valgfritt/sample_creator_data.sql | 7 ++++++- installer/data/mysql/updatedatabase.pl | 22 ++++++++++++++++++++ .../prog/en/modules/tools/manage-marc-import.tt | 6 ++---- reports/guided_reports.pl | 2 +- t/db_dependent/Letters.t | 13 ++++++++++-- 12 files changed, 75 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Dec 20 14:06:03 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Dec 2017 13:06:03 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.00-50-g03864fe Message-ID: <E1eRe4R-0004KN-F8@git.koha-community.org> 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 03864feb387ebc75b23ec0d15472e8435b4277f3 (commit) via 0c63bb781ddaa074ea371304221e8041c5570be1 (commit) via 99dd6efa9fb2b5cf24929cb1f8019ad334d7dc83 (commit) via 13c02b84e6df4d180865d4f80bee271fdd2cd858 (commit) via b86dc070331d296f76063d9c2586a437026483fa (commit) via a4080abee1e1666431c14d754ad7c0a4d188c569 (commit) via 050bb6c0bd17038cea64f66480dc8f058307d752 (commit) via 020c3c444d3e5c3d1eb6ee071ebfa27b01b7f983 (commit) via c0096ccbbb1a9193939d143e31d050080b5b949f (commit) from 689db3115c42dad8d02aaf27f80814564e1de826 (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 03864feb387ebc75b23ec0d15472e8435b4277f3 Author: Nick Clemens <nick at bywatersolutions.com> Date: Thu Dec 14 12:54:14 2017 +0000 Bug 19806: Add classes to itemnotes in issues table To test: 1 - Checkout an item with both public and non-public notes 2 - Note the notes display and both have circ-hlt class 3 - Apply patch 4 - Ensure display has not changed 5 - Note notes now have classes 'item-note-public' and 'item-note-nonpublic' 6 - Sign off Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 0c63bb781ddaa074ea371304221e8041c5570be1 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 18 14:47:37 2017 -0300 Bug 19759: Fix failing test in Chargelostitem.t t/db_dependent/Circulation/Chargelostitem.t .. 1/6 # Failed test 'The accountline amount should be precessfee value ' # at t/db_dependent/Circulation/Chargelostitem.t line 71. # got: '4.5968041848873e+20' # expected: '459680418488730451968.00' Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 99dd6efa9fb2b5cf24929cb1f8019ad334d7dc83 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 6 13:03:15 2017 -0300 Bug 19759: Make TestBuilder generates only 2 decimals for float For instance items.replacementprice is decimal(8,2) but more than 2 decimals are generated. It leads to issues when we compare expected objects: # got: '135623.866142537' # expected: '135623.87' Test plan: prove t/db_dependent/TestBuilder.t must return green Signed-off-by: Dominic Pichette <dominic at inlibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Somehow I have the feeling that we should allow more decimals sometimes and perhaps have a number of decimals parameter or so. Think of fields like currency or discount. But the current issues justify this change. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 13c02b84e6df4d180865d4f80bee271fdd2cd858 Author: Josef Moravec <josef.moravec at gmail.com> Date: Sun Dec 17 07:24:53 2017 +0000 Bug 19706: (QA follow-up) Hide the collection code selector if no value is defined (for consistency) Test plan: 0) Go to item search 1) Do have some authorized values in CCODE category -> selector of collection is visible 2) Don't have any authorized value in CCODE category -> selector of collection is not visible Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit b86dc070331d296f76063d9c2586a437026483fa Author: Nick Clemens <nick at bywatersolutions.com> Date: Tue Dec 12 11:15:34 2017 +0000 Bug 19706: Fix bad json formed when there are no CCODE values To test: 1 - Delete all ccode values in your system 2 - Load the item search page 3 - View the console and note a js error 4 - Try to perform an item search to screen 5 - Internal server error ("unsupported format 'html'" in logs) 6 - Apply patch 7 - Reload page 8 - Note js error is gone 9 - Perform search to screen, success! To test there is no regression: 1 - Have some values in CCODE authorised values 2 - Ensure collection drop down on item search displays correctly 3 - Ensure item search returns results ot screen with no js errors Signed-off-by Owen Leonard <oleonard at myacpl.org> Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a4080abee1e1666431c14d754ad7c0a4d188c569 Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Dec 11 16:47:00 2017 +0000 Bug 19767: Remove unused serial-issues.pl script This patch removes three unused files: serials/serial-issues.pl ...and its associated templates: koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tt koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tt To test, apply the patch and search the Koha codebase for references to any of those files. None should exist. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 050bb6c0bd17038cea64f66480dc8f058307d752 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Nov 29 15:24:40 2017 -0300 Bug 19560: Correctly escape branchcode in admin/branches.pl Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 020c3c444d3e5c3d1eb6ee071ebfa27b01b7f983 Author: Julian Maurice <julian.maurice at biblibre.com> Date: Fri Dec 8 15:31:49 2017 +0100 Bug 17182: (QA follow-up) Fix call to GetMarcBiblio Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c0096ccbbb1a9193939d143e31d050080b5b949f Author: Nick Clemens <nick at bywatersolutions.com> Date: Wed Jul 19 14:10:05 2017 +0000 Bug 17182: Allow Keyword to MARC mapping for acquisitions searches This patchset adds the 'subtitle' field to the results display on acquistions search for adding an order form an existing item. Any field mapped to 'subtitle' in 'Keyword to MARC mapping' will be fetched and displayed in the results To test: 1 - Perform an acquisitions search for existing record 2 - Note record subtitles are not displayed 3 - Map 245$b and 245$n to 'subtitle' in 'Keyword to MARC mapping' 4 - Note they are still not displayed ion acq results 5 - Apply patch 6 - subtitle fields should now display Sponsored by: Round Rock Public Library <https://www.roundrocktexas.gov/departments/library/> Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: acqui/neworderbiblio.pl | 1 + .../prog/en/modules/acqui/neworderbiblio.tt | 1 + .../prog/en/modules/admin/branches.tt | 24 ++-- .../prog/en/modules/catalogue/itemsearch.tt | 10 +- .../prog/en/modules/serials/serial-issues-full.tt | 97 ---------------- .../prog/en/modules/serials/serial-issues.tt | 122 -------------------- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 4 +- serials/serial-issues.pl | 108 ----------------- t/db_dependent/Circulation/Chargelostitem.t | 2 +- t/db_dependent/TestBuilder.t | 5 +- t/lib/TestBuilder.pm | 2 +- 11 files changed, 32 insertions(+), 344 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tt delete mode 100755 serials/serial-issues.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Dec 20 17:50:12 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Dec 2017 16:50:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-162-g0b5d644 Message-ID: <E1eRhZM-00035W-GB@git.koha-community.org> 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 0b5d6441aa8b62efdac2bb1ba09a13cdae088a8b (commit) via 0928edc4ef5ad4774dbd8f0fa34bc444ae84ba85 (commit) via fcb8b106fa67194e7ea16260dc4049026e06c6ae (commit) via 572b615b9a4035d16111ea2bea22c6add0d08b4c (commit) via ae572dcb24b3a1dd50a26b9daf6ffb51b80524a1 (commit) via 75e6c204a4b04c95bb73d1d6c5307fe6d71a4148 (commit) via f6574fa7dcc9555e214908e2dba43eae1a112083 (commit) via dccb3a3414cb284f914d0fbeff7871a809379685 (commit) from a7456c32a755b5c775dbe17084736b91317e63ee (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 0b5d6441aa8b62efdac2bb1ba09a13cdae088a8b Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 21 13:31:49 2017 +0000 Bug 19664: Reports sidebar menu should match list of reports on reports home page This patch makes the reports sidebar menu a little more consistent with the reports home page menu by adding missing links to reports. To test, observer the reports sidebar menu before and after the patch and confirm that missing reports are linked in the update. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 0928edc4ef5ad4774dbd8f0fa34bc444ae84ba85 Author: Owen Leonard <oleonard at myacpl.org> Date: Mon Nov 20 17:27:57 2017 +0000 Bug 19658: Style fix for staff client lists page Patch applies with no issues and works as described. Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au> Edit: Rebased. Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit fcb8b106fa67194e7ea16260dc4049026e06c6ae Author: Isabel Grubi <isabel.grubi at gmail.com> Date: Mon Dec 18 22:04:26 2017 +0000 Bug 18313: Remove delicious link on social networks To test: 1/ enable social networkds systems preference 2/ look at any record on the OPAC, notice it has a link to delicious 3/ apply patch 4/ refersh page on OPAC, noitce delicious link has gone Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 572b615b9a4035d16111ea2bea22c6add0d08b4c Author: Bonnie Crawford <bonniecrawford at catalyst.net.nz> Date: Mon Dec 18 22:40:12 2017 +0000 Bug 18819: "UNIMARC is used in Europe" text changed to "UNIMARC is used in a few European countries" To test 1/ run installer and notice the inaccurate text "UNIMARC is used in Europe" 2/ run the patch attached 3/ run the installer and notice that the updated text "UNIMARC is used in a few European countries"is now present Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit ae572dcb24b3a1dd50a26b9daf6ffb51b80524a1 Author: Sherryn Mak <sherryn at catalyst.net.nz> Date: Mon Dec 18 21:29:55 2017 +0000 Bug 13676: Fixing the OpacSuppression description To Test 1/ Search for OpacSuppression system preference 2/ Notice that it says "Items marked as suppressed from OPAC search results 3/ Noticre also that addresses is spelt wrong 4/ Apply patch 5/ Refresh the page, notice addresses is fixed and items has become biblios Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 75e6c204a4b04c95bb73d1d6c5307fe6d71a4148 Author: Priya Patel <priya.patel at catalyst.net.nz> Date: Mon Dec 18 22:32:30 2017 +0000 Bug 19713: Remove 2 occurences of OpacShowLibrariesPullDownMobile To test: 1/ Grep to find OpacShowLibrariesPullDownMobile 2/ Notice it is in t/db_dependent/UsageStats.t and C4/UsageStats.pm 3/ Apply patch 4/ Grep to check OpacShowLibrariesPullDownMobile was removed from 2 files Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit f6574fa7dcc9555e214908e2dba43eae1a112083 Author: Lari Taskula <lari.taskula at jns.fi> Date: Thu Nov 16 14:24:52 2017 +0200 Bug 19636: Hold priority changes incorrectly via dropdown select This patch sorts holds in UI after priority is changed via "Priority" dropdown. It fixes confusion where the form is posted and each row is individually processed one by one - and due to conflict in priority value, the latter row always gets the chosen value instead of what the user actually might have wanted to change. To reproduce: 1. Place 3 holds on a record 2. See existing holds (cgi-bin/koha/reserve/request.pl?biblionumber=XXX) 3. By using the dropdown menu under "Priority" column, change the first hold's priority to last (3). Do not touch other priorities. 4. Click Update hold(s) 5. Observe the hold did not get your selected priority 3, but 2 instead. To test: 1. Apply patch 2. Place 3 holds on a record 3. See existing holds (cgi-bin/koha/reserve/request.pl?biblionumber=XXX) 4. By using the dropdown menu under "Priority" column, change the first hold's priority to last (3). Do not touch other priorities. 5. Observe this hold was automatically moved to the last row in the user interface. 6. Click Update hold(s) 7. Observe the hold has your selected priority 3. Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit dccb3a3414cb284f914d0fbeff7871a809379685 Author: Claire Gravely <claire.gravely at bsz-bw.de> Date: Wed Nov 22 13:54:11 2017 +0000 Bug 19678: Clicking Cancel when adding New Course to course reserves shows message Invalid Course! Clicking on the cancel link when adding a new course to course reserves displays the message 'Invalid Course!'. It would be better if it redirected back to the main Course Reserves page. This patch redirects the user back to the main course reserves page. To Test: 1. Go to Course Reserves 2. Click '+ New Course' 3. Cancel the process 4. You are shown 'Invalid Course!' 5. Apply patch and repeat steps 1-3 6. You are redirected back to the main course reserves page Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/UsageStats.pm | 1 - .../prog/en/includes/reports-menu.inc | 16 ++++++++++++++++ .../en/modules/admin/preferences/cataloguing.pref | 4 ++-- .../prog/en/modules/course_reserves/course.tt | 6 +++++- .../prog/en/modules/installer/step3.tt | 2 +- .../prog/en/modules/reserve/request.tt | 20 ++++++++++++++++++++ .../prog/en/modules/virtualshelves/shelves.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 1 - t/db_dependent/UsageStats.t | 1 - 9 files changed, 46 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Dec 20 18:01:37 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Dec 2017 17:01:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-166-g4421681 Message-ID: <E1eRhkP-0003Re-TL@git.koha-community.org> 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 4421681f48b1728a1d50f751a2d69154abf85dfc (commit) via 3fb0099ecee47b3a30e60dc861f608a4383e0450 (commit) via 9ee2257c970832ed5004e9ba561dcfad83d30157 (commit) via 7c5e71ed384a9a5df17f642bb5aa832cd4d702f0 (commit) from 0b5d6441aa8b62efdac2bb1ba09a13cdae088a8b (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 4421681f48b1728a1d50f751a2d69154abf85dfc Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 20 13:52:44 2017 -0300 Bug 7143: Update about page for new dev - Isabel Grubi Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 3fb0099ecee47b3a30e60dc861f608a4383e0450 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 20 13:50:28 2017 -0300 Bug 7143: Update about page for new dev - Bonnie Crawford Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9ee2257c970832ed5004e9ba561dcfad83d30157 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 20 13:49:30 2017 -0300 Bug 7143: Update about page for new dev - Sherryn Mak Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 7c5e71ed384a9a5df17f642bb5aa832cd4d702f0 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 20 13:48:25 2017 -0300 Bug 7143: Update about page for new dev - Priya Patel Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 8 ++++++-- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 21 11:12:47 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Dec 2017 10:12:47 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.06-27-g5cd9e7d Message-ID: <E1eRxqJ-0001J8-B5@git.koha-community.org> 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 5cd9e7dcef12c3540b2ec11d3061237622999f2c (commit) via 3b49e16dfac6f5e3018bfb1509759ce5e0757ba0 (commit) via a71013cfac11d860e6071f6ae9ef966a7c9d0c5c (commit) via 33a1eca2a59cab71a55d093f851ee5ea4d9179f9 (commit) via 41b14a29e73ac0e0fe8d6517425a78f048cc6984 (commit) via 42ac628d7d2a584cc4bddfe86e8f0fce8a6ff54f (commit) via 4bbafa605024ee7fb48c7701378372f65c909284 (commit) via 69b472651ca3dab906fd7447c9bfb95716b46e10 (commit) from ad91d8f732dd2d92a9d0b2bcbf4050ea5d9574b5 (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 5cd9e7dcef12c3540b2ec11d3061237622999f2c Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Dec 5 15:26:58 2017 +0000 Bug 19751: Holds awaiting pickup report should not be fixed-width This patch changes the grid used for the holds awaiting pickup report so that the results are full page and fluid instead of fixed-width. To test, apply this patch and the patch for Bug 19700 if necessary. View the holds awaiting pickup report. The report should fluidly fill the page width. Test with the CircSidebar system preference enabled and disabled. Signed-off-by: George Williams <george at nekls.org> Signed-off-by: BWS Sandboxes <ByWaterSandboxes at gmail.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 232b3cf25374f07ee2966231c5e5294ef16965a4) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 3b49e16dfac6f5e3018bfb1509759ce5e0757ba0 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 13:41:06 2017 -0300 Bug 19775: Try & prevent Search/History.t to fail randomly # Failed test 'There are still 8 searches after calling delete with an interval = 6 days' # at t/db_dependent/Search/History.t line 185. # got: '6' # expected: '8' # Failed test 'There are still 2 searches after calling delete with an interval = 2 days' # at t/db_dependent/Search/History.t line 191. # got: '0' # expected: '2' # Looks like you failed 2 tests of 27. [15:04:12] t/db_dependent/Search/History.t It looks like it does not longer fail with this change (date comparaison wrongly rounded to second in mysql?) Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 68a6d049869789618af1ddba9802b6d593593d09) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit a71013cfac11d860e6071f6ae9ef966a7c9d0c5c Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 7 10:26:32 2017 -0300 Bug 19724: DBIC Schema changes Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> (cherry picked from commit 7e691bc6d8695377e12896be085039c81115e4d0) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 33a1eca2a59cab71a55d093f851ee5ea4d9179f9 Author: Mark Tompsett <mtompset at hotmail.com> Date: Thu Jul 6 15:42:43 2017 +0000 Bug 18907: Build has deprecating message Following the instructions at: https://wiki.koha-community.org/wiki/Building_Debian_Packages_-_The_Easy_Way Receiving the following message in the build: dpkg-source: warning: relation < is deprecated: use << or <= This patch tweaks the list-deps. git diff origin/master -- debian/list-deps shows just the one line changed from < to << as per the messages suggestion and eythian's suggestion on IRC: http://irc.koha-community.org/koha/2017-07-06#i_1950698 The control file can be regenerated from the command-line: ./debian/update-control However, it will be attached separately. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit d8a16dd89a2853837e87eec1b1ec0d419ede1b55) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 41b14a29e73ac0e0fe8d6517425a78f048cc6984 Author: Victor Grousset <victor.grousset at biblibre.com> Date: Fri Nov 24 12:02:47 2017 +0100 Bug 12497: Fix OPAC search history reachable by URL even when disabled Test plan: 1. Set EnableOpacSearchHistory syspref to "Keep" 2. Make a search in the OPAC 3. Go to /cgi-bin/koha/opac-search-history.pl 4. Set the EnableOpacSearchHistory syspref to "Don't keep" 5. Refresh the OPAC page to show that history is still accessible 6. Apply the patch 7. Refresh the OPAC page, you should end on the 404 page 8. Set EnableOpacSearchHistory syspref to "Keep" 9. Go to /cgi-bin/koha/opac-search-history.pl which should be reachable Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Charles Farmer <charles.farmer at inLibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit b90824527b47e78e56e2f602199481325beeec15) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 42ac628d7d2a584cc4bddfe86e8f0fce8a6ff54f Author: Victor Grousset <victor.grousset at biblibre.com> Date: Thu Nov 23 16:03:14 2017 +0100 Bug 12497: Fix search history non-accessible when OPAC was private (when the user didn't have the "borrowers" permission) Test plan: 1. Set syspref "OpacPublic" to false (Disable) 2. Log in as a user without any permission 3. Try to access the search history. The link is next to "Log out" 4. Then you should see "Access denied" 5. Apply this patch 6. Refresh the page 7. Then you should see the search history Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Charles Farmer <charles.farmer at inLibro.com> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit adb37ce8cf10fee1c81ee35d703ec3a81c82697d) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 4bbafa605024ee7fb48c7701378372f65c909284 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 21 16:17:32 2017 +0000 Bug 19674: Broken indicators of changed fields in manage staged MARC records template This patch returns some CSS to the manage staged MARC records template which was incorrectly removed by Gug 16538. To test, apply the patch and go to Tools -> Staged MARC management. Choose a staged MARC file. Changing any of the <select> fields in the first section should cause a label to appear showing that the selection has changed, along with a link to reset the option to its original state. Clicking 'Reset' should make the label and the link disappear. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit ca95a10d90ebfec7a82b6224569f29df6059fd5b) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> commit 69b472651ca3dab906fd7447c9bfb95716b46e10 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Nov 10 12:59:58 2017 +0000 Bug 19595: Clicking plugin link does not fill item's date acquired field This patch updates the dateaccessioned plugin for the item edit form to return functionality which was removed in a previous patch. To test, apply the patch and open an item for editing. Clicking the "..." link next to the "Date acquired" field should insert the current date, overwriting the existing date. Open a blank item add form. Putting the cursor in the "Date acquired" field should automatically insert the current date. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Added a comment line in set_to_today. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Nick Clemens <nick at bywatersolutions.com> (cherry picked from commit 18897829e4bd585d5adb16681ce6dd648b368c66) Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com> ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/BiblioMetadata.pm | 18 ++++++++++++++++-- Koha/Schema/Result/DeletedbiblioMetadata.pm | 18 ++++++++++++++++-- cataloguing/value_builder/dateaccessioned.pl | 7 ++++--- debian/list-deps | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 1 + opac/opac-search-history.pl | 6 +++++- t/db_dependent/Search/History.t | 8 ++++---- 8 files changed, 48 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 21 14:57:55 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Dec 2017 13:57:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-167-g47d8320 Message-ID: <E1eS1MB-0006I2-I3@git.koha-community.org> 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 47d8320deaabe420d0a13f4a4403ae650f5b6c74 (commit) from 4421681f48b1728a1d50f751a2d69154abf85dfc (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 47d8320deaabe420d0a13f4a4403ae650f5b6c74 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 21 10:49:41 2017 -0300 Bug 19315: Prevent crash if no items and not library set for the subscription Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: serials/routing-preview.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 21 15:29:34 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Dec 2017 14:29:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-173-g11b562e Message-ID: <E1eS1qo-0007fr-ED@git.koha-community.org> 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 11b562e0d1dbca1243e7ab9305741360b2114db6 (commit) via e2d88cfb28d54fe0e6f5714d5bcd3746076cffa5 (commit) via 54f7db91435498bcb6f846c2ec789d0abfa21b30 (commit) via 7f1c847aba818b1093a21e67ce4e350b861d013c (commit) via 2cd52f68cbe9de9c26871fc19d4ce1bf34488c7b (commit) via 12882d824ec5e7eab61c67afff4b43dfdde6f9fe (commit) from 47d8320deaabe420d0a13f4a4403ae650f5b6c74 (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 11b562e0d1dbca1243e7ab9305741360b2114db6 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 19 16:52:03 2017 -0300 Bug 19843: (bug 15839 follow-up) Set reviews.datereviewed when the review is made Caused by commit 092ae340cef375cc66c8511fd34c1a4eec9c7ba6 Bug 15839: Koha::Reviews - Remove savereview the datereviewed=now() part of the query has not been translated. Test plan: Add a review from the OPAC Confirm that the reviews.datereviewd has been correctly set. Without this patch it is set to NULL. I have no idea how we could update existing data :-/ Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e2d88cfb28d54fe0e6f5714d5bcd3746076cffa5 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 19 16:28:00 2017 -0300 Bug 19808: Do not display 'Added' alone It seems that reviews.datereviewed ends with NULL in DB. It is caused by another issue that will be fixed on another bug report. Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 54f7db91435498bcb6f846c2ec789d0abfa21b30 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 18 13:32:19 2017 -0300 Bug 19808: Handle deleted reviewers gracefully - reviews/reviewswaiting.pl Test plan: - Create reviews - Delete some reviewers - Go to Home ? Tools ? Comments ? Comments awaiting moderation Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 7f1c847aba818b1093a21e67ce4e350b861d013c Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 18 13:32:14 2017 -0300 Bug 19808: Handle deleted reviewers gracefully - opac-showreview Test plan: - Create reviews - Delete some reviewers - Enable OpacShowRecentComments - Go to opac/opac-showreviews.pl - Go to opac-showreviews.pl?format=rss Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 2cd52f68cbe9de9c26871fc19d4ce1bf34488c7b Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 18 13:32:02 2017 -0300 Bug 19808: (follow-up) Handle deleted reviewers gracefully - opac-detail Make the tests easier to read Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 12882d824ec5e7eab61c67afff4b43dfdde6f9fe Author: Victor Grousset <victor.grousset at biblibre.com> Date: Fri Dec 15 15:22:24 2017 +0100 Bug 19808: Handle deleted reviewers gracefully - opac-detail And other display issues when the patron was NULL. Which allows to keep the review even if it has no patron. Because it might be useful. For example when disconnected, the borrowernumber is null. So the comments from deleted patrons were displayed as if the disconnected user wrote them. So it had the edit button... And fix borrowernumber not being passed to the template when OpacStarRatings was false. Test plan 1. Log in as a patron 2. Leave a comment/review on a record 3. Librarian: approve this comment 4. Delete the borrower 5. See the record (opac:/cgi-bin/koha/opac-detail.pl?biblionumber=RELEVANT_BIB_NUMBER) 6. Then you should see an error 7. Apply this patch 8. Refresh the page 9. Then you should see the record page with the comment Signed-off-by: Mark Tompsett <mtompset at hotmail.com> Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 20 +++++++++------- .../bootstrap/en/modules/opac-showreviews.tt | 8 +++++-- opac/opac-detail.pl | 22 ++++++++--------- opac/opac-review.pl | 1 + opac/opac-showreviews.pl | 25 +++++++++++--------- reviews/reviewswaiting.pl | 17 +++++++------ 6 files changed, 52 insertions(+), 41 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 21 17:28:33 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Dec 2017 16:28:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-195-gb4d3b25 Message-ID: <E1eS3hx-0004R9-Kw@git.koha-community.org> 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 b4d3b25bc21adfc768d18756b0973ddf37d69efa (commit) via 0ec74621ca2f105c33b85645d6855918efbc28a7 (commit) via 367f6ef536fd67288eca8a0897499badf292be34 (commit) via 730e1273801057781ea4577844bb80ab1b5c117c (commit) via df7fbba8284349e404acf484e029093f0c6cb73f (commit) via ebc1583f09e2c6cae9fe48f4476bc3ba4fd725fd (commit) via 8b98a82572ae5667309c1d33c5994b2d42f36081 (commit) via c1ea09f851626784d1c7b33c65ea3b78d6656556 (commit) via 136c49a940a632e9bcfb50694871b1a9ba2480c1 (commit) via c867cadeef6a324d1861514f3f21979881d04e18 (commit) via 9aa724cdf29a57bc91e42b240b5bcd19e3814ada (commit) via cf57457d34eed3a5fe3aff86ad5fbc9c1147cd81 (commit) via 3d720e9ede3da4cb612d1517c776d5636e12452e (commit) via b3d26c4e96e195308607960e03d309a9cf2d4065 (commit) via b11597b16acdb76b2801c371c9a5df76d97824b9 (commit) via 79c2848b142ed64336ccecd675d9cb2a38795900 (commit) via f07f69ae21d5ac78ea662b9a473de59ef6d12ac0 (commit) via 69f6b24a80ed6156ca13f48606f9941b260fcd80 (commit) via c269a0148661a2f39e75688eeaf9be48f0926cf6 (commit) via 325fddd8e911a7efe1342d61f21803d24f785dec (commit) via 7140a5e4ecc68759c1bee04571386f9cc9a16d92 (commit) via 92dd9082b8de2f45b468e4b73bd5f3efda344f4f (commit) from 11b562e0d1dbca1243e7ab9305741360b2114db6 (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 b4d3b25bc21adfc768d18756b0973ddf37d69efa Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 21 12:42:03 2017 -0300 Bug 19429: Rename .delete to .delete_invoice Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 0ec74621ca2f105c33b85645d6855918efbc28a7 Author: Aleisha Amohia <aleishaamohia at hotmail.com> Date: Tue Oct 3 02:47:40 2017 +0000 Bug 19401: Add confirm message when deleting invoice To test: 1) Go to Acquisitions 2) Go to Invoices (left nav menu) 3) Click Search (no need to filter results) 4) Click dropdown menu for an invoice, click Details 5) Click Delete 6) Notice invoice is deleted instantly 7) Apply patch and repeat steps 4 and 5 8) Confirm the confirm message shows and works as expected Sponsored-by: Catalyst IT Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 367f6ef536fd67288eca8a0897499badf292be34 Author: Aleisha Amohia <aleishaamohia at hotmail.com> Date: Tue Oct 10 02:17:36 2017 +0000 Bug 19429: Add confirm message when deleting invoice from invoice search page To test: To test: 1) Go to Acquisitions 2) Go to Invoices (left nav menu) 3) Click Search (no need to filter results) 4) Click dropdown menu for an invoice, click Delete 5) Notice invoice is deleted instantly 6) Apply patch and repeat steps 3 and 4 7) Confirm the confirm message shows and works as expected Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 730e1273801057781ea4577844bb80ab1b5c117c Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 21 12:37:38 2017 -0300 Bug 18201: Tidy tests Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit df7fbba8284349e404acf484e029093f0c6cb73f Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 20 18:59:39 2017 -0300 Bug 19756: Fix encoding issues during the update DB process To display the output of the updatedatabase.pl under Plack, we redirect the output to a temporary file, read it, then display it. We need to open it specifying the correct encoding (utf-8). Test plan: 1. MariaDB [koha_kohadev]> update systempreferences set value="17.1100000" where variable="version"; 2. restart plack 3. Login 4. Make the update from the interface => Without this patch you will see encoding issue: Upgrade to 17.12.00.000 done (T?? t??ia, t?? haumatia) => With this patch applied you will see : Upgrade to 17.12.00.000 done (T? t?ia, t? haumatia) Signed-off-by: Liz Rea <liz at catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit ebc1583f09e2c6cae9fe48f4476bc3ba4fd725fd Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Nov 9 15:54:12 2017 +0000 Bug 19573: Link to make a new list in masthead in OPAC only appears / works if no other list already exists This patch corrects the OPAC masthead include file so that the "New list" link will appear whether or not the logged-in user has existing private lists. To test, apply the patch and log into the OPAC as both a user with private lists and a user without private lists. The header's "Lists" dropdown menu should include a "New list" link in both cases. Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 8b98a82572ae5667309c1d33c5994b2d42f36081 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 21 12:57:11 2017 -0300 Bug 11976: Fix sorting issues The last column must be sortable, and dates must use title-string I removed the class on the th (did not seem useful as we have an id already) Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c1ea09f851626784d1c7b33c65ea3b78d6656556 Author: Mark Tompsett <mtompset at hotmail.com> Date: Thu Oct 26 11:41:34 2017 -0400 Bug 11976: Add Publication date to subscription table (opac) + column settings This patch adds the column settings feature to the subscription list at the OPAC. It also adds a new column (Publication date) to this table Using Home->Administration->Column Settings->OPAC->subscriptionst the fields visibility can be toggled. TEST PLAN --------- 1) Have a subscription where you have received at least once. 2) Look for it in OPAC and note the date is the received date, not the publication date 3) Apply patch 4) Log in to staff client 5) Home->Administration->Column Settings->OPAC->subscriptionst 6) Set visibility as desired. 7) Refresh OPAC page -- everything should be as expected. 8) run koha qa test tools. Signed-off-by: David Bourgault <david.bourgault at inlibro.com> Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 136c49a940a632e9bcfb50694871b1a9ba2480c1 Author: Julian Maurice <julian.maurice at biblibre.com> Date: Fri Dec 1 15:21:56 2017 +0000 Bug 19725: OAI-PMH - Use biblio_metadata.timestamp 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. Test plan: 1. prove t/db_dependent/OAI/Server.t 2. Verify that it SUCCEEDS Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c867cadeef6a324d1861514f3f21979881d04e18 Author: Julian Maurice <julian.maurice at biblibre.com> Date: Fri Dec 1 15:18:04 2017 +0000 Bug 19725: Add failing test Also fix tests for UNIMARC Test plan: 1. prove t/db_dependent/OAI/Server.t 2. Verify that it FAILS Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9aa724cdf29a57bc91e42b240b5bcd19e3814ada Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Nov 9 10:34:08 2017 -0300 Bug 19599: Speed anonymise_issue_history up The query generated by anonymise_issue_history is unecessary complex and can be very slow on large DB. With this patch we will execute one query per patron instead. See patch "Bug 19599: Simplify the query" on the bug report for an alternative. Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit cf57457d34eed3a5fe3aff86ad5fbc9c1147cd81 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Mon Dec 18 14:27:52 2017 -0300 Bug 19830: Add the Koha::Patron->old_checkouts method Test plan: prove t/db_dependent/Koha/Patrons.t must return green Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 3d720e9ede3da4cb612d1517c776d5636e12452e Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 19 15:04:13 2017 -0300 Bug 19694: Force scalar context for output_pref called with billingdate If no string is passed to output_pref, it needs to be called in scalar context (to avoid a shift in the hash elements). Here we have billingdate that is not defined yet (NULL) Test plan: - Search for an existing invoice - Show details - Changing shipping cost - Save - Verify the new amount is shown Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit b3d26c4e96e195308607960e03d309a9cf2d4065 Author: Nick Clemens <nick at bywatersolutions.com> Date: Wed Oct 4 12:10:13 2017 +0000 Bug 18201: Unit tests To test: 1. prove -v t/db_dependent/Exporter/Record.t 2. Tests should pass/be green/make the day a little brighter Signed-off-by: Scott Kehoe <scott at masslibsystem.org> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit b11597b16acdb76b2801c371c9a5df76d97824b9 Author: Nick Clemens <nick at bywatersolutions.com> Date: Thu Apr 13 10:21:50 2017 -0400 Bug 18201: Export data -Fix "Remove non-local items" option and add "Removes non-local records" option for existing functionality It turns out the modules had the option expected built in, we just didn't call it. This patch set expands the options for passing to the export. To test: 1 - Go to Tools->Export data 2 - Perform an export and check 'Remove non-local items' 3 - Note that file contains only 'local' records, but includes all items on those records 4 - Apply patch 5 - Note Tools->Export data has a new option to remove records not owned by logged in branch 6 - Export as before checking records option, file should be as before 7 - Now check 'Remove items not owned by logged in branch' 8 - File should now only have local items (may have empty records) 9 - Check both boxes and recieve only 'local' records and items Signed-off-by: Scott Kehoe <scott at masslibsystem.org> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 79c2848b142ed64336ccecd675d9cb2a38795900 Author: Srdjan <srdjan at catalyst.net.nz> Date: Thu Oct 12 13:45:43 2017 +1300 Bug 19450: Fixed WebService::ILS bug upstream (0.17) Signed-off-by: Nick Clemens <nick at bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit f07f69ae21d5ac78ea662b9a473de59ef6d12ac0 Author: Mark Tompsett <mtompset at hotmail.com> Date: Tue Nov 7 03:25:52 2017 +0000 Bug 17770: Perltidy Signed-off-by: Your Full Name <your_email> Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 69f6b24a80ed6156ca13f48606f9941b260fcd80 Author: Mark Tompsett <mtompset at hotmail.com> Date: Tue Nov 7 03:21:36 2017 +0000 Bug 17770: Improve perlcritic level before patch: perlcritic -4 noisy after patch: perlcritic -4 ok Signed-off-by: Your Full Name <your_email> Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c269a0148661a2f39e75688eeaf9be48f0926cf6 Author: Mark Tompsett <mtompset at hotmail.com> Date: Mon Nov 6 19:49:27 2017 +0000 Bug 17770: Fix Sitemapper.t if date changes during test run To compensate, DateTime->now is mocked to the current date. Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 325fddd8e911a7efe1342d61f21803d24f785dec Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 20 12:32:34 2017 -0300 Bug 19845: Do not generate a password if one is filled on selfreg Bug 15343 allows patrons to choose their own passwords during self-registration. But this does not work if the PatronSelfRegistrationVerifyByEmail preference is set to "Require." If e-mail verification is required, whatever password the patron supplied in the form is ignored, and they are given a randomly generated password once they click on the verification link. Test plan: 1. Make sure there is a valid e-mail stored in the KohaAdminEmailAddress preference. 2. Set PatronSelfRegistration to Allow. 3. Set PatronSelfRegistrationVerifyByEmail to Require. 3. Be sure "password" is listed in PatronSelfRegistrationBorrowerMandatoryField and NOT listed in PatronSelfRegistrationBorrowerUnwantedField. 4. Be sure there is a valid patron category in PatronSelfRegistrationDefaultCategory. 5. Set PatronSelfRegistrationPrefillForm to "Display and prefill" so that you can see the generated password. Then fill out the self-registration form, include a valid e-mail address, and select a password. Wait for the verification e-mail. Click on the link and you'll see that the password you entered in the form is used. Signed-off-by: Arturo <alongoria at sll.texas.gov> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 7140a5e4ecc68759c1bee04571386f9cc9a16d92 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Thu Dec 21 09:17:01 2017 -0500 Bug 19669: (QA follow-up) Remove itemstypes.plugin Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 92dd9082b8de2f45b468e4b73bd5f3efda344f4f Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 21 13:56:31 2017 +0000 Bug 19669: Remove deprecated checkouts by patron category report Patch applies. Reports and general OPAC and staff client functionality is intact. Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 2 +- Koha/Exporter/Record.pm | 7 +- Koha/OAI/Server/ListBase.pm | 6 +- Koha/Patron.pm | 18 +- Koha/Patrons.pm | 13 +- acqui/invoice.pl | 4 +- admin/columns_settings.yml | 11 + installer/install.pl | 4 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 5 +- .../prog/en/modules/acqui/invoices.tt | 6 +- .../modules/reports/issues_by_borrower_category.tt | 92 --------- .../intranet-tmpl/prog/en/modules/tools/export.tt | 6 +- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 34 ++- opac/opac-memberentry.pl | 2 +- reports/issues_by_borrower_category.plugin | 218 -------------------- reports/itemtypes.plugin | 109 ---------- t/db_dependent/Exporter/Record.t | 75 ++++++- t/db_dependent/Koha/Patrons.t | 26 ++- t/db_dependent/OAI/Server.t | 62 +++--- t/db_dependent/Sitemapper.t | 86 ++++---- tools/export.pl | 8 +- 22 files changed, 270 insertions(+), 526 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tt delete mode 100755 reports/issues_by_borrower_category.plugin delete mode 100755 reports/itemtypes.plugin hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Dec 21 19:47:30 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Dec 2017 18:47:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-196-g9e465e3 Message-ID: <E1eS5sQ-0002Zl-C2@git.koha-community.org> 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 9e465e3608cbc4422b695aaef2da26592706d82f (commit) from b4d3b25bc21adfc768d18756b0973ddf37d69efa (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 9e465e3608cbc4422b695aaef2da26592706d82f Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Thu Dec 21 14:45:51 2017 -0300 Bug 19867: Prevent HouseboundRoles.t to fail randomly Here is just a guess but we need to tell TestBuilder the values of housebound_deliverer and housebound_chooser to make sure it will not be 1 Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> I manually tested setting to the opposite values in the tests, and verified those values made the tests fail due to count problems. The fix is valid. ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Patron/HouseboundRoles.t | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Dec 22 17:22:41 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Dec 2017 16:22:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-221-g6dd0ff2 Message-ID: <E1eSQ5p-0007XZ-LB@git.koha-community.org> 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 6dd0ff217460375bb01e192f642c592912c6fcbb (commit) via 1a132440766277d6d94246a86ec671b79de7a442 (commit) via 8425ab43dde41f30d73cbcd4a781f260fcffea44 (commit) via a523f09e043fa7d6a17fc93406f966cab5671583 (commit) via 06a1f18a1b7c0b34d0519084d17fd52a7f32bec4 (commit) via 9a2767b577abd38bf63a2f815339eed3b93ecba7 (commit) via ec2ca4eecf7c720356b0de8f46ad0affbe5004f5 (commit) via 786086cfcfd57509b9ff9f5ab8d3ff24ad3d1ecc (commit) via 4fc594bcb4b9e3fb1fd56f0bdb350bde5c84c73e (commit) via 84a8f09ec2b4288092f6035555fa91b400a015ef (commit) via 122f5441323cb257fd0aaa171e2f00c7dfbcf189 (commit) via f98b47cf3ae666318c815f319289586bfc5717a4 (commit) via e111e4415d41d557984630b5a9bfbdfd9ba0df19 (commit) via c4da034dd3074e589c2c963fd5df7600b3b8f996 (commit) via 46f4f7d6c2857644e3c2d2b0c152007037fb0409 (commit) via 103fe109b22b48d506848a0a1bc43556c9dfda4b (commit) via 69c8e07ca0697bd3d5beefbd7dfd84f6bb0ead88 (commit) via 62a8f49848b4b8b450e3c643ed6014a0cfbe420c (commit) via 96a42b873aa0cd183fae31bb25292b975ebdd589 (commit) via 70bb6fe0ae5eae74e86c765480fd188ec2da0f61 (commit) via c728506815ab22df06dd81c346762ee6bb0a2fa3 (commit) via edcf4af0953f89573b760529303c388e2ae818b4 (commit) via 7e21ffe6c5e09ad1f5a1023e32be88f5a43a9d68 (commit) via 809175f3d4b0293e934e56654994797f38330e08 (commit) via 252c7c06b30a0f42aa523752e6e3aef02f16af41 (commit) from 9e465e3608cbc4422b695aaef2da26592706d82f (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 6dd0ff217460375bb01e192f642c592912c6fcbb Author: Josef Moravec <josef.moravec at gmail.com> Date: Thu Dec 21 18:12:38 2017 +0000 Bug 19753: (QA follow-up) Style invoices menu item when on individual invoice page Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 1a132440766277d6d94246a86ec671b79de7a442 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Dec 5 14:20:11 2017 +0000 Bug 19753: Move template JavaScript to the footer: Acquisitions This patch modifies some staff client acquisitions templates so that JavaScript is included in the footer instead of the header. This patch adds a JavaScript file, acquisitions-menu.js, which controls the highlighting of the current page in the sidebar. Highlighting will be temporarily broken for pages which have not been modified to include this file To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Acquisitions home page - Datatable, Inactive budget controls - Vendor search results - Acquisitions -> Vendor search - Datatables, "Show all" links - Basket - Acquisitions -> Vendor -> Basket - Datatables, button controls, add managing user - Add to basket from a staged file - Acquisitions -> Vendor -> Basket -> Add to basket from a staged file - Datatables, tabs, selection controls - Edit basket - Acquisitions -> Vendor -> Edit basket - Form validation - EDIFACT messages - Acquisitions -> EDIFACT messages - Datatables, message preview - Orders search - Acquisitions -> Order search - Full orders search form - Patron autocomplete in "Basket created by" field - Datepickers - Orders search results - Datatables, column visibility - Invoices - Acquisitions -> Vendor -> Invoices -> Invoice - Form validation, datepickers, datatables - Invoice files (enable AcqEnableFiles preference) - Manage invoice files - File list datatable Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 8425ab43dde41f30d73cbcd4a781f260fcffea44 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Dec 1 15:44:59 2017 +0000 Bug 19744: Move template JavaScript to the footer: Offline circulation This patch modifies the staff client offline circulation templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. Circulation -> Built-in offline circulation interface -> Synchronize -> Download records -> Check out -> Check in -> Synchronize -> Upload transactions -> Pending offline circulations -> Check all, uncheck all -> Delete -> Process Circulation -> Upload offline circulation data -> Upload .koc file (gerated by the Koha Offline Circulation program, for instance). Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit a523f09e043fa7d6a17fc93406f966cab5671583 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Apr 25 12:25:32 2017 -0300 Bug 17951: (follow-up) Make Makefile.PL handle template_cache_dir config This patch adds Makefile.PL the capability of handling the template_cache_dir configuration entry. To do so, it: - Adds the --template-cache-dir option switch (consistency with koha-create) - Sets a default value for template_cache_dir to '/tmp/koha' - Adds a dialog requesting the path for the template cache dir to Makefile.PL - It tweaks etc/koha-conf.xml so it is correctly changed by rewrite-config.PL To test: - Apply this patch - Run: $ perl Makefile.PL --template-cache-dir your/favourite/dir => SUCCESS: The dialogs don't ask for template cache dir => SUCCESS: The resulting Makefile contains an entry for TEMPLATE_CACHE_DIR which value matches what we passed to --template-cache-dir - Run: $ perl Makefile.PL - When prompted for a template cache dir, introduce whatever you want => SUCCESS: The default you are offered is /tmp/koha => SUCCESS: At the end of the process, Makefile contains what we put in there - Run: $ sudo make install => SUCCESS: The resulting koha-conf.xml contains a <template_cache_dir> entry containing whatever you picked for that purpose. - Sign off :-D Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 06a1f18a1b7c0b34d0519084d17fd52a7f32bec4 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Tue Jan 24 12:48:18 2017 -0300 Bug 17951: Make koha-create set template_cache_dir correctly This patch makes koha-create (and friends) handle the template_cache_dir config entry correctly. It does so by: - Adding a replaceable string to the template for koha-conf.xml - Making koha-create-dirs create the needed directories (i.e. /var/cache/koha/instance and /var/cache/koha/instance/templates) - Adding a --template-cache-dir switch to koha-create (so sysadmins can specify their favourite directory for the templates cache). - koha-remove now takes care of the instance's *templates* dir. - The install scripts now automatically create /var/cache/koha so it can be used later by koha-create and friends. It does so the same way it does for other install-created directories. To test, you should ideally be able to build your own packages. This instructions can be followed by people that doesn't have that ability yet. But can be used on a custom packages setup too. To test: - Make sure you have the latest misc4dev in your kohadevbox (if it is a fresh box you have it already) - Run: $ sudo perl misc4dev/cp_debian_files.pl - Manually create the /var/cache/koha dir (skip if you have your own packages): $ sudo mkdir /var/cache/koha - Create a new instance: $ sudo koha-create --create-db cachetest => SUCCESS: * /etc/koha/sites/cachetest/koha-conf.xml contains template_cache_dir and is populated with /var/cache/koha/cachetest/templates * The directory /var/cache/koha/cachetest/templates exists! - Create a new instance, pass your own cache dir: $ sudo koha-create --create-db --template-cache-dir /tmp cachetest2 => SUCCESS: etc/koha/sites/cachetest2/koha-conf.xml contains template_cache_dir and is populated with /tmp - Run: $ man koha-create => SUCCESS: The docs mention the --template-cache-dir option switch correctly. - Sign off :-D! Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9a2767b577abd38bf63a2f815339eed3b93ecba7 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri May 20 12:19:49 2016 -0400 Bug 16764: Update printers administration page This patch updates the template for printers administration according to current interface guidelines. - Custom JavaScript form validation is removed in favor of the built-in form validation plugin. - Printer-specific header search form is removed, along with server-side pagination code. The functionality of both is now taken care of the adding DataTables sorting and pagination to the table. - Edit and delete links are styled as Boostrap buttons with Font Awesome icons. - Confirmation dialogs are updated to use Font Awesome icons. To test properly you will need to add multiple printers. - Apply the patch and open /cgi-bin/koha/admin/printers.pl (there is no menu link for the page). - When no printers exist you should see a message dialog saying so. - Add a new printer. Confirm that printer name and queue are required fields. - After adding multiple printers, confirm that the table of printers is correctly sorted and searched by the DataTables plugin. - Delete a printer and verify that the confirmation dialog is correctly styled. Signed-off-by: Marc V?ron <veron at veron.ch> Update: rebased and updated Bootstrap 3 classes Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit ec2ca4eecf7c720356b0de8f46ad0affbe5004f5 Author: Lari Taskula <lari.taskula at jns.fi> Date: Thu Dec 21 13:56:34 2017 +0200 Bug 19857: Use BorrowerUnwantedField system preference for SMS provider selection Optionally hide SMS provider field in patron modification screen with BorrowerUnwantedField system preference. To test: 1. Apply patch 2. Append BorrowerUnwantedField with sms_provider_id and save changes 3. Go to patron modification screen in staff client 4. Observe the SMS provider selection is now hidden Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 786086cfcfd57509b9ff9f5ab8d3ff24ad3d1ecc Author: Josef Moravec <josef.moravec at gmail.com> Date: Fri Dec 22 07:43:39 2017 +0000 Bug 19828: (QA follow-up) Fix rethrowing exception and move rethrowing out of 'if' statement just in case the exception does not came from DBIx::Class Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 4fc594bcb4b9e3fb1fd56f0bdb350bde5c84c73e Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Wed Dec 20 15:33:48 2017 -0300 Bug 19828: Fix tests that expect DBD errors instead of the exception message Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 84a8f09ec2b4288092f6035555fa91b400a015ef Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Mon Dec 18 13:48:56 2017 -0300 Bug 19828: Make Koha::Object->store translate DBIC exceptions into Koha exceptions This patch introduces a try/catch block in store() and parses the error when an exceptional situation takes place. It only deals with FK constraint violations and duplicate IDs. The rest of the DBIC exceptions are rethrown. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Koha/Object.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 122f5441323cb257fd0aaa171e2f00c7dfbcf189 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Mon Dec 18 13:47:53 2017 -0300 Bug 19828: Unit tests This patch introduces unit tests for the changes this bug introduces to Koha::Object->store. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Koha/Object.t => FAIL: Tests should fail because the changes are not implemented on this patch Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit f98b47cf3ae666318c815f319289586bfc5717a4 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Fri Dec 22 08:23:23 2017 +0100 Bug 19494: (QA follow-up) Rename column and apply title-string As requested by Katrin, the column should not refer to Reserve but Hold. Sorting should be the same as Waiting since-column. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e111e4415d41d557984630b5a9bfbdfd9ba0df19 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Aug 4 10:05:20 2016 +0200 Bug 19494: Add reservedate to Holds awaiting pickup Add reservedate to report. Change label "Available since" to "Waiting since". Note: The table (already) crosses the boundaries of its container. Also the vertical spacing for the first column (already) is not the same as the others. (Adding the second date only makes it more visible.) These minor design issues should be solved on another report. Test plan: [1] Go to Circulation, Holds awaiting pickup [2] Note the additional column for reservedate. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c4da034dd3074e589c2c963fd5df7600b3b8f996 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 19 11:56:07 2017 -0300 Bug 19788: Add a test Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 46f4f7d6c2857644e3c2d2b0c152007037fb0409 Author: Fr?d?ric Demians <f.demians at tamil.fr> Date: Mon Dec 11 08:41:05 2017 +0100 Bug 19788: Preserve case sensitivity when creating Local preferences Fix a bug tranforming new local preference variable name in lowercase. TO TEST: 1. Admin > System preferences > Local use 2. Button New preference. Fill variable field with 'TESTfoo'. Click Save. 3. The new variable is named: 'testfoo'. 4. Apply the patch. 5. Button New preference. Fill variable field with 'TESTfoo2'. Click Save. 6. The new variable is properly named: 'TESTfoo2'. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 103fe109b22b48d506848a0a1bc43556c9dfda4b Author: David Bourgault <david.bourgault at inlibro.com> Date: Mon Nov 27 16:05:48 2017 -0500 Bug 19702: Correct cookie path in Basket.js This corrects the cookie path in bootstrap/js/basket.js. It used to take the default value (current page path), but will now be "/" Test plan: 0) Visit the OPAC, add a book to your basket 1) Navigate to the OPAC's homepage (www.domain.com, without the /cgi-bin/koha) -> The basket will display as empty 2) Apply patch 3) Clear your cookies and your cache 4) Redo step 1) -> Basket will display correctly Patch applies without issue and functions as descibed. Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 69c8e07ca0697bd3d5beefbd7dfd84f6bb0ead88 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 19 15:45:53 2017 -0300 Bug 19840: And avoid XSS... Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 62a8f49848b4b8b450e3c643ed6014a0cfbe420c Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 19 15:40:45 2017 -0300 Bug 19840: Fix - display patron note on checkin If a patron let a note on the checkout (AllowCheckoutNotes), it is supposed to be displayed when checked in. Test plan: 1/ Enable AllowCheckoutNotes 2/ Check an item out 3/ At the opac let a note on the checkout 4/ Check the item in => With this patch applied you should see the notes displayed Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 96a42b873aa0cd183fae31bb25292b975ebdd589 Author: Nick Clemens <nick at bywatersolutions.com> Date: Mon Nov 13 17:18:44 2017 +0000 Bug 19621: Use Koha.Preference on template side to display/hide "Routing lists" tab Patch applies without issue and functions as described. Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au> Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 70bb6fe0ae5eae74e86c765480fd188ec2da0f61 Author: Janusz Kaczmarek <januszop at gmail.com> Date: Sat Nov 25 02:28:02 2017 +0100 Bug 18458: Fix subfields ordering when Merging authority records While doing a merge, if a subfield(s) precedes the controlled subfields (like $i before $a in 7XX, which comes before $a -- rare but will become more and more usual) after merging will be moved to the end. This is not right. The patch (with AuthorityMergeMode == loose) make merge consider the subfields order: all subfields which originally were found before the first controlled subfield (e.g. $i before $a in 7XX / MARC 21) will remain in the front, the rest of not controlled subfields that should remain in the field will come after the subfields copied from authority rec. As a bonus, $9 will be placed at the end. To test: 0) Have AuthorityMergeMode == loose; 1) Have some field in bibliorecord, controlled by an authority, with extra subfield(s) (i.e. not present in authority rec.) placed at the beginning of the field; 2) Open (not necessarily edit) and save the connected authority; 3) See that the extra subfieds were moved to the end of the field (and $9 is in the front); 4) Apply the patch; 5) Reorder subfields in biblio field; 6) Open (not necessarily edit) and save the connected authority; 7) See that the order has been conserved, additionally $9 the last subfield in the field. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: Moved field creation to its original place. Changed $9 handling. Simplified the following add_subfields for loop. Edited comments. Restored the append_fields_ordered call (see comment6). With this patch, the Merge.t test now passes. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c728506815ab22df06dd81c346762ee6bb0a2fa3 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Fri Dec 8 13:45:55 2017 +0100 Bug 18458: Add a subtest in Merge.t This test illustrates the problem we have if you run it without the second patch. And it serves to demonstrate that we resolved the situation if you run it after the second patch. Test plan: [1] Without the second patch: The last subtest should fail. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit edcf4af0953f89573b760529303c388e2ae818b4 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Thu Dec 14 10:31:17 2017 -0500 Bug 19813: Make MarcItemFieldsToOrder handle non-existing tags MarcItemFieldsToOrder defines how Koha looks at tags in order records to generate item data. Let's look at a simplified case: homebranch: 955$a holdingbranch: 956$a So, here we are looking at 955 for the home branch, and 956 for the holding branch. So, it should make sense that Koha requires that these fields exist in equal number in the record. That is, for each 955, there should be a corresponding 956. Let's look at a different case: homebranch: 946$a|975$a holdingbranch: 946$a|975$a In this case, we are using the fallback behavior. VendorA stores the branch data in 946, and VendorB stores it in 975. This seems like it would work, but it won't! That's because Koha is expecting there to be the same number of 946's as there are 975's! In reality, the VendorA records will have a number of 946's, and *zero* 975's. The inverse will be true for VendorB. Koha should be able to skip those tags that simply don't exist in the record. Test Plan: 1) Set MarcItemFieldsToOrder to something like: homebranch: 946$a|975$a holdingbranch: 946$a|975$a budget_code: 946$f|975$f itype: 946$y|975$y notforloan: 946$l|975$l ccode: 946$t|975$c quantity: 946$q|975$q price: 946$p|975$p itemcallnumber: 946$n|975$n loc: 946$c|975$t 2) Create a record using only the 975 tag for item building data 3) Import the record into Koha 4) Create a basket 5) Attempt to add the record to the basket 6) Note the unequal fields error 7) Apply this patch 8) Reload the page 9) No error! Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Marci Chen <mchen at mckinneytexas.org> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Amended: Fix typo occurrance and theses. Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 7e21ffe6c5e09ad1f5a1023e32be88f5a43a9d68 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Fri Dec 22 11:20:13 2017 +0100 Bug 19200: (QA follow-up) Simplify call to GetBasketAsCSV If no profile_id is passed, GetBasketAsCSV will fallback to default itself. No need to make the distinction in basket.pl. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 809175f3d4b0293e934e56654994797f38330e08 Author: Aleisha Amohia <aleishaamohia at hotmail.com> Date: Tue Aug 29 21:07:39 2017 +0000 Bug 19200: Preventing warns when exporting a basket To test: 1) Go to Tools -> CSV profiles -> New CSV Profile 2) Create a new CSV profile with any name of SQL fields. Ensure profile type: SQL and usage: basket export in acquisition 3) Go to Acquisitions -> Find or create a vendor -> Use or create a basket 4) Click the dropdown menu next to the 'Export as CSV' button. There should be a 'Default' option and your new CSV profile (at least) 5) Click the 'Default' option. Notice warns 6) Click the 'Export as CSV' button. Notice warns 7) Click your new CSV profile option. Notice warns 8) Apply patch and refresh page 9) Repeat steps 5-7, confirm that warns do not show 10) Confirm export still works as expected Sponsored-by: Catalyst IT Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 252c7c06b30a0f42aa523752e6e3aef02f16af41 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Wed Dec 6 13:58:04 2017 -0300 Bug 19760: Die if koha-conf is not accessible We got a lot of support questions because scripts are executed without the correct environment/user. We could die and provide more useful information Tested on my kohadevbox VM by: 1) sudo chmod a-rx /etc/koha/sites/kohadev/koha-conf.xml 2) run help.pl from the command line to produce the desired die message 3) sudo chmod a+rx /etc/koha/sites/kohadev/koha-conf.xml 4) rerun help.pl successfully Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Bug 19760: Change wording Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 31 +- C4/Context.pm | 3 +- Koha/Config.pm | 2 +- Koha/Exceptions/Object.pm | 10 + Koha/Object.pm | 28 +- Makefile.PL | 11 +- acqui/addorderiso2709.pl | 25 +- acqui/basket.pl | 8 +- admin/printers.pl | 16 +- circ/returns.pl | 7 +- circ/waitingreserves.pl | 1 + debian/docs/koha-create.xml | 9 + debian/koha-common.dirs | 1 + debian/scripts/koha-create | 18 +- debian/scripts/koha-create-dirs | 2 + debian/scripts/koha-remove | 2 + debian/templates/koha-conf-site.xml.in | 5 +- etc/koha-conf.xml | 5 +- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../prog/en/includes/printers-admin-search.inc | 30 - .../prog/en/modules/acqui/acqui-home.tt | 160 +-- .../prog/en/modules/acqui/addorderiso2709.tt | 332 +++--- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 324 +++--- .../prog/en/modules/acqui/basketheader.tt | 8 +- .../prog/en/modules/acqui/booksellers.tt | 88 +- .../prog/en/modules/acqui/edifactmsgs.tt | 73 +- .../prog/en/modules/acqui/histsearch.tt | 63 +- .../prog/en/modules/acqui/invoice-files.tt | 46 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 103 +- .../prog/en/modules/admin/printers.tt | 162 ++- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 1141 ++++++++++---------- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 10 +- .../prog/en/modules/members/memberentrygen.tt | 2 + .../prog/en/modules/offline_circ/list.tt | 107 +- .../prog/en/modules/offline_circ/process_koc.tt | 136 +-- .../intranet-tmpl/prog/js/acquisitions-menu.js | 8 +- koha-tmpl/opac-tmpl/bootstrap/js/basket.js | 4 +- members/boraccount.pl | 1 - members/deletemem.pl | 1 - members/files.pl | 1 - members/mancredit.pl | 1 - members/maninvoice.pl | 1 - members/member-flags.pl | 1 - members/member-password.pl | 1 - members/moremember.pl | 1 - members/notices.pl | 1 - members/pay.pl | 1 - members/paycollect.pl | 1 - members/purchase-suggestions.pl | 1 - members/readingrec.pl | 1 - members/routing-lists.pl | 1 - members/statistics.pl | 1 - rewrite-config.PL | 1 + t/db_dependent/Authority/Merge.t | 27 +- t/db_dependent/Circulation/Returns.t | 2 +- t/db_dependent/Context.t | 4 +- t/db_dependent/Koha/Object.t | 93 +- tools/viewlog.pl | 1 - 59 files changed, 1645 insertions(+), 1483 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Dec 22 18:12:27 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Dec 2017 17:12:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-222-g8592be2 Message-ID: <E1eSQrz-0001GJ-HG@git.koha-community.org> 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 8592be20367790582c7235988ceafc5350a036b3 (commit) from 6dd0ff217460375bb01e192f642c592912c6fcbb (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 8592be20367790582c7235988ceafc5350a036b3 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Fri Dec 22 14:04:52 2017 -0300 Bug 19760: Fix Config.t test Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: t/Koha/Config.t | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Dec 26 16:59:52 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Dec 2017 15:59:52 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.11.00-237-g0853b50 Message-ID: <E1eTrdw-0008Dk-5h@git.koha-community.org> 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 0853b50f016107d48b33a8e6a0fa5ff6b1006fa7 (commit) via e678098109187e8d76d8567396f622886904fffc (commit) via 6f7bc759852badba028a9eb398e236ad6d27acf2 (commit) via d777c044be6af4e369bd3d5b72ca4ab607608196 (commit) via 01e66ec78f07b3c0ed3ffeeeae672634f65f97ea (commit) via 14e2185f9408f89d14ee5b8fabf7cc2abdd632f8 (commit) via bfe025688355eb714c24bd608726bc61f3224cbd (commit) via 759a86efd10f75cb4b038046957e28f2906b8dd5 (commit) via 1b8d085375bbfeec0e5f57451bd6249013dea6ea (commit) via c9839e84950f84a73da8bdff9d038b956dc04198 (commit) via 29f56fd5a0fe35927ca97f43e459d3ec5b2d24f4 (commit) via 8669dc1548b1425fa54ca49ef1a64ff28932ffbd (commit) via 2a4e76876bffbeac5d147255c70d698c539d98ee (commit) via aeb3a88224782944e46f9c56e99a5ff375cf77b5 (commit) via 9e541af7543d2169e2f926b5b2a8189f5e49c97f (commit) from 8592be20367790582c7235988ceafc5350a036b3 (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 0853b50f016107d48b33a8e6a0fa5ff6b1006fa7 Author: Josef Moravec <josef.moravec at gmail.com> Date: Fri Dec 22 11:38:32 2017 +0000 Bug 19603: (QA follow-up) Remove unused message Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit e678098109187e8d76d8567396f622886904fffc Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Nov 9 14:30:26 2017 +0000 Bug 19603: Move admin templates JavaScript to the footer: Patrons and circulation This patch modifies the staff client patrons and circulation-related administration templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Edit: Rebased Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 6f7bc759852badba028a9eb398e236ad6d27acf2 Author: Liz Rea <liz at catalyst.net.nz> Date: Tue Sep 19 15:29:22 2017 +1200 Bug 19338: Fix sorting by dates in opac-account.tt To test: Find an account with lots of fines/payments load up the borrower's account in the OPAC note that the sort on the dates sorts by day, and not by date. apply this patch reload the page, note that the sort on the dates is now correct. Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de> Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit d777c044be6af4e369bd3d5b72ca4ab607608196 Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Dec 20 19:48:13 2017 +0000 Bug 19860: Make staff client home page responsive This patch rewrites the markup of the staff client home page to use the Bootstrap grid instead of the YUI grid, taking advantage of Bootstrap's built-in responsiveness. This patch does not affect the logo and search form in the header. It will be necessary to address search forms in another patch. To test, apply the patch and clear your browser cache if necessary. For better results, apply the patch for Bug 19851 as well. - View the staff client home page and test the layout at various browser widths. - Test with and without news items - Test with and without content in IntranetmainUserblock Signed-off-by: Dominic Pichette <dominic.pichette at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 01e66ec78f07b3c0ed3ffeeeae672634f65f97ea Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Dec 20 17:09:30 2017 +0000 Bug 19851: Improve responsive layout handling of staff client menu bar This patch modifies CSS and markup in the staff client header to override the default responsive style of the menu bar. The changed layout will keep the menu bar items in a horizontal line at lower screen widths. To test, apply the patch and clear your browser cache if necessary. - 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: Dominic Pichette <dominic.pichette at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 14e2185f9408f89d14ee5b8fabf7cc2abdd632f8 Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Wed Dec 20 16:19:18 2017 -0300 Bug 19841: Make AddMember raise an exception if categorycode is invalid This patch makes C4::Members::AddMember raise a Koha::Exceptions::BadParameter exception. The current behaviour is to just explode. Code calling AddReturn should work as expected, unless they are looking for a specific failure message. It is just explodes in a way we know what happened, in the case the categorycode is invalid. To test: - Apply the Unit tests patch - Run: $ kshell k$ prove t/db_dependent/Members.t => FAIL: Tests fail because AddReturn doesn't raise an exception - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Members.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Dominic Pichette <dominic.pichette at inlibro.com> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit bfe025688355eb714c24bd608726bc61f3224cbd Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Wed Dec 20 16:19:07 2017 -0300 Bug 19841: Unit tests This patch introduces unit tests for the new behaviour of AddMember (raising an exception if the passed categorycode is not valid. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Members.t => FAIL: It should fail because the feature is still not implemented. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 759a86efd10f75cb4b038046957e28f2906b8dd5 Author: Josef Moravec <josef.moravec at gmail.com> Date: Fri Dec 22 08:02:10 2017 +0000 Bug 19623: (QA follow-up) Add missing footerjs variable in merge.tt Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 1b8d085375bbfeec0e5f57451bd6249013dea6ea Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Dec 22 13:37:58 2017 +0000 Bug 19623: (follow-up) Correct footer include in pop-up windows This patch corrects the footer include in two templates for Z39.50 pop-up windows. popup-bottom.inc shouldn't be used because it doesn't have the JavaScript embed code in it. To test, perform a Z39.50 search from both the MARC bibliographic editor and the MARC authority editor. In both cases the Z39.50 popup window should work correctly. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit c9839e84950f84a73da8bdff9d038b956dc04198 Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 14 17:53:24 2017 +0000 Bug 19623: Move template JavaScript to the footer: Cataloging This patch modifies some staff client cataloging templates so that JavaScript is included in the footer instead of the header. Several cataloging templates are excluded because they require significant structural changes: addbiblio.tt, additem.tt, and editor.tt To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. Note that z350_auth_search.tt is tested by performing a Z39.50 search from the Authorities module. Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 29f56fd5a0fe35927ca97f43e459d3ec5b2d24f4 Author: Josef Moravec <josef.moravec at gmail.com> Date: Thu Dec 21 21:16:59 2017 +0000 Bug 19608: (QA follow-up) Fix menu item styling for clone-rules Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 8669dc1548b1425fa54ca49ef1a64ff28932ffbd Author: Owen Leonard <oleonard at myacpl.org> Date: Thu Dec 14 13:11:10 2017 +0000 Bug 19608: (QA follow-up) Fix redirect on localization modal This patch makes two minor corrections: 1. The item types localization modal redirect problem has been fixed by excluding the anti-clickjack code from executing in the footer. 2. The sidebar menu highlighting script has been modified to correctly handle the clone-rules page. Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 2a4e76876bffbeac5d147255c70d698c539d98ee Author: Owen Leonard <oleonard at myacpl.org> Date: Tue Nov 14 16:13:56 2017 +0000 Bug 19608: Move admin templates JavaScript to the footer: The rest This patch modifies the staff client administration templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. To test the changes to localization.tt you must have more than one translation installed. Go to admin/itemtypes.pl, edit an itemtype, and click the 'Translate into other languages' link. To test the changes to sur_modmapping.tt, go to admin/z3950servers.pl and create a new SRU server. Click the 'Modify' button next to 'SRU Search fields mapping' Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec at gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit aeb3a88224782944e46f9c56e99a5ff375cf77b5 Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org> Date: Tue Dec 26 12:33:39 2017 -0300 Bug 19826: Add tests Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> commit 9e541af7543d2169e2f926b5b2a8189f5e49c97f Author: Tomas Cohen Arazi <tomascohen at theke.io> Date: Mon Dec 18 11:25:00 2017 -0300 Bug 19826: Add K::Acq::Budget(s) and K::Acq::Fund(s) This patch introduces Koha::Object(s)-derived classes for budgets and funds (aqbudgetperiods and aqbudgets respectively). C4::Budgets already uses DBIC calls on those tables so transition should be easy on top of this. To test: - Check the referenced schema files are the right ones. - QA scripts shoudl be happy. - Sign off :-D Note: the POD coverage report throws a false negative result on singular classes which is trivially wrong. Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com> Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org> ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 19 +- Koha/{CsvProfile.pm => Acquisition/Budget.pm} | 12 +- Koha/Acquisition/{Orders.pm => Budgets.pm} | 12 +- Koha/{City.pm => Acquisition/Fund.pm} | 14 +- Koha/Acquisition/{Orders.pm => Funds.pm} | 12 +- koha-tmpl/intranet-tmpl/prog/css/mainpage.css | 12 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 71 ++++ .../prog/en/includes/doc-head-close.inc | 2 +- .../intranet-tmpl/prog/en/includes/header.inc | 83 +++-- .../prog/en/includes/popup-bottom.inc | 4 + .../en/modules/admin/branch_transfer_limits.tt | 80 +++-- .../prog/en/modules/admin/categories.tt | 21 +- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 35 +- .../prog/en/modules/admin/clone-rules.tt | 6 + .../prog/en/modules/admin/currency.tt | 81 +++-- .../prog/en/modules/admin/edi_accounts.tt | 5 + .../prog/en/modules/admin/edi_ean_accounts.tt | 5 + .../en/modules/admin/item_circulation_alerts.tt | 101 +++--- .../prog/en/modules/admin/itemtypes.tt | 1 + .../prog/en/modules/admin/localization.tt | 375 ++++++++++---------- .../prog/en/modules/admin/patron-attr-types.tt | 39 +- .../prog/en/modules/admin/smart-rules.tt | 247 ++++++------- .../prog/en/modules/admin/sru_modmapping.tt | 56 +-- .../prog/en/modules/admin/transport-cost-matrix.tt | 116 +++--- .../prog/en/modules/cataloguing/addbooks.tt | 158 +++++---- .../prog/en/modules/cataloguing/merge.tt | 229 ++++++------ .../en/modules/cataloguing/z3950_auth_search.tt | 105 +++--- .../prog/en/modules/cataloguing/z3950_search.tt | 81 +++-- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 369 +++++++++---------- koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 2 + .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 10 +- t/db_dependent/Koha/Acquisition/Budgets.t | 54 +++ .../Subfields.t => Koha/Acquisition/Funds.t} | 40 +-- t/db_dependent/Members.t | 26 +- 34 files changed, 1363 insertions(+), 1120 deletions(-) copy Koha/{CsvProfile.pm => Acquisition/Budget.pm} (85%) copy Koha/Acquisition/{Orders.pm => Budgets.pm} (83%) copy Koha/{City.pm => Acquisition/Fund.pm} (86%) copy Koha/Acquisition/{Orders.pm => Funds.pm} (83%) create mode 100644 t/db_dependent/Koha/Acquisition/Budgets.t copy t/db_dependent/{Authority/Subfields.t => Koha/Acquisition/Funds.t} (51%) hooks/post-receive -- main Koha release repository