From gitmaster at git.koha-community.org Wed Sep 2 16:05:26 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 02 Sep 2015 14:05:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-490-g813a047 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 813a047e236947a815c4be3c3dde38f19844b962 (commit) via 90285259e898f4734684edf10a64c252a180fdf6 (commit) via 6ad59e7ab45bbd2858f4cfad83d862688a48e49b (commit) via ce2ea94f304b8e3a0c5fa6c967c2b864e5d0e7bc (commit) via 4e69b25e71fcb74ce3c2d3830deafdd1569fe361 (commit) via fc568dfb22238a052d7772a0bba374f836543d46 (commit) via 438b62e8ffcbab3742ab9a48602a9653b1afde6f (commit) from 6256eac2f672c9ef4e8ec63bfe952af34051d9df (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 813a047e236947a815c4be3c3dde38f19844b962 Author: Jonathan Druart Date: Tue Aug 18 18:40:31 2015 +0100 Bug 14584: Encoding broken with system preferences The pref are double encoded. From bug 12411: "This will fix the encoding issues existing in 3.14 and 3.16. The issue still appear in master but is fixed by bug 11944." They should not have been pushed together. Test plan: 1) You need an accentuated language installed. 2) Go to NoLoginInstructions pref, and add some accentuated message like "H?lo m?dames ? m?cie?x" 3) refresh opac home page, message should be gibberish 4) apply patch. Message should be ok now. Signed-off-by: Tomas Cohen Arazi Works as expected. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 90285259e898f4734684edf10a64c252a180fdf6 Author: Jonathan Druart Date: Wed Aug 19 16:24:32 2015 +0100 Bug 14696: useless use of String::Random in catalogue/search.pl Bug 10404 adds the use of String::Random to catalogue/search.pl but bug 11369 removes it without removing the import line. Test plan: git grep String::Random catalogue/search.pl should not return anything Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 6ad59e7ab45bbd2858f4cfad83d862688a48e49b Author: Jonathan Druart Date: Mon Aug 24 10:07:37 2015 +0100 Bug 14709: Do not access to C4::Context->userenv from the commandline The script dies with Can't use an undefined value as a HASH reference at tools/export.pl line 149. if it is called from the command line. This is introduced by bug 13040. The C4::Context->userenv is not defined in this case. Test plan: Execute the script using the command line. With the patch applies you should not get the error. Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit ce2ea94f304b8e3a0c5fa6c967c2b864e5d0e7bc Author: Tomas Cohen Arazi Date: Wed Sep 2 09:49:41 2015 -0300 Bug 14205: (RM followup) DBIx updates Signed-off-by: Tomas Cohen Arazi commit 4e69b25e71fcb74ce3c2d3830deafdd1569fe361 Author: Tomas Cohen Arazi Date: Wed Sep 2 09:45:35 2015 -0300 Bug 14205: DBRev 3.21.00.22 Signed-off-by: Tomas Cohen Arazi commit fc568dfb22238a052d7772a0bba374f836543d46 Author: Jonathan Druart Date: Tue Aug 4 10:00:51 2015 +0100 Bug 14205: Deleting an Item/Record does not remove link to course reserve A constraint is missing on the course_reserves.ci_id field. This patch adds it and removes orphan rows. Test plan: 0/ Don't apply the patch 1/ Login to Staff Site. 2/ Go to Course Reserves 3/ Create Course 4/ Add Reserve 5/ Go to item added (delete item/record) 6/ Refresh Course (see no items attached) 7/ Delete Course 8/ See course still listed in the courses (Not deleted) 9/ Apply the patch and execute the updatedatabase entry. 10/ Delete the Course Note that the course has correctly been removed. NOTE: Make sure to set the UseCourseReserves system preference to test. Tested before (problem existed) and after (problem solved) update. Dropped DB, web installed, and put in dummy data and retested. Problem solved. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 438b62e8ffcbab3742ab9a48602a9653b1afde6f Author: Jonathan Druart Date: Tue Aug 18 09:08:09 2015 +0100 Bug 14685: Fix set guarantor for a child or professional accounts Bug 13970 removed some useful code to automatically set the guarantor when creating a child. But finally there is a better way to do the job, we just need to assume that only children or professional can have a guarantor. Test plan: 1/ Create an adult patron and add a child. 2/ The guarantor info should be retrieved and set on the child creation page. 3/ Create an organization and add a child 4/ The guarantor info should be retrieved and set on the adult creation page. Signed-off-by: Liz Rea This patch catches both cases, thanks Jonathan! Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Schema/Result/CourseItem.pm | 19 +++++++++++++++++-- Koha/Schema/Result/CourseReserve.pm | 22 +++++++++++++++++++--- Koha/Template/Plugin/Koha.pm | 3 +-- catalogue/search.pl | 1 - installer/data/mysql/kohastructure.sql | 4 +++- installer/data/mysql/updatedatabase.pl | 18 ++++++++++++++++++ members/memberentry.pl | 3 ++- tools/export.pl | 2 +- 9 files changed, 62 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Sep 2 19:44:30 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 02 Sep 2015 17:44:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-498-gc4a4581 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 c4a4581a50681a35cedda43758a49a8b567c40a9 (commit) via c1d9a2c7709be5eefb6e4bb9a6fd280e8ce430b5 (commit) via eb12ee1e223b662cd1e89c0a56a5d1c083ba1ddc (commit) via 085d766a0524e399d0c9c9e807d8c0acd0da6a19 (commit) via f7214859df15abfe874141bcc1a32b57067f7c54 (commit) via 6e0b61e2acea7c797c1da727474daf7d7a657574 (commit) via d1335a766d7b54c470701b0055fc99be2e7e7628 (commit) via 22b41063981de608402d1dd87f6aa9e2010245dd (commit) from 813a047e236947a815c4be3c3dde38f19844b962 (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 c4a4581a50681a35cedda43758a49a8b567c40a9 Author: Katrin Fischer Date: Mon May 25 17:01:46 2015 +0200 Bug 13972: Follow-up - Add unit tests for changed parts of SendAlerts To test: - prove t/db_dependent/Letters.t Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit c1d9a2c7709be5eefb6e4bb9a6fd280e8ce430b5 Author: Katrin Fischer Date: Mon May 25 14:53:29 2015 +0200 Bug 13972: Include fields from subscription and serial table in serial notification email Currently it's not possible to include information about which issue has arrived in the serial notification notice the patron can subscribe to from the OPAC. The patch makes the fields from the subscription and serial table available to the notice template. In order to be able to print information about the correct issue, the GetAlert has been modified to expext the serialid as externalid when the module is issue. git grep SendAlerts (only call with 'issue' is in Serial.pm) To test: - Add a subscription, select a patron notification template - Search for the record in the OPAC - Go to the subscription tab - More details - Subscribe to the notification - Edit the notice template you selected for the subscription - add fields from subscription - add fields from serial (serial.serialseq has the issue information) - Receive an issue for the subscription - Check that you have received the notification and that all information has been printed correctly NOTE: notice is sent directly, not through the message_queue Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit eb12ee1e223b662cd1e89c0a56a5d1c083ba1ddc Author: Jonathan Druart Date: Fri Jul 10 16:11:48 2015 +0100 Bug 12965: Prevent to erase an existing item type On creating an item type, if it already exists, it will replace the existing one. This patch prevent that and display a message to the interface. Note: The fields are lost. Test plan: 1/ Create an item type 'AAA', description 'AAA' 2/ Edit it, update the description with 'BBB' 3/ Create an item type 'AAA' with a description 'CCC' => you should get a warning "already exists". Works well, no errors Signed-off-by: Amit Gupta Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Warning message is triggered. Adding, editing and deleting item types still works. Signed-off-by: Tomas Cohen Arazi commit 085d766a0524e399d0c9c9e807d8c0acd0da6a19 Author: Jonathan Druart Date: Wed Jul 15 12:49:03 2015 +0100 Bug 12885: Fix if url contains +*... and HTML5 Media is enabled The special regex chars are not escaped in C4::HTML5Media. Test plan: 1/ Set 856$u=http://www.mrqe.com/lookup?talented+mr.+ripley 2/ Enable the pref HTML5Media 3/ Go on the detail page It should not explode. Signed-off-by: Mirko Tietgen Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit f7214859df15abfe874141bcc1a32b57067f7c54 Author: Jonathan Druart Date: Mon Jul 13 17:34:53 2015 +0100 Bug 13943: Prevent the deletion of items if the user cancels On the edit items page, there is some weird JS code: if the user clicks on the delete link and then cancel, the item is deleted anyway. It's caused by the following JS code in browser.js $('a[href*="biblionumber="]').click(function (ev) { ev.preventDefault(); window.location = $(this).attr('href') + '&searchid=' + me.searchid; }); Test plan: - Do a search with multiple results - Go to the detail page (make sure results browser shows up!) - Use the "Edit items" link from the toolbar - Delete an item (try both way) - Choose "cancel" - Delete an item (try both way) and confirm the deletion You should see the browser after the deletion and the item should have been deleted correctly. - Edit an item (try both way) You should see the browser (did not work before this patch) Note: Before this patch, the 2 first columns didn't contain the edit/delete item links, now it's only the 1st one. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Much better! Signed-off-by: Tomas Cohen Arazi commit 6e0b61e2acea7c797c1da727474daf7d7a657574 Author: Jonathan Druart Date: Wed Sep 2 15:07:07 2015 +0100 Bug 11247: Improve tests This patch makes the tests non dependent on the DB and test the 3 marc flavours. Signed-off-by: Tomas Cohen Arazi commit d1335a766d7b54c470701b0055fc99be2e7e7628 Author: Marcel de Rooy Date: Wed Aug 26 14:09:53 2015 +0200 Bug 11247: Add a simple unit test for TransformHtmlToXml The unit test is db dependent (as Jonathan correctly remarked), since the sub checks a preference. Test plan: Run t/db_dependent/Biblio/TransformHtmlToXml.t Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 22b41063981de608402d1dd87f6aa9e2010245dd Author: Srdjan Date: Thu Nov 14 19:10:30 2013 +1300 Bug 11247: Fix calls of TransformHtmlToXml The ind_tag of TransformHtmlToXml is unused. Some calls to this function incorrectly revert indicator and ind_tag (which is not a problem when both are empty..) Patch of Srdjan Jankovic, amended and signed off by Marcel de Rooy. The following calls are fixed: call in acqui/addorder.pl: switched indicator with ind_tag call in acqui/addorderiso2709.pl replaced too acqui/finishreceive.pl replaced too These calls are fine: two calls in cataloguing/additem.pl are fine call in serials/serials-edit.pl is fine call in tools/batchMod.pl is fine The folllow-up patch adds a simple unit test. Signed-off-by: Marcel de Rooy With AcqCreateItem=='placing an order', tested if adding an order still worked (covered both addorder.pl and addorderiso2709.pl). Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 2 + C4/HTML5Media.pm | 2 +- C4/Letters.pm | 21 ++++- C4/Serials.pm | 2 +- acqui/addorder.pl | 2 +- acqui/addorderiso2709.pl | 2 +- acqui/finishreceive.pl | 3 +- admin/itemtypes.pl | 38 ++++++---- .../prog/en/modules/admin/itemtypes.tt | 16 ++++ .../prog/en/modules/cataloguing/additem.tt | 52 +++++++------ t/Biblio/TransformHtmlToXml.t | 80 ++++++++++++++++++++ t/db_dependent/Letters.t | 43 ++++++++++- tools/letter.pl | 3 + 13 files changed, 217 insertions(+), 49 deletions(-) create mode 100644 t/Biblio/TransformHtmlToXml.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 7 16:16:04 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Sep 2015 14:16:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-517-gf189696 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 f189696bb7bfeeb82e977d3b9a8eff6f24555b55 (commit) via 0f74321977c50ef45daa4897933ee0fac378dcb6 (commit) via f37d9d005c965d5218b9133873616807296b2dbd (commit) via 8c132e956e6141b42d09e7544687fd35632ca3c6 (commit) via 64992a05ce87af7bf595c8d6f0b9d528887a2e44 (commit) via abd71d017ea68f4209e41b34282e8fce8170e175 (commit) via 503dd6036974b4208bd5cd60a87bb28599987f45 (commit) via cbdd49ed7003f124d55f399e5d2709ef81fb7243 (commit) via efe3d17acc237e00cc7c0e37eba92e8eead57ebf (commit) via db891d33f0bbe75748fd725036066f45c2e762fe (commit) via 69994c38a00a1199b814d823c4e20503d86b28bf (commit) via 7bad40dcc294d6d56c937cbd81267fc9df73b6aa (commit) via d8a9d171154f3ad526f31968fdec1ad7809014b8 (commit) via 5b521eb394771ee305777f0b44098be5fdd11cc7 (commit) via bb4b7f46d13a75401af8c70fd39b9fcbbb9bbc1d (commit) via bcab2416399e93f5ce9b1083395c052046d5d02a (commit) via 198e273530210f2f2df9ab8401cf7d4ee31cba89 (commit) via 1accce387030db73cbd2e9496ab642b351f8551b (commit) via ea6c4f5b8aab8f9bcb4ff0a32349f32016879230 (commit) from c4a4581a50681a35cedda43758a49a8b567c40a9 (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 f189696bb7bfeeb82e977d3b9a8eff6f24555b55 Author: Jonathan Druart Date: Wed May 27 14:02:25 2015 +0200 Bug 14098: Implement the copy_and_replace action for MTT This patch implements the copy and replace action for the marc modification templates. Instead of copying a field/subfield, it will erase the destination fields/subfields. Test plan: Find it yourself. Compare the differences between the copy and the copy_and_replace actions. The easier way to test is to 1/ create a complete record, 2/create some modification templates and 3/ use the batch record modification with the "preview" function. QA note: I kept the same tests as "copy" and, if no change were expected, I noted them "(same as copy)", to be sure this new action won't introduce regression on these tests. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 0f74321977c50ef45daa4897933ee0fac378dcb6 Author: Jonathan Druart Date: Wed May 27 13:38:38 2015 +0200 Bug 14098: Add copy_and_replace action to MMT This patch add the new value for the MTT action. It updates the marc_modification_template_actions.action DB field to allow 'copy_and_replace_field'. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit f37d9d005c965d5218b9133873616807296b2dbd Author: Jonathan Druart Date: Wed May 27 13:34:09 2015 +0200 Bug 14098: Remove unedeed subroutines Just some cleaning before to continue, _copy_field and _copy_subfield did not do anything useful. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 8c132e956e6141b42d09e7544687fd35632ca3c6 Author: Jonathan Druart Date: Wed May 27 12:51:37 2015 +0200 Bug 14098: FIX Copy a subfield should not update the original field There is an inconsistency in the copy action: Given the following control sample: 245 _aThe art of computer programming _cDonald E. Knuth. 300 _aA_exists _bB_exists If we apply action (a) Copy the whole field 245 to 300, we get: 245 _aThe art of computer programming _cDonald E. Knuth. 300 _aA_exists _bB_exists 300 _aThe art of computer programming _cDonald E. Knuth. If we apply action (b) Copy the subfield 245$a to 300$a, we get: 245 _aThe art of computer programming _cDonald E. Knuth. 300 _aThe art of computer programming _bB_exists In (a) the field is copied but in (b) the subfield is erased. We should be consistent and don't erase the destination field. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 64992a05ce87af7bf595c8d6f0b9d528887a2e44 Author: Fridolin Somers Date: Tue Aug 25 11:33:04 2015 +0200 Bug 14721: OAI-PMH must return error when no results When getting records from OAI-PMH, an error must be returned if there is no results. See : http://www.openarchives.org/OAI/openarchivesprotocol.html#ErrorConditions Test plan : - Enable OAI webservice - Perform a query that will return no results. ie : /cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marcxml&from=2099-12-30&until=2099-12-31 => Without patch you get a response with : => With patch you get a response with error code : No records match the given criteria - Check a good query returns still results - Same test with ListIdentifiers verb Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit abd71d017ea68f4209e41b34282e8fce8170e175 Author: Julian Maurice Date: Fri Sep 4 08:57:08 2015 +0200 Bug 14766: unimarc_field_4XX: escape ', ", \n, \r Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 503dd6036974b4208bd5cd60a87bb28599987f45 Author: Paul Poulain Date: Wed Aug 26 10:54:30 2015 +0200 Bug 14766: Complete cataloguing plugin unimarc_field_4XX Add subfields l, n and o for better UNIMARC compliance Signed-off-by: Chris Cormack Note: I just did a code audit here, as I don't know enough about UNIMARC to know if the 4XX fields should have these subfields. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit cbdd49ed7003f124d55f399e5d2709ef81fb7243 Author: Tomas Cohen Arazi Date: Tue Aug 18 16:37:27 2015 -0300 Bug 14651: Koha::Item->effective_itemtype fallback to bib-level In some situations (bad migrations, old bugs that introduced bad data, people having bib-level itypes for ages and switching to item level...) the user ends with undex itype values for items. The current code, if the user has item_level-itype set, just returns undef. It should fallback to bib-level. In order to avoid hiding the problem a warning is raised. To test: - Run the regression tets: $ prove t/db_dependent/Items.t => FAIL: tests fail. - Apply the patch - Run the tests again => SUCCESS: The tests now pass. - Sign off :-D Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit efe3d17acc237e00cc7c0e37eba92e8eead57ebf Author: Tomas Cohen Arazi Date: Tue Aug 18 16:34:25 2015 -0300 Bug 14651: (regression test) fallback to bib-level if itype is undef Koha::Item->effective_itemtype should fallback to biblio-level itemtype even if item-level item types are set, in the case the item has no itemtype set (bad migration, bad old code). To test: - Run $ prove t/db_dependent/Items.t => FAIL: Koha::Item->effective_itemtype doesn't work properly Edit: Added a test for a warning when falling back as per QA request and because it made a lot of sense :-D Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit db891d33f0bbe75748fd725036066f45c2e762fe Author: Tomas Cohen Arazi Date: Mon Sep 7 11:12:49 2015 -0300 Bug 14717: DBRev 3.21.00.023 Signed-off-by: Tomas Cohen Arazi commit 69994c38a00a1199b814d823c4e20503d86b28bf Author: Jonathan Druart Date: Thu Sep 3 16:07:42 2015 +0100 Bug 14171: Update borrowers date fields Signed-off-by: Jonathan Druart http://bugs.koha-community.org/show_bug.cgi?id=14717 Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 7bad40dcc294d6d56c937cbd81267fc9df73b6aa Author: Jonathan Druart Date: Thu Sep 3 16:03:17 2015 +0100 Bug 14717: Prevent 0000-00-00 on updating a patron Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit d8a9d171154f3ad526f31968fdec1ad7809014b8 Author: Chris Cormack Date: Tue Aug 25 10:00:20 2015 +1200 Bug 14717: Invalid dates in debarred column To test 1/ Import a patron using the patron import tool, make sure they have no debarred column in the file 2/ Check the database, notice the debarred column is 0000-00-00 3/ For bonus points, checkout an item to that borrower, then check it in notice Koha errors 4/ Apply patch 5/ Import a new patron 6/ Notice column is now NULL and that checkins work Signed-off-by: Eugene Espinoza Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 5b521eb394771ee305777f0b44098be5fdd11cc7 Author: Jonathan Druart Date: Tue Jul 14 13:12:46 2015 +0100 Bug 11273: FIX barcode generation in acquisition if hbyymmincr When AutoBarcode is activated and you have set AcqCreateItem to 'on order' there is a Javascript error when you try to generate a barcode for the item: TypeError: document.f is undefined http://localhost:8080/intranet-tmpl/lib/jquery/jquery.js Line 11 Test plan: 0/ a. Set AutoBarcode to hbyymmincr b. Set AcqCreateItem to 'on ordering' c. Set the plugin barcode.pl to the barcode field for the default and the ACQ frameworks 1/ Go on the add items page (cataloguing/additem.pl) and confirm that the plugin works as expected. 2/ Go on the New order page (acqui/neworderempty.pl) and confirm that the plugin works as expected. Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit bb4b7f46d13a75401af8c70fd39b9fcbbb9bbc1d Author: Julian FIOL Date: Wed Jul 15 16:10:17 2015 +0200 Bug 13585: Add a cronjob which send UsageStats monthly. This patch introduces entries for monthly running the share_usage_with_koha_community.pl script to the packages and also the crontab.example file for manual installs use. Edit: I fixed the Copyright line Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit bcab2416399e93f5ce9b1083395c052046d5d02a Author: Jonathan Druart Date: Tue Jul 14 18:07:37 2015 +0100 Bug 14354: Prevent edition of items from other branches if IndependentBranches is on If IdependentBranches is ON, to edit/delete items from other branches you need to be superlibrarian. Currently a "simple" staff user cannot edit them from the edit item page but from the catalogue detail page. The edit links should not be displayed on this table. Test plan: O/ Set IndependentBranches to "Prevent". Create a record and add 2 items: Set homebranch to L1 for item I1. Set homebranch to L2 for item I2. 1/ With a superlibrarian user, you should be able to edit both items. 2/ With a "simple" user attached to L1, you should only be able to edit I1. The edit links should not be displayed for I2. Note that the checkbox is displayed on the catalogue detail page (item list), but on the batch tools, it won't be possible to select non-modifiable items. TODO: Add a server-side check. Indeed it is still possible to edit an item if the user know the url. Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 198e273530210f2f2df9ab8401cf7d4ee31cba89 Author: Joonas Kylm?l? Date: Mon Aug 31 05:06:16 2015 +0000 Bug 14526: (follow-up) add a space before equals sign Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 1accce387030db73cbd2e9496ab642b351f8551b Author: Marcel de Rooy Date: Wed Jul 15 14:17:11 2015 +0200 Bug 14526: Add some unit tests for MoveReserve The change in MoveReserve from the previous patch begs for a test. Here we add some to Reserves.t. In all six tests we place a hold, move it and check the reserves again. Depending on the status of ConfirmFutureHolds, and the reservedate the hold should be moved or not. Test plan: Run the unit test. Bonus: If you run Reserves.t by applying this patch but without the first patch that changed MoveReserve, tests 60 and 61 should fail: not ok 60 - MoveReserve filled future hold now not ok 61 - MoveReserve filled future waiting hold now This may further illustrate the need of the first patch. Signed-off-by: Joonas Kylm?l? Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit ea6c4f5b8aab8f9bcb4ff0a32349f32016879230 Author: Marcel de Rooy Date: Mon Jul 13 21:55:55 2015 +0200 Bug 14526: MoveReserve should look at future holds too At checkout a hold for the same borrower is considered to be filled. It is consistent to do the same for holds of the same borrower within [ConfirmFutureHolds] days (if non-zero). This goal is achieved by adjusting the CheckReserves call within MoveReserve, adding the lookahead parameter. I used this occasion to revisit other calls of CheckReserves: - transferbook: no need to add lookahead; a future hold should not block a transfer; - CanBookBeIssued: no lookahead; future hold does not block an issue; - CanBookBeRenewed: idem. - GetOtherReserves (only used in circ/returns): this call might be a candidate for lookahead too, but I leave that for another report. It is in the context of checkin and transfer, not checkout. Test plan: [1] Set ConfirmFutureHolds to zero days. (You may also need to enable AllowHoldDateInFuture.) [2] Place a hold with borrower A on biblio X for tomorrow. Also place a hold with borrower B on X for today. (Use biblio level holds.) [3] Check out item Y of X to borrower A. Ignore the warning for borrower B and do not cancel the hold of B (so: confirm checkout). Verify that X has still two holds. [4] Check in Y (without confirming a hold). [5] Enable ConfirmFutureHolds, say 2 days. [6] Check out Y to A again. Ignore the warning for B (no cancel). Verify that X now only has one hold for borrower B (the hold for A was filled). Signed-off-by: Joonas Kylm?l? Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Barcodes/ValueBuilder.pm | 10 +- C4/MarcModificationTemplates.pm | 15 + C4/Members.pm | 4 + C4/Reserves.pm | 3 +- Koha.pm | 2 +- Koha/Schema/Result/Item.pm | 4 +- Koha/SimpleMARC.pm | 238 +++---- catalogue/detail.pl | 9 +- cataloguing/value_builder/unimarc_field_4XX.pl | 18 + ...post-install-setup => koha-common.cron.monthly} | 14 +- .../Bug-14098-Add_copy_and_replace_action.sql | 1 + installer/data/mysql/updatedatabase.pl | 18 + .../prog/en/modules/admin/preferences/admin.pref | 2 +- .../prog/en/modules/catalogue/detail.tt | 7 +- .../cataloguing/value_builder/unimarc_field_4XX.tt | 9 + .../modules/tools/marc_modification_templates.tt | 10 +- misc/cronjobs/crontab.example | 3 + opac/oai.pl | 16 + t/SimpleMARC.t | 662 +++++++++++++++++++- t/db_dependent/Items.t | 16 +- t/db_dependent/Members.t | 26 +- t/db_dependent/Reserves.t | 53 +- tools/marc_modification_templates.pl | 1 + 23 files changed, 994 insertions(+), 147 deletions(-) copy debian/{koha-post-install-setup => koha-common.cron.monthly} (76%) create mode 100644 installer/data/mysql/atomicupdate/Bug-14098-Add_copy_and_replace_action.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 7 16:22:35 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Sep 2015 14:22:35 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-518-g297479c 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 297479cc9adb74e050fb630c342413f67ca7c5a8 (commit) from f189696bb7bfeeb82e977d3b9a8eff6f24555b55 (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 297479cc9adb74e050fb630c342413f67ca7c5a8 Author: Tomas Cohen Arazi Date: Mon Sep 7 11:22:30 2015 -0300 Bug 14098: DBRev 3.21.00.024 Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- .../atomicupdate/Bug-14098-Add_copy_and_replace_action.sql | 1 - installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/Bug-14098-Add_copy_and_replace_action.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 7 16:54:22 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Sep 2015 14:54:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-529-g7f65aaa 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 7f65aaac748833b57f9f1c8ae754d66c7e144d81 (commit) via e2e50e0b06587f45c5370b313ff7a7d7a432bcd5 (commit) via 65ae7af277d6f64ef42f961c290ab92768a90df3 (commit) via 2dc5ae238ae0eb58040be4612cae641330b868ba (commit) via fc4f7fe67577917df9ca4201257bea822832a3c4 (commit) via e0ed9cbcf60a74dbe2690e6c34c5a311744f49ae (commit) via 658e787834784dec7d7782f45061b66e22211423 (commit) via 80abbe1fa358dee58580004e436aef3f0b449430 (commit) via bef18fad1e52292df5d8c641eac6ff31f5e4f7ed (commit) via f4ccbcfabd73c8c1ed88c796bd3cb7febe0a68c8 (commit) via 0b17dd3634948af0c92d5de023159fee4b8a3f5e (commit) from 297479cc9adb74e050fb630c342413f67ca7c5a8 (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 7f65aaac748833b57f9f1c8ae754d66c7e144d81 Author: Jonathan Druart Date: Wed Jul 15 11:50:18 2015 +0100 Bug 12525: Prevent adding several patron lists with the same name If you add patron to a patron list, from the patron search result, a list is created when you click on "Save". The list is considered as new each time. To reproduce: 1/ Launch a patron search 2/ Select 1 patron, and create a new list 'aaa' 3/ Select another patron and click Save again 2 lists are created Test plan: 1/ Launch a patron search 2/ Select 1 patron, and create a new list 'aaa' The dropdown list should be populated with this new list, and should be selected 3/ Select another patron and click Save again Only 1 list should be created Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit e2e50e0b06587f45c5370b313ff7a7d7a432bcd5 Author: Jonathan Druart Date: Wed Jul 15 11:36:26 2015 +0100 Bug 12525: FIX patron lists dropdown is empty On the patrons home page, the dropdown list is not populated. Test plan: 1/ Go on the patrons home page (members/members-home.pl) 2/ Launch a search 3/ The dropdown list close to "Add selected patrons to" should contain all your patron lists NOTE: Initially tested with both which created lists. git reset --hard origin/master And then dropdown list was missing them. Applied just this one, and they were listed. Signed-off-by: Mark Tompsett Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 65ae7af277d6f64ef42f961c290ab92768a90df3 Author: Jonathan Druart Date: Fri Sep 4 14:53:37 2015 +0100 Bug 14343: Remove the DT pagination It does not make sense to have 2 paginations here. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 2dc5ae238ae0eb58040be4612cae641330b868ba Author: Lyon3 Team Date: Fri Jun 5 15:37:57 2015 +0200 Bug 14343: Incorrect links to results pages in Receive Shipment List Numbered links have incorrect url. Links to result pages don't work in Receive Shipment List (but fortunately, Next and Previous buttons work) It's because the booksellerid is not furnished in the url. Test Plan : 1) Go to Acquisitions module, enter a bookseller name that you know you can get many page of invoices for and search for it. 2) click on Receive shipment button. 3) On bottom of the first results page, click on page number 2 link. (cf joined screencast) You'll see that the results include invoices from other booksellerid. Indeed, I suppose that you get results from all booksellerid. Intall patch and redo 3 steps. NOTE: I did not follow this test plan. I read the acqui/parcels.pl code. The template parameter numbers is assigned in a function which has no reference to booksellerid at all! Additionally, the booksellerid is set directly elsewhere. It is also strange that the booksellerid references before and after this loop do not use the numbers.booksellerid, but just booksellerid. The change from numbers.booksellerid to booksellerid is correct! Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit fc4f7fe67577917df9ca4201257bea822832a3c4 Author: Fridolin Somers Date: Thu Aug 6 09:36:42 2015 +0200 Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit e0ed9cbcf60a74dbe2690e6c34c5a311744f49ae Author: Jonathan Druart Date: Thu Aug 6 07:19:06 2015 +0100 Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. Signed-off-by: Fridolin Somers Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 658e787834784dec7d7782f45061b66e22211423 Author: Blou Date: Wed Sep 2 09:59:45 2015 -0400 Bug 14726: Checkout summary doesn't show title Right after checking out, a small box appear with "Checkout out: Some Title (32154001669305). Due on 24/09/2015". The title doesn't appear anymore (since the move to db schemas). This fixes it. Test: 1) checkout ANY item, for ANY user 2) Look at summary right below the checkout input box. The title doesn't show up. 3) apply patch, reproduce same steps (after checkin if same item). Title appears. Signed-off-by: Andreas Hedstr?m Mace Signed-off-by: Jonathan Druart Todo: You need to track what are the queries generated here. Signed-off-by: Tomas Cohen Arazi commit 80abbe1fa358dee58580004e436aef3f0b449430 Author: Mason James Date: Sat Jul 25 20:51:52 2015 +1200 Bug 14602: Fix failing t/Creators.t test to test.. 1/ run t/Creators.t test from git repo, get a FAIL 2/ apply patch 3/ repeat step 1, get a PASS mason at xen1:~/g/k/3.16.x$ sudo koha-shell -c 'export PERL5LIB=/home/mason/g/k/3.16.x ; cd /home/mason/g/k/3.16.x ; prove -v t/Creators.t' k316x1 t/Creators.t .. 1..16 ok 1 - use C4::Creators; ok 2 - use C4::Creators::PDF; ok 3 - testing new() works ok 4 - testing pdf file created ok 5 - testing Add() works ok 6 - testing Bookmark() works ok 7 - testing Compress() works ok 8 - testing Font() works ok 9 - testing FontSize() is set to 12 by default ok 10 - testing FontSize() can be set to a different value ok 11 - testing Page() works ok 12 - testing StrWidth() returns correct point width ok 13 - testing Text() writes from a given x-value ok 14 - testing Text() writes to the correct x-value ok 15 - testing End() works ok 16 - test file /tmp/4YjPQDExeS created OK ok All tests successful. Files=1, Tests=16, 1 wallclock secs ( 0.03 usr 0.01 sys + 0.48 cusr 0.05 csys = 0.57 CPU) Result: PASS Signed-off-by: Liz Rea Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit bef18fad1e52292df5d8c641eac6ff31f5e4f7ed Author: Blou Date: Thu Sep 3 10:44:15 2015 -0400 Bug 14779: Cannot paginate reviews When having more than 20 (or numSearchResults) reviews waiting to be approved in /cgi-bin/koha/reviews/reviewswaiting.pl?status=1, the paging at the bottom only offset by 1 entry, instead of moving a full page (20 entries) ahead. The simple fix uses 'page' instead of 'offset'. TEST: 1) Modify numSearchResult preference to a low (5?) value. 2) create X comments, where X is greater than the value above. 3) approve them all (although this step is probably unnecessary) 4) Go to tools >> comments (approved comments tab) 5) You see X entries. Click on page 2 at bottom. Link should show "offset=2") 6) You get same results, except the first one which "slided out". Apply patch, redo step 4-5. With patch, paging works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit f4ccbcfabd73c8c1ed88c796bd3cb7febe0a68c8 Author: Jonathan Druart Date: Thu Sep 3 09:53:18 2015 +0100 Bug 14472: (follow-up) Wrong ISSN search index in record matching rules Follow-up for - it-IT unimarc - ru-RU unimarc - uk-UA unimarc Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 0b17dd3634948af0c92d5de023159fee4b8a3f5e Author: Amit Gupta Date: Mon Jun 29 21:42:08 2015 +0530 Bug 14472: Wrong ISSN search index in record matching rules To Test --------- 1) Apply the patch 2) Export some MARC bibliographic records from Koha 3) Import those same MARC bibliographic records using the "ISSN(022$a)" record matching rule. 4) The incoming records should match perfectly 5) Check the mysql tables (marc_matchers, matchpoints, matcher_matchpoints, matchpoint_components, matchpoint_component_norms) to make sure the values were inserted as expected. For new Koha installation 1) create the koha database 2) Go to the staff client page, and do a "fresh" install making sure to select lots of optional marc 21 matching rules so the .../marc21/optional/marc21_default_matching_rules.sql gets triggered. 3) Check the mysql tables (marc_matchers, matchpoints, matcher_matchpoints, matchpoint_components, matchpoint_component_norms) to make sure the values were inserted as expected. Bug 14472 - Added Atomic Update to fix wrong issn search index - Fix comments Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: admin/aqplan.pl | 5 ++--- ...472_Wrong_ISSN_search_index_in_record_matching_rules.sql | 1 + .../marc21/optional/marc21_default_matching_rules.sql | 2 +- .../marc21/optional/marc21_default_matching_rules.sql | 2 +- .../marc21/optional/marc21_default_matching_rules.sql | 2 +- .../marc21/Optionnel/marc21_default_matching_rules.sql | 2 +- .../marc21/optional/marc21_default_matching_rules.sql | 2 +- .../unimarc/opzionali/unimarc_default_matching_rules.sql | 2 +- .../marc21/optional/marc21_default_matching_rules.sql | 2 +- .../marc21/optional/marc21_default_matching_rules.sql | 2 +- .../marc21/optional/marc21_default_matching_rules.sql | 2 +- .../unimarc/optional/unimarc_default_matching_rules.sql | 2 +- .../marc21/optional/marc21_default_matching_rules.sql | 2 +- .../unimarc/optional/unimarc_default_matching_rules.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 10 ++++++++++ members/members-home.pl | 2 ++ reviews/reviewswaiting.pl | 5 +++-- t/Creators.t | 11 ++++++----- 21 files changed, 40 insertions(+), 26 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_14472_Wrong_ISSN_search_index_in_record_matching_rules.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 7 17:09:49 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Sep 2015 15:09:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-537-g73e9dcb 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 73e9dcb70fcf24dc87af7c5af6f38102206863ae (commit) via ea92a92f5384c3256de55b770d31342f796edc47 (commit) via 40fc2a99c19de69feb8e10a49441d701c9e6e0e8 (commit) via 2afaddb592cdf0937dc0f2de3c80d65ee7f83ffb (commit) via 7587e7c752fc33788416e351e15154cf843fe18c (commit) via e2a87c54c0c7d26d131e0bff147d6bab1bcaa792 (commit) via 48e3e1ab275c999acb9ec5150f27b22394642c5b (commit) via 44a4e043a5b9332595a58e4f9d9eb8f4eb8353c0 (commit) from 7f65aaac748833b57f9f1c8ae754d66c7e144d81 (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 73e9dcb70fcf24dc87af7c5af6f38102206863ae Author: Kyle M Hall Date: Mon Aug 31 09:36:02 2015 -0400 Bug 14760: Disabled courses display in the course reserves list for items If an item is on reserve for two courses but one of those courses is disabled, both courses are still listed on opac-detail.pl! Test Plan: 1) Enable course reserves 2) Create two courses 3) Place one item on reserve for both courses 4) Disable one of the two courses 5) View the record details for that record/item 6) You should see both courses listed in the course reserves column 7) Apply this patch 8) Reload the page 9) You should now only see the active course in the course reseves column Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit ea92a92f5384c3256de55b770d31342f796edc47 Author: Jonathan Druart Date: Tue Aug 4 10:38:29 2015 +0100 Bug 14470: Do not allow renew for on-site checkouts At the opac, the renew checkbox should not be displayed if it's an on-site checkout (same on the intranet). On the way, this patch adds a specific message to the intranet if the librarian try to renew an on-site checkout. Indeed before this patch a renew was allowed if the barcode was scanned. Test plan: 1/ Create an on-site checkout for a patron 2/ Confirm that the checkbox 'renew' is not displayed on the checkout list tables 3/ At the OPAC, the renew should not be allowed (no checkbox) 4/ Try to check the item out to the same patron, confirm that you get a specifig message to inform you the renew is not allowed for on-site checkouts. Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Changed 'issue' to 'item' in the error message. Signed-off-by: Tomas Cohen Arazi commit 40fc2a99c19de69feb8e10a49441d701c9e6e0e8 Author: Tomas Cohen Arazi Date: Thu Sep 3 10:13:18 2015 -0300 Bug 14639: (QA followup) make schema mandatory This patch makes the 'schema' param mandatory. It is passed in every call on the current codebase, so it makes no harm now, but makes the code less error-prone. Tests for this situation are added to t/Koha_MetadataRecord.t (schema param is omitted and new() returns undef and a carped warning). Signed-off-by: Tomas Cohen Arazi commit 2afaddb592cdf0937dc0f2de3c80d65ee7f83ffb Author: Tomas Cohen Arazi Date: Mon Aug 3 11:41:23 2015 -0300 Bug 14639: Extend Koha::MetadataRecord to handle serialization format and record id The description of this changes is on the regression tests commit message. To test: - Apply the test patch - Run $ prove t/Koha_MetadataRecord.t => FAIL: Tests fail because changes are not implemented - Apply this patch - Run $ prove t/Koha_MetadataRecord.t => SUCCESS: tests pass - Run $ prove t/Koha_Util_MARC.t => SUCCESS: it still passes - Sign off :-D NOTE: Tested as above. Read code. Seems to cover all cases. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 7587e7c752fc33788416e351e15154cf843fe18c Author: Tomas Cohen Arazi Date: Mon Aug 3 11:37:36 2015 -0300 Bug 14639: (regression tests) Extend Koha::MetadataRecord to handle serialization format and record id In order to use Koha::MetadataRecord as a container for moving records around it is important to let it carry the serialization format of the record object it was built with, so it is easier and cheaper to make decisions about records. This patch introduces regression tests for the changes to be made. The 'format' param is introduced, and also sets default values: schema => 'marc21' format => 'MARC' A new (optional) 'id' param is added so the record carries its own id outside of it. The default behaviour is preserved, and no changes are needed in places Koha::MetadataRecord is used. ->new also returns undef if no record is passed, and raises a carped warning. To test: - Apply this test patch - Run the new tests $ prove t/Koha_MetadataRecord.t => FAIL: Tests shoud fail as the changes are not implemented on Koha::MetadataRecord Edit: made serialization format be upper-case to match what is used on Koha::Filter's Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit e2a87c54c0c7d26d131e0bff147d6bab1bcaa792 Author: Marcel de Rooy Date: Tue Sep 1 15:39:16 2015 +0200 Bug 14702: [QA Follow-up] More readable variable names, less queries The names are much better now :) Combined the queries for items and issues. Only check the number of holds when needed. Test plan: Verify the changes here by running the unit test again. Signed-off-by: Jonathan Druart Signed-off-by: Joonas Kylm?l? Signed-off-by: Tomas Cohen Arazi commit 48e3e1ab275c999acb9ec5150f27b22394642c5b Author: Marcel de Rooy Date: Fri Aug 21 13:00:11 2015 +0200 Bug 14702: Unit tests for GetReserveFee and ChargeReservesFee Test plan: Run the test: t/db_dependent/Reserves/GetReserveFee.t Signed-off-by: Joonas Kylmala Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 44a4e043a5b9332595a58e4f9d9eb8f4eb8353c0 Author: Marcel de Rooy Date: Fri Aug 21 11:44:55 2015 +0200 Bug 14702: Refactor GetReserveFee The code of GetReserveFee was not very clear. What it did was: check if there are some items not issued. If so and there are no holds, calculate no fee. While doing so, I moved the code to charge the fee (in AddReserve) to a small new sub ChargeReserveFee. There is no change in behavior. The follow-up patch adds unit tests. Test plan: [1] Make sure that a patron category (X) includes a hold fee. [2] Select a biblio with 2 items. [3] Issue one item to another patron. [4] Place a hold on this biblio by patron with category X. No charge? [5] Cancel the hold from the previous step. [6] Use another patron to place another hold on this biblio. [7] Place hold again by patron with category X. Is it charged? [8] Cancel that hold again. Issue the second item to another patron. [9] Place hold again by patron with category X. Is it charged again? Signed-off-by: Joonas Kylm?l? Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 8 +- C4/Reserves.pm | 142 +++++++------------- Koha/MetadataRecord.pm | 71 +++++++++- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 26 ++-- .../prog/en/modules/circ/circulation.tt | 4 + .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 18 +-- t/Koha_MetadataRecord.t | 64 ++++++++- t/db_dependent/Circulation.t | 38 +++++- t/db_dependent/Reserves/GetReserveFee.t | 127 +++++++++++++++++ 9 files changed, 374 insertions(+), 124 deletions(-) create mode 100755 t/db_dependent/Reserves/GetReserveFee.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 7 17:23:54 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Sep 2015 15:23:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-541-gbdf4894 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 bdf4894c507f4bac6b2b79c7ca3b7a556d246ed5 (commit) via 9b8d7168beb27342c4c483a0812e3a6789fabced (commit) via 5b1c7e4c359e974e5aca801579db72b356741a0f (commit) via 46ac35f8e11c06a784ca309b0dc876aff9469edb (commit) from 73e9dcb70fcf24dc87af7c5af6f38102206863ae (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 bdf4894c507f4bac6b2b79c7ca3b7a556d246ed5 Author: Marcel de Rooy Date: Tue Sep 1 16:11:54 2015 +0200 Bug 14683: [QA Follow-up] Similar change for staff Script memberentry.pl contained a similar line. Solution is simpler here. Test plan: [1] Add, change or clear the sms number at staff side. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 9b8d7168beb27342c4c483a0812e3a6789fabced Author: Marcel de Rooy Date: Fri Aug 28 09:13:09 2015 +0200 Bug 14683: [QA Follow-up] Mixup between mobile and smsalertnumber This is an issue discussed on older reports already in the past. Column mobile in borrowers is actually 'Other phone', not necessary a mobile number. The name of the field is confusing. (Renaming it is outside the scope of this report.) The field that we are editing here is smsalertnumber. It should not be compared with mobile at all. What could be the side-effect of this correction? === First, the change is only relevant for libraries with pref SMSSendDriver enabled. In the past patrons editing their message preferences saw mobile (read: other phone) in their smsalertnumber field (if the latter was still empty). If they saved it, it was copied to smsalertnumber. This change does not affect these patrons. They just have the same number in two columns. No big deal. What if a patron does not yet have a smsalertnumber? In that case no sms is sent in Letters.pm. So no change in behavior. If he submits opac-messaging now, he will no longer copy his other phone to smsalert [we cannot assume that it was mobile anyway!]. If he enters a mobile number, it will be saved correctly in the right field. Conclusion: this change will not break things or hurt anyone. It only prevents unwanted copying other phone to smsalertnumber. Also modified the compare to prevent uninitialized warnings. And removed a commented warn. Test plan: [1] Add, edit or delete the SMS number on opac-messaging regardless of the value of Other Phone (in the badly named mobile field). Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 5b1c7e4c359e974e5aca801579db72b356741a0f Author: Joonas Kylm?l? Date: Wed Aug 19 11:42:50 2015 +0000 Bug 14683: Unable to clear SMS number Enables to clear SMS number. To test: 1. Go to opac-messaging.pl 2. Insert SMS number and submit 3. Clear SMS number and submit 4. Observe that the sms number did not change 5. Apply patch 6. Clear SMS number and submit 7. Observe that the sms number changes Sponsored-by: Vaara-kirjastot Signed-off-by: Marcel de Rooy Adding a follow-up. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 46ac35f8e11c06a784ca309b0dc876aff9469edb Author: Lari Taskula Date: Thu Jul 30 18:34:49 2015 +0300 Bug 14621: Messaging preferences table needs to be sorted I have been working with messaging preferences and I noticed a weird issue in Firefox on Ubuntu. On messaging preferences page, the table is unsorted and the content in rows are generated randomly on every page refresh. When you select/deselect checkboxes and refresh the page (without posting the changes), Firefox will remember your choices. Now the issue is that when the table is unsorted and the rows keep changing on page refresh, Firefox has trouble remembering your choices. This makes it appear as if the checkboxes are magically changing values on each page refresh. Here is a patch that prevents this problem by sorting the messaging settings. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Members/Messaging.pm | 3 +++ members/memberentry.pl | 14 +++++--------- opac/opac-messaging.pl | 10 ++++------ 3 files changed, 12 insertions(+), 15 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 7 19:10:23 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Sep 2015 17:10:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-557-g8dfde8b 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 8dfde8b85a6eeea4db4f79e35d6540d0bfc9cdf4 (commit) via d0618a9d31a1d98cc115564cb889bee1b958b358 (commit) via cc2452df238217efc06182a47dc8210910b5b262 (commit) via 95286aad85d246bd7ac9280186cff7ec07fb833c (commit) via d997b0b1f0b148d7157c8ae7363c47974fcb368d (commit) via 39ed3dce71e535e16753413df7635c1942cc02cc (commit) via c3d08f27d30414a0100d8cbc34d0e808837af319 (commit) via 6bb1ed4fbb06579a0fccc4da8a7e991888791a44 (commit) via 563cbf79bacc0a325d78f4fc634a8d50c73e2a88 (commit) via 7479fde63270d3858bab2858ae87fbc0a80e0fb5 (commit) via 885c0334da6008b58bd009cd67d611e7ecb67bfe (commit) via 7c350a279887ad94ad4da67a15c82dd89fa1f0b8 (commit) via 5cadaeb0f202780ce7165b62043c19e748a087ba (commit) via 59f0d2ee582d9acf24205de99c0615c443251ed6 (commit) via e55f98de7c7c269e72334b9d6f2c85c1f525c4ca (commit) via b5a3500e355a2fdccfe3dbfaec9fc106ad3fab60 (commit) from bdf4894c507f4bac6b2b79c7ca3b7a556d246ed5 (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 8dfde8b85a6eeea4db4f79e35d6540d0bfc9cdf4 Author: Tomas Cohen Arazi Date: Mon Sep 7 14:07:47 2015 -0300 Bug 14472: DBRev 3.21.00.026 Signed-off-by: Tomas Cohen Arazi commit d0618a9d31a1d98cc115564cb889bee1b958b358 Author: Tomas Cohen Arazi Date: Mon Sep 7 14:05:39 2015 -0300 Bug 12357: DBRev 3.21.00.025 Signed-off-by: Tomas Cohen Arazi commit cc2452df238217efc06182a47dc8210910b5b262 Author: Mark Tompsett Date: Mon May 25 00:22:07 2015 -0400 Bug 12357: Following whitespace failures on koha qa test tools. TEST PLAN --------- 1) Apply all patches before this. 2) run koha qa test tools -- whitespace failures 3) Apply this patch 4) run koha qa test tools -- no whitespace failures. NOTE: More tabs were fixed than required, to also clean up a little indenting. Signed-off-by: Bernardo Gonzalez Kriegel Koha-qa tools now happy Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 95286aad85d246bd7ac9280186cff7ec07fb833c Author: Mark Tompsett Date: Mon May 25 00:06:24 2015 -0400 Bug 12357: Fix comma issues related to additional fields. TEST PLAN --------- 1) Apply patches, except this one. 2) prove t/db_dependent/Record.t -- fails like comment #38 3) Apply this patch 4) prove t/db_dependent/Record.t -- now it passes. 5) koha qa test tools. Signed-off-by: Bernardo Gonzalez Kriegel Make test work, koha-qa problems fixed in next patch Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit d997b0b1f0b148d7157c8ae7363c47974fcb368d Author: Kyle M Hall Date: Tue Apr 28 08:56:49 2015 -0400 Bug 12357: [QA Followup] - Unit Test Signed-off-by: Bernardo Gonzalez Kriegel This works with next patch Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 39ed3dce71e535e16753413df7635c1942cc02cc Author: Kyle M Hall Date: Fri Jan 23 07:11:36 2015 -0500 Bug 12357: Enhancements to RIS and BibTeX exporting Some libraries would like to be able to add arbitrary fields to both the RIS and BibTeX citation formats that a record can be saved as from the staff intranet and public catalog. In addition, they would like to be able to override the default record type and use Koha's itemtype as the record type for those formats as well. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Add the following to the new syspref RisExportAdditionalFields: TY: 942$c LC: 010$a NT: [501$a, 505$g] 4) Find or create a record with an 010$a (lccn) field, a 501$a field, a 942$c field, and multiple 505$g fields. 5) Locate the record in the catalog, choose "Save" and select RIS 6) Inspect the downloaded file, note the replaced TY field, the LC field, and multiple NT fields 7) Add the following to the new syspref BibtexExportAdditionalFields: '@': 942$c lccn: 010$a notes: [501$a, 505$g] 9) Using the previously selected record, choose "Save" and select BIBTEX 10) Inspect the downloaded file, note the lccn, the multiple note fields, and the new record type value Signed-off-by: Frederic Demians Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit c3d08f27d30414a0100d8cbc34d0e808837af319 Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 13:34:01 2014 -0300 Bug 10963: Simplified creation - FA framework Patch 1/9 This patch modifies Fast Add framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 6bb1ed4fbb06579a0fccc4da8a7e991888791a44 Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 16:06:08 2014 -0300 Bug 10963: Revert old hidden values This patch reverts old hidden values to marc_subfield_structure. Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 563cbf79bacc0a325d78f4fc634a8d50c73e2a88 Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 14:59:07 2014 -0300 Bug 10963: Simplified creation - SER framework Patch 9/9 This patch rewrites SER framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 7479fde63270d3858bab2858ae87fbc0a80e0fb5 Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 14:52:38 2014 -0300 Bug 10963: Simplified creation - IR framework Patch 8/9 This patch rewrites IR framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 885c0334da6008b58bd009cd67d611e7ecb67bfe Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 14:46:43 2014 -0300 Bug 10963: Simplified creation - KT framework Patch 7/9 This patch rewrites KT framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 7c350a279887ad94ad4da67a15c82dd89fa1f0b8 Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 14:41:50 2014 -0300 Bug 10963: Simplified creation - AR framework Patch 6/9 This patch rewrites AR framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 5cadaeb0f202780ce7165b62043c19e748a087ba Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 14:35:15 2014 -0300 Bug 10963: Simplified creation - VR framework Patch 5/9 This patch rewrites VR framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 59f0d2ee582d9acf24205de99c0615c443251ed6 Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 14:27:38 2014 -0300 Bug 10963: Simplified creation - SR framework Patch 4/9 This patch rewrites SR framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit e55f98de7c7c269e72334b9d6f2c85c1f525c4ca Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 14:16:35 2014 -0300 Bug 10963: Simplified creation - CF framework Patch 3/9 This patch rewrites CF framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit b5a3500e355a2fdccfe3dbfaec9fc106ad3fab60 Author: Bernardo Gonzalez Kriegel Date: Sat Apr 12 14:05:48 2014 -0300 Bug 10963: Simplified creation - BKS framework Patch 2/9 This patch rewrites BKS framework Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Record.pm | 102 +- C4/Ris.pm | 195 +- Koha.pm | 2 +- ..._ISSN_search_index_in_record_matching_rules.sql | 1 - .../marc21/optional/marc21_fastadd_framework.sql | 224 +- .../optional/marc21_simple_bib_frameworks.sql |32541 +------------------- installer/data/mysql/sysprefs.sql | 2 + installer/data/mysql/updatedatabase.pl | 25 + .../en/modules/admin/preferences/cataloguing.pref | 23 + t/db_dependent/Record.t | 27 +- 10 files changed, 801 insertions(+), 32341 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_14472_Wrong_ISSN_search_index_in_record_matching_rules.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Sep 16 15:49:17 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 16 Sep 2015 13:49:17 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-572-g72d9c28 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 72d9c28bbf2b715fddc684fbb4a8b79c27a9fa49 (commit) via cef7cd40ce5b2fe1505245cf232d4338b10eba3e (commit) via d671b8661cf02d8b039eb5230ab732fd1fde2301 (commit) via f062542978ec6841948bf3e25c053762684346e9 (commit) via 0b6460b1916aaa6b08f2f12fd3d6832c3715db3f (commit) via c7a6745bc0e0241e5f39a12e2ff4e17678288b14 (commit) via 9f8f33e351e1ae5810441a0c9ff7226aafb63c8b (commit) via cb4ce631c316a41ac47a17bfdaa4e5591e0e37df (commit) via a71cc14a52589f45bc30dad81b8c7fc0ac35d9fc (commit) via f704fbebd86e0034cf285b2dd29c0d85cb2086a2 (commit) via 70133ef343e7885b4d237e51351bf05f4e490850 (commit) via 8b710d62d1414a89b686f3a440bf03552e7e1d04 (commit) via fdc859281cc2af56431d183c3341ec9f8d4f672c (commit) via aaf2903cc0e86a2e59b3c7e223d7d8a85778ca0d (commit) via cb2151529e0c2d031a01e68bd5deab26d2ffbaff (commit) from 8dfde8b85a6eeea4db4f79e35d6540d0bfc9cdf4 (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 72d9c28bbf2b715fddc684fbb4a8b79c27a9fa49 Author: Marcel de Rooy Date: Mon May 18 14:19:19 2015 +0200 Bug 13622: [QA Follow-up] Add unit test descriptions This report adds a few unit tests for datonly flag in notices. This patch adds (very trivial) unit test descriptions. Signed-off-by: Marcel de Rooy Signed-off-by: Indranil Das Gupta (L2C2 Technologies) Signed-off-by: Tomas Cohen Arazi commit cef7cd40ce5b2fe1505245cf232d4338b10eba3e Author: Jonathan Druart Date: Mon Jan 26 17:24:36 2015 +0100 Bug 13622: Display a datetime without time in a notice For some needs, a librarian would like to display a datetime or timestamp field without the time. This patch adds filter logic in the notice/letter parsing process. Test plan: 1/ Defined a notice using a datetime or timestamp DB field (biblio.timestamp for instance). 2/ Generate the notice 3/ Verify that the letter is generated with the time 4/ Use the "dateonly" filter like: <> <> 5/ Generate the notice 6/ Confirm the the letter is generated without the time for this field. Signed-off-by: Marcel de Rooy Signed-off-by: Indranil Das Gupta (L2C2 Technologies) Updated the count of tests to 64 for t/db_dependent/Letters.t to pass Signed-off-by: Tomas Cohen Arazi commit d671b8661cf02d8b039eb5230ab732fd1fde2301 Author: Jonathan Druart Date: Mon Sep 14 10:28:01 2015 +0100 Bug 14813: Fix encoding issues on editing help pages It has been introduced by bug 11944. Test plan: 1/ Install and set the fr-FR language (or ar-Arab). 2/ Go on the help page and edit it. 3/ The textarea should not contain encoding issues with this patch. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit f062542978ec6841948bf3e25c053762684346e9 Author: Jonathan Druart Date: Thu Jul 9 09:35:12 2015 +0100 Bug 14197: TestBuilder - Remove the error on starting the transaction DBD::mysql::db begin_work failed: Already in a transaction at /usr/share/perl5/DBIx/Class/Storage/DBI.pm line 1560. DBIx::Class::Storage::DBI::txn_rollback(): Storage transaction_depth 0 does not match false AutoCommit of DBI::db=HASH(0xa429648), attempting ROLLBACK anyway at t/lib/TestBuilder.pm line 363 Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 0b6460b1916aaa6b08f2f12fd3d6832c3715db3f Author: Jonathan Druart Date: Wed May 13 17:58:45 2015 +0200 Bug 14197: Remove the warning on destroying TestBuilder objects This module will be called by db_dependent tests, which already create a transaction. TestBuilder creates a new one (which is certainly useless) and the rollback does not do anything. To see the warning see patches on bug 14045. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit c7a6745bc0e0241e5f39a12e2ff4e17678288b14 Author: Jonathan Druart Date: Fri Jul 10 15:18:48 2015 +0100 Bug 8723: Update hold_fill_targets, tmp_holdsqueue and linktracker tables Same as previous patch for 3 other tables. Test plan: Same as before but the hold should exist to the 3 tables before the move. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 9f8f33e351e1ae5810441a0c9ff7226aafb63c8b Author: Jonathan Druart Date: Fri Jul 10 15:04:55 2015 +0100 Bug 8723: Update the reserves table for item-level holds If an item is moved from a biblio to another, the holds should be updated too. See discussion on the bug report for more information. Test plan: 1/ Place a item-level hold on biblio1 2/ Move the item to biblio2 3/ Confirm that the hold still exists and point to the biblio2 This patch should not change the existing behavior for bib-level holds. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit cb4ce631c316a41ac47a17bfdaa4e5591e0e37df Author: Jonathan Druart Date: Fri Jul 10 14:15:42 2015 +0100 Bug 8723: Cover the existing behavior This patch cover the MoveItemFromBiblio subroutine Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit a71cc14a52589f45bc30dad81b8c7fc0ac35d9fc Author: Marc V?ron Date: Sat Sep 5 16:41:58 2015 +0200 Bug 14782: Add possibility to search patrons using the username (userid) This patch makes it possible to search for users using the username (userid / login name). To test: - Apply patch - Do searches from Home > Patrons - Search after a full username or parts of a username with Search fields = Standard and Search fields = Userid - Perform the searches from the top bar (expand with [+]) and from the "Filters" part at the left - Make sure that other searches behave as before Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit f704fbebd86e0034cf285b2dd29c0d85cb2086a2 Author: Katrin Fischer Date: Sun Sep 13 18:06:46 2015 +0200 Bug 14782: Add tests Run: perl t/db_dependent/Utils/Datatables_Members.t Signed-off-by: Tomas Cohen Arazi commit 70133ef343e7885b4d237e51351bf05f4e490850 Author: Marcel de Rooy Date: Mon Sep 14 11:11:11 2015 +0200 Bug 14801: Fix Reserves.t -- Follow-up for ChargeReserveFee The problem making some tests fail, actually was the unneeded addition of zero accountline records by ChargeReserveFee, called by AddReserve. The balance is still zero, but a test like !$var responds differently when var is 0.00 instead of 0 or undef. This patch adjusts the test in ChargeReserveFee in order to prevent adding these records with 0.00. The first patch that adjusts the tests in Reserves.t is not strictly needed anymore, but can stay. Test plan: [1] Run t/db_dependent/Reserves.t [2] Run t/db_dependent/Reserves/GetReserveFee.t Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 8b710d62d1414a89b686f3a440bf03552e7e1d04 Author: Marcel de Rooy Date: Thu Sep 10 16:39:51 2015 +0200 Bug 14801: Fix Reserves.t Fix the following errors: not ok 59 - Bug 14464 - No fines at beginning ok 60 - Bug 14464 - 1st reserve correctly created not ok 61 - Bug 14464 - No fines after cancelling reserve with no charge configured ok 62 - Bug 14464 - 2nd reserve correctly created not ok 63 - Bug 14464 - No fines after cancelling reserve with no charge desired Signed-off-by: Marcel de Rooy Signed-off-by: Marc Veron Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Amended the x==0 test with !x || x==0 to include 0.00 and prevent warn. Signed-off-by: Tomas Cohen Arazi commit fdc859281cc2af56431d183c3341ec9f8d4f672c Author: Jonathan Druart Date: Mon Sep 14 13:22:21 2015 +0100 Bug 14655: Fix wording Signed-off-by: Katrin Fischer Fixed a missing space after Error: :) Signed-off-by: Tomas Cohen Arazi commit aaf2903cc0e86a2e59b3c7e223d7d8a85778ca0d Author: Jonathan Druart Date: Tue Aug 18 18:15:02 2015 +0100 Bug 14655: Add a warning on the about page if patrons have requested privacy New warning on the about page if at least a patron has requested a privacy on checkin but the AnonymousPatron is not set to a valid patron. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit cb2151529e0c2d031a01e68bd5deab26d2ffbaff Author: Jonathan Druart Date: Tue Aug 18 18:10:37 2015 +0100 Bug 14655: Add a warning if the checkin will fail On the checkin and checkout page, the checkin will fail if the patron has requested the privacy and the AnonymousPatron is not correctly set. This patch adds a warning message on both pages. Test plan: 0/ Be sure you don't have any patron with privacy=2 (Never) 1/ Set OPACPrivacy, not AnonymousPatron 2/ Go on the checkin, you should a warning (same as before this patch). 3/ Set the privacy=2 for a patron 4/ Go on the circulation page, a warning should appear (for this specific patron) 5/ Check an item out to this patron 6/ Check the item in on the checkin page. The item is not checked in and you get a specific message for this patron. Confirm other/correct situations don't trigger the messages. Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 2 +- C4/Items.pm | 26 ++++-- C4/Letters.pm | 43 ++++++---- C4/Reserves.pm | 2 +- C4/Utils/DataTables/Members.pm | 3 +- about.pl | 5 ++ circ/returns.pl | 1 + edithelp.pl | 15 ++-- .../prog/en/includes/patron-search.inc | 5 ++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 + .../prog/en/modules/circ/circulation.tt | 5 ++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 9 ++- .../prog/en/modules/members/member.tt | 5 ++ svc/members/search | 2 +- t/db_dependent/Items/MoveItemFromBiblio.t | 84 ++++++++++++++++++++ t/db_dependent/Letters.t | 40 +++++++++- t/db_dependent/Reserves.t | 6 +- t/db_dependent/Utils/Datatables_Members.t | 25 +++++- t/lib/TestBuilder.pm | 8 +- 19 files changed, 245 insertions(+), 44 deletions(-) create mode 100644 t/db_dependent/Items/MoveItemFromBiblio.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Sep 16 16:02:57 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 16 Sep 2015 14:02:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-580-ga37b3bb 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 a37b3bb7f76b5ddea7400f5268c592c0cc578a8c (commit) via 10820de380695f90fd544b40b52682efcf83a962 (commit) via e5f604378a45d62e8b454cd390abb18b34ef53f8 (commit) via a2ca59efb877945f7b2ebc92e7643d4cdaf9d4e1 (commit) via ae5ee62d598ccb0cfe4fb6cc4a3b2ab6408febd8 (commit) via 704aed77ea03bf8a0a0e4ece457e91fb7937742d (commit) via 1acddd0f1b41e9e5f75b75d9d101c8b0879c00c5 (commit) via 224b1c7976567511f1d6715784274169e006edcf (commit) from 72d9c28bbf2b715fddc684fbb4a8b79c27a9fa49 (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 a37b3bb7f76b5ddea7400f5268c592c0cc578a8c Author: Kyle M Hall Date: Tue Aug 25 10:35:28 2015 -0400 Bug 14640: 'Cancel Hold' check box on check-out confirmation does not cancel the hold when item is checked out. This bug is dealing with the situation where an item is checked out to a patron that is not the next in line hold-wise for an item. In this case, Koha will warn the librarian that there are holds on the item and show the first person in line. Again, I want to stress that this is the case where the item *is not waiting* for a patron. The hold for the patron listed will just have a priority of 1. The only situation where the "Cancel hold" checkbox will function is when the priority 1 hold is an item level hold. This is due to the fact that CancelReserve is being passed the trio of biblionumber, borrowernumber, and itemnumber rather than the singular reserve_id. 1) place biblio level hold on a book to borrower A. 2) check out an item of the book to borrower B. 3) When confirming checkout, check the 'Cancel hold' check-box, and click the "Yes, check out" button. 4) Note the hold was not canceled 5) Apply this patch 6) Repeat steps 1 through 3 7) Note the hold was indeed canceled Signed-off-by: Joonas Kylm?l? Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 10820de380695f90fd544b40b52682efcf83a962 Author: Jonathan Druart Date: Tue Sep 1 10:52:51 2015 +0100 Bug 14640: Add tests Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit e5f604378a45d62e8b454cd390abb18b34ef53f8 Author: Jonathan Druart Date: Tue Jul 14 15:02:42 2015 +0100 Bug 10005: Inventory - Add an option to not check in items The inventory tools automatically check in items, this patch adds it as an option. Test plan: 1/ Check an item out, fill a file with its barcode, and use this file in the inventory tools. 2/ Check the new checkbox and confirm that the item is not checked in 3/ Repeat again and don't check it, the behavior should be the same as before this patch. Signed-off-by: Jason Robb Signed-off-by: Katrin Fischer Added a missing . Patch works as expected. Signed-off-by: Tomas Cohen Arazi commit a2ca59efb877945f7b2ebc92e7643d4cdaf9d4e1 Author: Jonathan Druart Date: Wed Sep 2 14:28:52 2015 +0100 Bug 7634: Prevent permanent_location to be set to NULL if not defined The permanent_location is correctly filled when an item is added from the cataloguing module (routine set_item_default_location from cataloguing/additem.pl). But when records are imported, this filled is not managed. It's only on editing (_do_column_fixes_for_mod called from ModItem). This patch set the permanent_location item fields to the location value for all items created, even the imported ones. Test plan: 0/ Do not apply this patch 1/ Import a record with items using the "Stage MARC for import" tool 2/ Check the values for the permanent_location in the items table. They are set to NULL 3/ Apply this patch 4/ Repeat 2 and confirm that now the permanent_location values are set to the location values. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit ae5ee62d598ccb0cfe4fb6cc4a3b2ab6408febd8 Author: Jonathan Druart Date: Wed Sep 2 14:46:02 2015 +0100 Bug 7634: Add tests Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 704aed77ea03bf8a0a0e4ece457e91fb7937742d Author: Jonathan Druart Date: Wed Sep 2 14:43:15 2015 +0100 Bug 7634: Make the tests pass This patch just fixed a master bug, if your database already has some items.homebranch set to CPL Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 1acddd0f1b41e9e5f75b75d9d101c8b0879c00c5 Author: Jonathan Druart Date: Tue Jul 14 11:38:41 2015 +0100 Bug 6756: Add info messages NOTE: Before patch "./misc/cronjobs/batch_anonymise.pl --help" had no message, and neither did the anonymizing tool in the staff client. After the patch, both had informative messages. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 224b1c7976567511f1d6715784274169e006edcf Author: Jonathan Druart Date: Tue Jul 14 11:30:51 2015 +0100 Bug 6756: Fix bad behaviors if AnonymousPatron is not defined There are at least 2 wrong behaviors if the AnonymousPatron pref is not defined (0 or empty string). 1/ If you use the clean borrower tools, you will get a successful message when the nothing happened (the history has not been anonymised). 2/ At the OPAC, if a patron ask for delete his reading history, he will get an error message "The deletion of your reading history failed, because there is a problem with the configuration of this feature. Please help to fix the system by informing your libr ary of this error". IMO this should not happen, the history should be anonymised. With this patch, the old_issues.borrowernumber field will be set to NULL if the AnonymousPatron pref if not defined. Test plan: 1/ Fill the pref with "" or 0 2/ At the OPAC, go on the privacy tab and click on the "Immedia deletion" button. You should get a green and friendly message. Confirm that the history has been anonymised. 3/ Use the "Batch patron anonymization" tools (tools/cleanborrowers.pl) to anonymize the checkout history. Confirm that a) it works and b) you get a message. Try again with AnonymousPatron set to a valid patron. You should not see any changes with the current behaviors. NOTE: This patch tweaks C4/Circulation.pm and provides tests. applying just this, and running prove success. Reverting just C4/Circulation.pm fails, as expected. Tested OPAC stuff with both patches applied. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 5 +- C4/Items.pm | 1 + C4/Reserves.pm | 6 +- .../prog/en/modules/tools/cleanborrowers.tt | 4 + .../prog/en/modules/tools/inventory.tt | 4 + misc/cronjobs/batch_anonymise.pl | 1 + t/db_dependent/Circulation/AnonymiseIssueHistory.t | 138 ++++++++++++++++++++ t/db_dependent/Circulation_issue.t | 26 ++-- t/db_dependent/Items.t | 18 ++- tools/inventory.pl | 19 +-- 10 files changed, 195 insertions(+), 27 deletions(-) create mode 100644 t/db_dependent/Circulation/AnonymiseIssueHistory.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 18 17:03:12 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 18 Sep 2015 15:03:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-598-gd810fd1 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 d810fd1094541ee4c95289df3f18bf765047335b (commit) via 811125e543be4d6da8033ebfc589d31064e18347 (commit) via 84e5c99d231753ab9aee7402b6c026dd66af9323 (commit) via cd104f0a90e27783b194d971c7b9fd553f39cbeb (commit) via 13fadc06da49414c78011a01554c7c6a16260059 (commit) via a92cb0d99c5722187fb965222d7f7e050849949b (commit) via 547ef37e044c062709e7bd02061a6a66a2b408f4 (commit) via bcb6e9ea39dce065e8c7ff80b4d1b7b49e1735f4 (commit) via e0e3efacca9e4e605f0e1c5612ace38194a2f878 (commit) via 51c67bc1395b5179f7a2d7f40608ba7d80449090 (commit) via ff807bc2442c229dc1d9a7833267240f4497460a (commit) via 8b24a09917018f0eddae2b809752fc857da6f5b2 (commit) via 2fe521d11c032bfaf85d84f7c7a704d08caa22e4 (commit) via 71160944702fd1e0fea0b840a67c7a4daa9e134a (commit) via 8e2bb13a25b55176fdd397a204a976f37e248e10 (commit) via 80aa17d266fdaea68a8669f41cab3054cff1b995 (commit) via 7349777f14b8d4c11f74da2098568a6966800e5a (commit) via e15621fee2693059cce67882691ad8eae9a5c9b7 (commit) from a37b3bb7f76b5ddea7400f5268c592c0cc578a8c (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 d810fd1094541ee4c95289df3f18bf765047335b Author: Aleisha Date: Wed Jul 22 01:37:30 2015 +0000 Bug 14585: Fixing up online help on main page To test: 1) Go to home page of staff client and click the Help 2) Notice: 'you should now 'got to' Koha' 'settings found in 'a'dministration.' (should be capitalized) 'Once that user is set you should use that user to log in rather than the root user set up as part of installation.' (could be worded better) 3) Apply patch, close Help, reload page, reopen Help 4) Notice: 'got to' --> 'go to' 'administration' --> 'Administration' 'Once that user is set you should use that user to log in rather than the root user set up as part of installation.' Signed-off-by: Joonas Kylm?l? Signed-off-by: Tomas Cohen Arazi commit 811125e543be4d6da8033ebfc589d31064e18347 Author: Jesse Weaver Date: Mon Sep 14 15:57:55 2015 -0600 Bug 14510: (QA followup) fix columns settings in other pages Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 84e5c99d231753ab9aee7402b6c026dd66af9323 Author: Jonathan Druart Date: Fri Sep 4 09:15:27 2015 +0100 Bug 14510: Redirect to the items' fields mapped Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit cd104f0a90e27783b194d971c7b9fd553f39cbeb Author: Jesse Weaver Date: Thu Aug 6 12:48:07 2015 -0600 Bug 14510: (QA followup) Fix bug with unmapped columns Fall back more smoothly when items subfields are not mapped to a kohafield. Note, however, that this development does not allow applying default settings to subfields that aren't mapped. A note has been added to the columns settings page, as there is no known workaround for this. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 13fadc06da49414c78011a01554c7c6a16260059 Author: Jesse Weaver Date: Thu Aug 6 12:48:07 2015 -0600 Bug 14510: (QA followup) Add more columns, resort Per a conversation with Jonathan Druart, add all columns that could be reasonably mapped, and order them the same as in kohastructure.sql. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit a92cb0d99c5722187fb965222d7f7e050849949b Author: Jesse Weaver Date: Thu Aug 6 12:48:07 2015 -0600 Bug 14510: (QA followup) remove extraneous whitespace Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 547ef37e044c062709e7bd02061a6a66a2b408f4 Author: Jesse Weaver Date: Thu Jul 9 16:26:36 2015 -0600 Bug 14510: Allow column visibility in additem.pl to be customized This patch adds the table of items on additem.pl to the columns customizer. Test plan: 1. Open item editor on a record, and verify that all columns are visible. 2. Apply patch. 3. Reload editor, and verify that column visibility hasn't changed. 4. Open "Hide/show columns," and verify that you can add and remove columns. 5. Change the visibility and togglability of some columns in columns_settings.pl, and verify that these correctly apply to additem.pl. NOTE: The columns that are configurable are selected from the non-hidden columns that have mappings to MARC subfields in the default MARC21 framework (and can thus be displayed in the item editor). Signed-off-by: Jenny Schmidt Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit bcb6e9ea39dce065e8c7ff80b4d1b7b49e1735f4 Author: Genevieve Plantin Date: Tue Sep 8 13:58:10 2015 -0400 Bug 13781: Fix missing heading columns for relative's checkouts table in check out patron page Theres was two missing heading columns Location and Fines in the Check out section of a Patron Tested both patches together. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit e0e3efacca9e4e605f0e1c5612ace38194a2f878 Author: Genevieve Plantin Date: Fri Sep 4 09:15:26 2015 -0400 Bug 13781: Fix relatives's checkouts missing heading columns There was two missing heading columns (location and fine) and one hidden heading missing column (this hidden column is needing for sorting the table) it was taking the due_date column for the hidden column, so I added them Both patches tested together. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 51c67bc1395b5179f7a2d7f40608ba7d80449090 Author: Alex Arnaud Date: Thu Aug 27 14:28:50 2015 +0200 Bug 12252: (follow-up) Include item data only in extended mode Fix perlcritic error. Signed-off-by: Signed-off-by: Gaetan Boisson Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit ff807bc2442c229dc1d9a7833267240f4497460a Author: Fr?d?ric Demians Date: Thu Jul 23 18:38:25 2015 +0200 Bug 12252: Include item data only in extended mode Previous patches attached to this bug have been refactored to merge bug 3206 and bug 13568 features. So OAI server must be carrefully tested to ensure that there is no regression in this area: deleted records and resumption token. This last patch fixed the way items are returned. They are returned only if OAI server operates in extended mode, and specifically for format having the parameter include_item set to 1 (true). For example this configuration file set via OAI-PMH:ConfFile syspref will return items: Signed-off-by: Signed-off-by: Gaetan Boisson Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 8b24a09917018f0eddae2b809752fc857da6f5b2 Author: Jonathan Druart Date: Wed Jan 7 15:29:50 2015 +0100 Bug 12252: (qa-follow-up) Remove perlcritic error Signed-off-by: Signed-off-by: Gaetan Boisson Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 2fe521d11c032bfaf85d84f7c7a704d08caa22e4 Author: Jonathan Druart Date: Fri Jan 2 15:46:03 2015 +0100 Bug 12252: Add tests for EmbedItemsInMarcBiblio Signed-off-by: Jonathan Druart Signed-off-by: Signed-off-by: Gaetan Boisson Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 71160944702fd1e0fea0b840a67c7a4daa9e134a Author: Robin Sheat Date: Mon Jun 23 17:16:50 2014 +1200 Bug 12252: include item data in OAI-PMH ListRecords result Same in spirit to the other patch, this also includes the item detail in ListRecords. Test plan: * Fetch a URL like: http://koha/cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marcxml * Verify that there are 952 entries in the returned records where appropriate. Signed-off-by: Frederic Demians ListRecords OAI verb returns a list of records including items in 952/995 which are not hidden based on OpacHiddenItems syspref. Signed-off-by: Jonathan Druart Signed-off-by: Signed-off-by: Gaetan Boisson Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 8e2bb13a25b55176fdd397a204a976f37e248e10 Author: Robin Sheat Date: Tue May 20 17:15:52 2014 +1200 Bug 12252: OAI-PMH items respect OpacHiddenItems This allows the OAI-PMH service to not provide item information when there is a rule that would supress it in OpacHiddenItems. Test plan: * Find an OAI-PMH URL that shows you some items. * Add an entry to OpacHiddenItems that would block that. * Check that it's blocked. Signed-off-by: Frederic Demians Tested, playing with OpacHiddenItems. GetRecord OAI verb returns a record complying with OpacHiddenItems rules, for example without items from a specific library. Signed-off-by: Jonathan Druart Signed-off-by: Signed-off-by: Gaetan Boisson Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 80aa17d266fdaea68a8669f41cab3054cff1b995 Author: Robin Sheat Date: Wed May 14 14:39:03 2014 +1200 Bug 12252: OAI-PMH result includes item data GetRecord for OAI-PMH was pulling the MARCXML directly from the database. Now it uses GetMarcBiblio and includes the item data with it, making it more generally useful. Test plan: * Run an OAI-PMH query, for example: http://koha/cgi-bin/koha/oai.pl?verb=GetRecord&identifier=KOHA-OAI-TEST:52&metadataPrefix=marcxml to fetch biblionumber 52 * Note that it doesn't include the 952 data * Apply the patch * Do the same thing, but this time see that the 952 data is at the bottom of the MARCXML. Note: * This patch also includes a small tidy-up in C4::Biblios to group things semantically a bit better, so I don't spend ages looking for a function that was staring me in the face all along again. Signed-off-by: David Cook Works as described. Simple yet useful patch. Signed-off-by: Jonathan Druart Signed-off-by: Frederic Demians 952/995 item fields are back in response to GetRecord OAI verb. Signed-off-by: Jonathan Druart Signed-off-by: Signed-off-by: Gaetan Boisson Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 7349777f14b8d4c11f74da2098568a6966800e5a Author: Tomas Cohen Arazi Date: Wed Sep 16 11:51:12 2015 -0300 Bug 14245: (QA followup) already global The original patch correctly unmasks the global variable (by removing the 'my' on the marc2ris function, but wrongly introduces a new global variable. Signed-off-by: Tomas Cohen Arazi commit e15621fee2693059cce67882691ad8eae9a5c9b7 Author: Bernardo Gonzalez Kriegel Date: Thu May 21 14:00:05 2015 -0300 Bug 14245: Problems with RIS export in unimarc Variable $itype is used an all C4/Ris.pm to switch between marc falvors, but is local and not passed along as argument. As a quick solution, is defined as global To test: 1) On UNIMARC setup, export a record as RIS, check that author (and other fields) are displayed incorrectly 2) Apply the patch 3) Export again, improved results 4) Run t/Ris.t There are other problems in this script, needs maintenance (e.g. no Modern::Perl friendly) Signed-off-by: Victor do Ros?rio Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 84 +++++++++++++----- C4/Ris.pm | 6 +- admin/columns_settings.yml | 71 +++++++++++++++ cataloguing/additem.pl | 7 ++ .../prog/en/includes/columns_settings.inc | 8 +- .../prog/en/modules/admin/columns_settings.tt | 5 ++ .../prog/en/modules/cataloguing/additem.tt | 24 ++++-- .../prog/en/modules/circ/circulation.tt | 2 + .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 6 +- .../prog/en/modules/members/moremember.tt | 3 + opac/oai.pl | 82 ++++++++++++------ t/db_dependent/Items.t | 91 +++++++++++++++++++- 12 files changed, 323 insertions(+), 66 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 18 17:44:02 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 18 Sep 2015 15:44:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-605-g1e93bd3 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 1e93bd3a94ddb94f0d2ed2dee2e5dee6b73ad808 (commit) via 2fbaac98da391f029c920b4e7656ff0e09c3ae75 (commit) via 5dceb851dd8b186dd6a9b4bf4e032bbe1ea81865 (commit) via 01abfbd70290ee0a55e2362a634ead28586086a2 (commit) via 165da52e783fc5275a36af3c82bf1dfb1a28e3c9 (commit) via 2eeb2de909038b12aa0f03203a29f4a413af8e19 (commit) via 7a2816edb146a3586a9754f0e6f3ca6c161bffd4 (commit) from d810fd1094541ee4c95289df3f18bf765047335b (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 1e93bd3a94ddb94f0d2ed2dee2e5dee6b73ad808 Author: Marcel de Rooy Date: Thu Sep 3 12:16:08 2015 +0200 Bug 13813: [QA Follow-up] Fix some tabs for qa tools FAIL C4/Barcodes/annual.pm FAIL forbidden patterns forbidden pattern: tab char (line 86) forbidden pattern: tab char (line 51) FAIL C4/Barcodes/hbyymmincr.pm FAIL forbidden patterns forbidden pattern: tab char (line 108) forbidden pattern: tab char (line 78) Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 2fbaac98da391f029c920b4e7656ff0e09c3ae75 Author: Marc V?ron Date: Thu Sep 3 11:46:09 2015 +0200 Bug 13813: Remove deprecated module C4::Dates from system Changes for QA comment #165 circ/transferstoreceive.pl 'iso' added circ/waitingreserves.pl 'iso' added members/printinvoice.pl 'iso' removed Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 5dceb851dd8b186dd6a9b4bf4e032bbe1ea81865 Author: Marc V?ron Date: Thu Mar 12 15:00:11 2015 +0100 Bug 13813: Remove deprecated module C4::Dates from system Test plan: See Bugzilla. Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 01abfbd70290ee0a55e2362a634ead28586086a2 Author: Kyle M Hall Date: Wed Sep 16 10:33:09 2015 -0400 Bug 11368: [QA Followup 2] Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 165da52e783fc5275a36af3c82bf1dfb1a28e3c9 Author: Kyle M Hall Date: Thu May 14 08:21:10 2015 -0400 Bug 11368: [QA Followup] * Fix QA failures * Fix copyright * Add file format documentation * Add -c --confirm option * Add -t --test option * Add -h --help option Signed-off-by: Tomas Cohen Arazi commit 2eeb2de909038b12aa0f03203a29f4a413af8e19 Author: Kyle M Hall Date: Tue Dec 10 10:26:48 2013 -0500 Bug 11368: Add script to import Lexile scores Koha needs a script to automate the importing of Lexile score data for titles that have available scores but are not currently in the title's record. This script will take a CSV file of Lexile scores, and locate any matching records in the Koha database ( by ISBN ). If the record already has a score, it will be updated. If not, the Lexile score field will be created. Test Plan: 1) Apply this patch 2) Catalog a record for each of the following ISBNs: 0789170191 9780673779410 3) Download the file LexileTitlesTruncated.txt attached to this bug report 4) Run the script from the command line: ./misc/migraction_tools/import_lexile.pl -v --file /path/to/LexileTitlesTruncated.txt 5) View those records in Koha 6) Note those records now have valid Lexile scores 7) Edit the Lexile score ( 521$a ) and change the value to something else 8) Repeat step 4 9) Note the original Lexile score has been restored Signed-off-by: Mirko Tietgen Signed-off-by: Tomas Cohen Arazi commit 7a2816edb146a3586a9754f0e6f3ca6c161bffd4 Author: Tomas Cohen Arazi Date: Fri Sep 18 12:34:45 2015 -0300 Bug 14472: (QA followup) fix updatedatabase.pl for multiple ISSN rules If (for some reason) the user has created more than one matching rule with the 'ISSN' code, the updatedabase.pl script fails, because it was written with the default data in mind, and didn't consider the scenario described above. Thanks Liz for pointing this out! Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 5 +- C4/Barcodes.pm | 1 - C4/Barcodes/annual.pm | 13 +- C4/Barcodes/hbyymmincr.pm | 27 ++-- C4/Biblio.pm | 1 - C4/HoldsQueue.pm | 1 - C4/Items.pm | 16 +- C4/Log.pm | 6 +- C4/NewsChannels.pm | 8 +- C4/Output.pm | 1 - C4/Suggestions.pm | 9 +- Koha/Borrower/Files.pm | 1 - Koha/Misc/Files.pm | 1 - cataloguing/value_builder/barcode.pl | 4 +- cataloguing/value_builder/barcode_manual.pl | 4 +- cataloguing/value_builder/dateaccessioned.pl | 5 +- circ/transferstoreceive.pl | 4 +- circ/waitingreserves.pl | 5 +- installer/data/mysql/updatedatabase.pl | 2 +- members/notices.pl | 1 - members/printinvoice.pl | 4 +- members/readingrec.pl | 5 +- misc/migration_tools/import_lexile.pl | 207 ++++++++++++++++++++++++++ opac/opac-messaging.pl | 1 - opac/opac-privacy.pl | 1 - opac/opac-user.pl | 4 +- tags/list.pl | 1 - tools/koha-news.pl | 6 +- tools/scheduler.pl | 6 +- tools/viewlog.pl | 1 - 30 files changed, 271 insertions(+), 80 deletions(-) create mode 100755 misc/migration_tools/import_lexile.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 21 04:40:36 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 21 Sep 2015 02:40:36 +0000 Subject: [koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-4-g27a0e22 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, 3.18.x has been updated via 27a0e22440d348d29a5dac20215c9a2a9cdcd808 (commit) via cc1ec828c110a19edb61fa316d1399695d444b81 (commit) via a86e1ca364f95b34871d6185a042aeadbdd9cdb2 (commit) via e2a3e25a56c64741c6ea04072b1cb2aef6aac3a8 (commit) from f9adbd885ac9295bcdb301955e7fc785a8aa07da (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 27a0e22440d348d29a5dac20215c9a2a9cdcd808 Author: Liz Rea Date: Mon Sep 21 14:40:08 2015 +1200 Catching up dbix updates commit cc1ec828c110a19edb61fa316d1399695d444b81 Author: Liz Rea Date: Mon Sep 21 14:30:47 2015 +1200 Bug 14205: RM followup - DBIx updates commit a86e1ca364f95b34871d6185a042aeadbdd9cdb2 Author: Liz Rea Date: Mon Sep 21 14:22:49 2015 +1200 DBRev 3.18.10.01 commit e2a3e25a56c64741c6ea04072b1cb2aef6aac3a8 Author: Jonathan Druart Date: Tue Aug 4 10:00:51 2015 +0100 Bug 14205: Deleting an Item/Record does not remove link to course reserve A constraint is missing on the course_reserves.ci_id field. This patch adds it and removes orphan rows. Test plan: 0/ Don't apply the patch 1/ Login to Staff Site. 2/ Go to Course Reserves 3/ Create Course 4/ Add Reserve 5/ Go to item added (delete item/record) 6/ Refresh Course (see no items attached) 7/ Delete Course 8/ See course still listed in the courses (Not deleted) 9/ Apply the patch and execute the updatedatabase entry. 10/ Delete the Course Note that the course has correctly been removed. NOTE: Make sure to set the UseCourseReserves system preference to test. Tested before (problem existed) and after (problem solved) update. Dropped DB, web installed, and put in dummy data and retested. Problem solved. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/AuthorisedValue.pm | 133 +++++++++++++++++- Koha/Schema/Result/BorrowerAttributeType.pm | 179 ++++++++++++++++++++++++ Koha/Schema/Result/CourseItem.pm | 201 +++++++++++++++++++++++++++ Koha/Schema/Result/CourseReserve.pm | 164 +++++++++++++++++++++- Koha/Schema/Result/ItemsSearchField.pm | 8 +- installer/data/mysql/kohastructure.sql | 4 +- installer/data/mysql/updatedatabase.pl | 19 ++- kohaversion.pl | 2 +- 8 files changed, 696 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 01:21:04 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 21 Sep 2015 23:21:04 +0000 Subject: [koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-7-g6eb7866 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, 3.18.x has been updated via 6eb786648fc01715841b73044ec1cf64c3aa147c (commit) via bb1ab847299677ca798ca07691b4bf965b1521a8 (commit) via a15a88fa8276b77f8960173dea025f8d9c049aff (commit) from 27a0e22440d348d29a5dac20215c9a2a9cdcd808 (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 6eb786648fc01715841b73044ec1cf64c3aa147c Author: Aleisha Date: Mon Aug 3 02:23:29 2015 +0000 Bug 14634: Warns when placing hold on record with no items To test: 1) Create a new record in Cataloguing 2) When done, instead of adding an item to the record, click on the Holds tab in the left nav 3) Notice warns 4) Apply patch and refresh page 5) Click on Holds tab again 6) Notice warns are gone and page still works Signed-off-by: Marcel de Rooy Warns disappear; note that the display of the error message is still ugly. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea commit bb1ab847299677ca798ca07691b4bf965b1521a8 Author: Benjamin Rokseth Date: Mon Jun 8 11:12:03 2015 +0200 Bug 14361: koha-restart-zebra fails and probably breaks upgrade This patch fixes the koha-restart-zebra and koha-stop-zebra scripts by adding pidfiles folder to the test is_zebra_running. It also adds pidfiles to the test is_indexer_running so that koha-rebuild-zebra will work properly. Test plan: 1) check if zebrasrv is running, get pid of zebrasrv ps ax | grep zebrasrv 2) In my case, there was also a warning on the about.pl page on a fresh install: Error message from Zebra: 1011 (bad credentials) 3) try to restart zebra koha-restart-zebra instancename You will get a msg : Zebra does not appear to have been running for instancename Starting Zebra server for instancename 4) check again if zebrasrv is running ps ax | grep zebrasrv and see that pid has not changed, thus it is not restarted 5) Apply patch 6) repeat 4) and watch now how pid has changed If there was a warning on about.pl it should now be gone Signed-off-by: Mason James Signed-off-by: Tomas Cohen Arazi Good catch Benjamin! It works as expected with the patch. Signed-off-by: Liz Rea commit a15a88fa8276b77f8960173dea025f8d9c049aff Author: Kyle M Hall Date: Fri Aug 22 13:29:28 2014 -0400 Bug 12632: Hold limits ignored for record level holds with item level itemtypes The crux of the issue is that if you are using item level itemtypes, but are allowing biblio levels holds, those holds do not have items. So, in CanItemBeReserved, when Koha counts the number of holds to compare against the given rule, it will always give 0 ( except of course for found holds, and the occasional item-level hold ). So the query is saying "link each of these reserves to the reserved item, and count the number of reserves this patron where the itemtype is DVD". However, since these are all record level reserves, there are no items to link to, and so when it looks for all reserves this and item whose itemtype is DVD, it finds zero reserves! This patch solves the problem by looking first at the item level itemtype, and if it does not exist, then it looks at the record level itemtype. For installations using record level itemtypes, the behavior remains unchanged. Test plan: 1) Enable item level itemtypes 2) Create two records with one item each of a given itemtype 3) Create a single issuing rule and limit the holds allowed for that itemtype to 1 4) Place a record level hold on your first record 5) Attempt to place a record level hold for the same patron on your second record. You should not be able to but you can! 6) Apply this patch 7) Repeat step 5, note you can no longer place the hold! Signed-off-by: Paola Rossi Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 10 ++++++++-- debian/scripts/koha-functions.sh | 2 ++ reserve/request.pl | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 03:01:47 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 01:01:47 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-1-g9a8c3cb 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, 3.20.x has been updated via 9a8c3cb61c324ff90b2ab017dc42845b34cdc6c5 (commit) from f38f8b8758654108386ac2ffa2446515c5f1b041 (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 9a8c3cb61c324ff90b2ab017dc42845b34cdc6c5 Author: Kyle M Hall Date: Fri Aug 22 13:29:28 2014 -0400 Bug 12632: Hold limits ignored for record level holds with item level itemtypes The crux of the issue is that if you are using item level itemtypes, but are allowing biblio levels holds, those holds do not have items. So, in CanItemBeReserved, when Koha counts the number of holds to compare against the given rule, it will always give 0 ( except of course for found holds, and the occasional item-level hold ). So the query is saying "link each of these reserves to the reserved item, and count the number of reserves this patron where the itemtype is DVD". However, since these are all record level reserves, there are no items to link to, and so when it looks for all reserves this and item whose itemtype is DVD, it finds zero reserves! This patch solves the problem by looking first at the item level itemtype, and if it does not exist, then it looks at the record level itemtype. For installations using record level itemtypes, the behavior remains unchanged. Test plan: 1) Enable item level itemtypes 2) Create two records with one item each of a given itemtype 3) Create a single issuing rule and limit the holds allowed for that itemtype to 1 4) Place a record level hold on your first record 5) Attempt to place a record level hold for the same patron on your second record. You should not be able to but you can! 6) Apply this patch 7) Repeat step 5, note you can no longer place the hold! Signed-off-by: Paola Rossi Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 6f95acd1a6cf5113992d28173dece96e8afc6cef) Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 10 ++++++++-- t/db_dependent/Holds.t | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 03:09:14 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 01:09:14 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-3-gdbf96d4 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, 3.20.x has been updated via dbf96d4f40b6074194c0504e349fe4a7031466d4 (commit) via 65390187ee340573c1239e54440e832f572d0a19 (commit) from 9a8c3cb61c324ff90b2ab017dc42845b34cdc6c5 (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 dbf96d4f40b6074194c0504e349fe4a7031466d4 Author: Aleisha Date: Mon Aug 3 02:23:29 2015 +0000 Bug 14634: Warns when placing hold on record with no items To test: 1) Create a new record in Cataloguing 2) When done, instead of adding an item to the record, click on the Holds tab in the left nav 3) Notice warns 4) Apply patch and refresh page 5) Click on Holds tab again 6) Notice warns are gone and page still works Signed-off-by: Marcel de Rooy Warns disappear; note that the display of the error message is still ugly. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 4bb888281dec7de676fc6546746a88835a822c62) Signed-off-by: Chris Cormack commit 65390187ee340573c1239e54440e832f572d0a19 Author: Benjamin Rokseth Date: Mon Jun 8 11:12:03 2015 +0200 Bug 14361: koha-restart-zebra fails and probably breaks upgrade This patch fixes the koha-restart-zebra and koha-stop-zebra scripts by adding pidfiles folder to the test is_zebra_running. It also adds pidfiles to the test is_indexer_running so that koha-rebuild-zebra will work properly. Test plan: 1) check if zebrasrv is running, get pid of zebrasrv ps ax | grep zebrasrv 2) In my case, there was also a warning on the about.pl page on a fresh install: Error message from Zebra: 1011 (bad credentials) 3) try to restart zebra koha-restart-zebra instancename You will get a msg : Zebra does not appear to have been running for instancename Starting Zebra server for instancename 4) check again if zebrasrv is running ps ax | grep zebrasrv and see that pid has not changed, thus it is not restarted 5) Apply patch 6) repeat 4) and watch now how pid has changed If there was a warning on about.pl it should now be gone Signed-off-by: Mason James Signed-off-by: Tomas Cohen Arazi Good catch Benjamin! It works as expected with the patch. (cherry picked from commit e09e7152b6af1f2cb3d2e78eff317cdf77cbf5f2) Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-functions.sh | 2 ++ reserve/request.pl | 1 + 2 files changed, 3 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 03:24:34 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 01:24:34 +0000 Subject: [koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-11-ga14cc8f 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, 3.18.x has been updated via a14cc8fdc8bdcc3b9f7080c047ff85d839559886 (commit) via 99cfec30bf9924e7d5cf1a8967cbaa613d7ad357 (commit) via 6de2c37a1a09533f0995c2be59df5998b6b51fd8 (commit) via 424c49a632b33ed41cdde06d4ca3556510c77a24 (commit) from 6eb786648fc01715841b73044ec1cf64c3aa147c (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 a14cc8fdc8bdcc3b9f7080c047ff85d839559886 Author: Jonathan Druart Date: Fri Apr 24 10:02:19 2015 +0200 Bug 11880: Select what has been selected before The previous patch wants to select the barcode option when the user is on the item search for label, in all cases. So even if 'title' is selected, a search done, and there is no result, the barcode index is selected anyway. In this case, the title option should be kept. Test plan: Confirm that the barcode option is the default choice, but other values are kept if the search does not return any result. Followed test plan, behaves as expected. Tested with all choices. Signed-off-by: Marc Veron Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1f0ff90360c21e5e24df9f455681b1bf4ae92031) Signed-off-by: Liz Rea commit 99cfec30bf9924e7d5cf1a8967cbaa613d7ad357 Author: Fr?d?rick Date: Fri Feb 28 16:21:46 2014 -0500 Bug 11880: Select the barcode index by default then searching for label items. Test case: * Go to "Tools -> Label creator -> Manage batches" * Click on the "New batch" button * Click on the "Add item(s)" button * A search window should open. The "Barcode" value should be selected in the the selectbox. Followed test case. Patch behaves as expected. Signed-off-by: Marc Veron Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea commit 6de2c37a1a09533f0995c2be59df5998b6b51fd8 Author: Joonas Kylm?l? Date: Wed Aug 19 11:00:27 2015 +0000 Bug 14579: 'You are not logged in' should link to log in page To test: 1) Go to any page on the staff client and make sure you are not logged in (ie an error page, cgi-bin/koha/errors/400.pl) 2) Try click on 'You are not logged in |' 3) Notice it is not really a link and doesn't take you anywhere 4) Apply patch 5) Refresh page 6) Click on what now says 'Log in |' 7) Confirm that you are redirected to the intranet log in page Signed-off-by: Aleisha Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea commit 424c49a632b33ed41cdde06d4ca3556510c77a24 Author: Joonas Kylm?l? Date: Tue Aug 25 07:24:54 2015 +0000 Bug 14703: Holidays description shows \r\n for every new line Adds a new line for the holiday's description instead of the string \r\n. Test plan: 1. In tools -> Calendar look at some holiday's description (Do a new holiday with description of multiple lines if there is not already) 2. Notice that there is characters \r\n if someone has put a newline in the holiday's description 3. Apply patch 4. See that the new lines show there now nicely Sponsored-by: Vaara-kirjastot Signed-off-by: Marcel de Rooy Amended slightly: no need to replace title. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Liz Rea ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/includes/header.inc | 19 ++++++++----- .../intranet-tmpl/prog/en/modules/labels/search.tt | 28 ++++++++++---------- .../prog/en/modules/tools/holidays.tt | 2 +- labels/label-item-search.pl | 3 ++- 5 files changed, 31 insertions(+), 23 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 04:12:16 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 02:12:16 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-30-gf8b1b50 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, 3.20.x has been updated via f8b1b50cf8beb03042f69bb771eb99f99599dce3 (commit) via 3f866a732ed78e5366e0c07ecaef5729f6414e4e (commit) via 6648417079eb9aa04d9283e55f3e9f263ef13d64 (commit) via 3d8e059513db08f2070e33ea1562d7cdd915797c (commit) via c7dfbfedd3d298753b4d96d5ce50363c2cfc65fc (commit) via 84ee44110a934632ddcc8da59aa805c45a79786e (commit) via 5ef7a1795f72509aba182b9b3abc8e60b796a3a0 (commit) via 0f07cd2c1004e3ceb2c4436f9cd3542b243c18aa (commit) via 8641fba15ccc43aa6f0ea6762fb5f54880065150 (commit) via 7feee800440fc3749b5896de82c24ad9860f6bd3 (commit) via 272650cb3f1e2d3ac24559ede0049b263b829762 (commit) via 28fe340ea75475903a1063f734dec45781d35f90 (commit) via e76def3a946d39bc56737236554be6aa21c725a9 (commit) via 1ed31fe5ba874a649d34beb0fb649bd912fe456d (commit) via eb8a20b2b77549b5afd530e58208a78ef68e295a (commit) via 27ba1a6fa1a5be170d9bf04747f31caab15766b1 (commit) via 74e46b7467aa69e5a77d0b7689ddd2d24d76805d (commit) via 172dce8b0dcc7870279c8571b386392d31124d81 (commit) via 270187404e87bdae985e70a590834ed2dc5d49c7 (commit) via 01af0c4dc7b575f914753b265fc958f25ac30b9a (commit) via 25f30fec2d93b7c0678a131d65da3c3c8ae8c18c (commit) via c158f9e27e9e283523a5070ae4e4c718627374d2 (commit) via c14c5d180d038e3b772693beed2d20c1c091d95c (commit) via 640ad36da42868ec64f6fcf342cf32636179505d (commit) via 5d3e837a5dff36afb24b76d518e745283d1b2086 (commit) via 2a9d47ea610081e6d1dda9dbbbdac0349263a2d3 (commit) via 5f6d7f62711286273abb1fa352bd16405a7e9862 (commit) from dbf96d4f40b6074194c0504e349fe4a7031466d4 (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 f8b1b50cf8beb03042f69bb771eb99f99599dce3 Author: Fridolin Somers Date: Thu Aug 6 09:36:42 2015 +0200 Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit fc4f7fe67577917df9ca4201257bea822832a3c4) Signed-off-by: Chris Cormack commit 3f866a732ed78e5366e0c07ecaef5729f6414e4e Author: Jonathan Druart Date: Thu Aug 6 07:19:06 2015 +0100 Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. Signed-off-by: Fridolin Somers Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit e0ed9cbcf60a74dbe2690e6c34c5a311744f49ae) Signed-off-by: Chris Cormack commit 6648417079eb9aa04d9283e55f3e9f263ef13d64 Author: Blou Date: Wed Sep 2 09:59:45 2015 -0400 Bug 14726: Checkout summary doesn't show title Right after checking out, a small box appear with "Checkout out: Some Title (32154001669305). Due on 24/09/2015". The title doesn't appear anymore (since the move to db schemas). This fixes it. Test: 1) checkout ANY item, for ANY user 2) Look at summary right below the checkout input box. The title doesn't show up. 3) apply patch, reproduce same steps (after checkin if same item). Title appears. Signed-off-by: Andreas Hedstr?m Mace Signed-off-by: Jonathan Druart Todo: You need to track what are the queries generated here. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 658e787834784dec7d7782f45061b66e22211423) Signed-off-by: Chris Cormack commit 3d8e059513db08f2070e33ea1562d7cdd915797c Author: Fridolin Somers Date: Tue Aug 25 11:33:04 2015 +0200 Bug 14721: OAI-PMH must return error when no results When getting records from OAI-PMH, an error must be returned if there is no results. See : http://www.openarchives.org/OAI/openarchivesprotocol.html#ErrorConditions Test plan : - Enable OAI webservice - Perform a query that will return no results. ie : /cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marcxml&from=2099-12-30&until=2099-12-31 => Without patch you get a response with : => With patch you get a response with error code : No records match the given criteria - Check a good query returns still results - Same test with ListIdentifiers verb Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 64992a05ce87af7bf595c8d6f0b9d528887a2e44) Signed-off-by: Chris Cormack commit c7dfbfedd3d298753b4d96d5ce50363c2cfc65fc Author: Julian Maurice Date: Fri Sep 4 08:57:08 2015 +0200 Bug 14766: unimarc_field_4XX: escape ', ", \n, \r Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit abd71d017ea68f4209e41b34282e8fce8170e175) Signed-off-by: Chris Cormack commit 84ee44110a934632ddcc8da59aa805c45a79786e Author: Paul Poulain Date: Wed Aug 26 10:54:30 2015 +0200 Bug 14766: Complete cataloguing plugin unimarc_field_4XX Add subfields l, n and o for better UNIMARC compliance Signed-off-by: Chris Cormack Note: I just did a code audit here, as I don't know enough about UNIMARC to know if the 4XX fields should have these subfields. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 503dd6036974b4208bd5cd60a87bb28599987f45) Signed-off-by: Chris Cormack commit 5ef7a1795f72509aba182b9b3abc8e60b796a3a0 Author: Tomas Cohen Arazi Date: Mon Sep 7 11:12:49 2015 -0300 Bug 14717: DBRev 3.21.00.023 Signed-off-by: Tomas Cohen Arazi (cherry picked from commit db891d33f0bbe75748fd725036066f45c2e762fe) Signed-off-by: Chris Cormack Conflicts: Koha.pm commit 0f07cd2c1004e3ceb2c4436f9cd3542b243c18aa Author: Jonathan Druart Date: Thu Sep 3 16:07:42 2015 +0100 Bug 14171: Update borrowers date fields Signed-off-by: Jonathan Druart http://bugs.koha-community.org/show_bug.cgi?id=14717 Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 69994c38a00a1199b814d823c4e20503d86b28bf) Signed-off-by: Chris Cormack commit 8641fba15ccc43aa6f0ea6762fb5f54880065150 Author: Jonathan Druart Date: Thu Sep 3 16:03:17 2015 +0100 Bug 14717: Prevent 0000-00-00 on updating a patron Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 7bad40dcc294d6d56c937cbd81267fc9df73b6aa) Signed-off-by: Chris Cormack Conflicts: t/db_dependent/Members.t commit 7feee800440fc3749b5896de82c24ad9860f6bd3 Author: Chris Cormack Date: Tue Aug 25 10:00:20 2015 +1200 Bug 14717: Invalid dates in debarred column To test 1/ Import a patron using the patron import tool, make sure they have no debarred column in the file 2/ Check the database, notice the debarred column is 0000-00-00 3/ For bonus points, checkout an item to that borrower, then check it in notice Koha errors 4/ Apply patch 5/ Import a new patron 6/ Notice column is now NULL and that checkins work Signed-off-by: Eugene Espinoza Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d8a9d171154f3ad526f31968fdec1ad7809014b8) Signed-off-by: Chris Cormack commit 272650cb3f1e2d3ac24559ede0049b263b829762 Author: Jonathan Druart Date: Tue Jul 14 13:12:46 2015 +0100 Bug 11273: FIX barcode generation in acquisition if hbyymmincr When AutoBarcode is activated and you have set AcqCreateItem to 'on order' there is a Javascript error when you try to generate a barcode for the item: TypeError: document.f is undefined http://localhost:8080/intranet-tmpl/lib/jquery/jquery.js Line 11 Test plan: 0/ a. Set AutoBarcode to hbyymmincr b. Set AcqCreateItem to 'on ordering' c. Set the plugin barcode.pl to the barcode field for the default and the ACQ frameworks 1/ Go on the add items page (cataloguing/additem.pl) and confirm that the plugin works as expected. 2/ Go on the New order page (acqui/neworderempty.pl) and confirm that the plugin works as expected. Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5b521eb394771ee305777f0b44098be5fdd11cc7) Signed-off-by: Chris Cormack commit 28fe340ea75475903a1063f734dec45781d35f90 Author: Jonathan Druart Date: Tue Jul 14 18:07:37 2015 +0100 Bug 14354: Prevent edition of items from other branches if IndependentBranches is on If IdependentBranches is ON, to edit/delete items from other branches you need to be superlibrarian. Currently a "simple" staff user cannot edit them from the edit item page but from the catalogue detail page. The edit links should not be displayed on this table. Test plan: O/ Set IndependentBranches to "Prevent". Create a record and add 2 items: Set homebranch to L1 for item I1. Set homebranch to L2 for item I2. 1/ With a superlibrarian user, you should be able to edit both items. 2/ With a "simple" user attached to L1, you should only be able to edit I1. The edit links should not be displayed for I2. Note that the checkbox is displayed on the catalogue detail page (item list), but on the batch tools, it won't be possible to select non-modifiable items. TODO: Add a server-side check. Indeed it is still possible to edit an item if the user know the url. Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit bcab2416399e93f5ce9b1083395c052046d5d02a) Signed-off-by: Chris Cormack commit e76def3a946d39bc56737236554be6aa21c725a9 Author: Jonathan Druart Date: Fri Jul 10 16:11:48 2015 +0100 Bug 12965: Prevent to erase an existing item type On creating an item type, if it already exists, it will replace the existing one. This patch prevent that and display a message to the interface. Note: The fields are lost. Test plan: 1/ Create an item type 'AAA', description 'AAA' 2/ Edit it, update the description with 'BBB' 3/ Create an item type 'AAA' with a description 'CCC' => you should get a warning "already exists". Works well, no errors Signed-off-by: Amit Gupta Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Warning message is triggered. Adding, editing and deleting item types still works. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit eb12ee1e223b662cd1e89c0a56a5d1c083ba1ddc) Signed-off-by: Chris Cormack commit 1ed31fe5ba874a649d34beb0fb649bd912fe456d Author: Jonathan Druart Date: Wed Jul 15 12:49:03 2015 +0100 Bug 12885: Fix if url contains +*... and HTML5 Media is enabled The special regex chars are not escaped in C4::HTML5Media. Test plan: 1/ Set 856$u=http://www.mrqe.com/lookup?talented+mr.+ripley 2/ Enable the pref HTML5Media 3/ Go on the detail page It should not explode. Signed-off-by: Mirko Tietgen Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 085d766a0524e399d0c9c9e807d8c0acd0da6a19) Signed-off-by: Chris Cormack commit eb8a20b2b77549b5afd530e58208a78ef68e295a Author: Jonathan Druart Date: Mon Jul 13 17:34:53 2015 +0100 Bug 13943: Prevent the deletion of items if the user cancels On the edit items page, there is some weird JS code: if the user clicks on the delete link and then cancel, the item is deleted anyway. It's caused by the following JS code in browser.js $('a[href*="biblionumber="]').click(function (ev) { ev.preventDefault(); window.location = $(this).attr('href') + '&searchid=' + me.searchid; }); Test plan: - Do a search with multiple results - Go to the detail page (make sure results browser shows up!) - Use the "Edit items" link from the toolbar - Delete an item (try both way) - Choose "cancel" - Delete an item (try both way) and confirm the deletion You should see the browser after the deletion and the item should have been deleted correctly. - Edit an item (try both way) You should see the browser (did not work before this patch) Note: Before this patch, the 2 first columns didn't contain the edit/delete item links, now it's only the 1st one. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Much better! Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f7214859df15abfe874141bcc1a32b57067f7c54) Signed-off-by: Chris Cormack commit 27ba1a6fa1a5be170d9bf04747f31caab15766b1 Author: Jonathan Druart Date: Wed Sep 2 15:07:07 2015 +0100 Bug 11247: Improve tests This patch makes the tests non dependent on the DB and test the 3 marc flavours. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 6e0b61e2acea7c797c1da727474daf7d7a657574) Signed-off-by: Chris Cormack commit 74e46b7467aa69e5a77d0b7689ddd2d24d76805d Author: Marcel de Rooy Date: Wed Aug 26 14:09:53 2015 +0200 Bug 11247: Add a simple unit test for TransformHtmlToXml The unit test is db dependent (as Jonathan correctly remarked), since the sub checks a preference. Test plan: Run t/db_dependent/Biblio/TransformHtmlToXml.t Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d1335a766d7b54c470701b0055fc99be2e7e7628) Signed-off-by: Chris Cormack commit 172dce8b0dcc7870279c8571b386392d31124d81 Author: Srdjan Date: Thu Nov 14 19:10:30 2013 +1300 Bug 11247: Fix calls of TransformHtmlToXml The ind_tag of TransformHtmlToXml is unused. Some calls to this function incorrectly revert indicator and ind_tag (which is not a problem when both are empty..) Patch of Srdjan Jankovic, amended and signed off by Marcel de Rooy. The following calls are fixed: call in acqui/addorder.pl: switched indicator with ind_tag call in acqui/addorderiso2709.pl replaced too acqui/finishreceive.pl replaced too These calls are fine: two calls in cataloguing/additem.pl are fine call in serials/serials-edit.pl is fine call in tools/batchMod.pl is fine The folllow-up patch adds a simple unit test. Signed-off-by: Marcel de Rooy With AcqCreateItem=='placing an order', tested if adding an order still worked (covered both addorder.pl and addorderiso2709.pl). Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 22b41063981de608402d1dd87f6aa9e2010245dd) Signed-off-by: Chris Cormack commit 270187404e87bdae985e70a590834ed2dc5d49c7 Author: Jonathan Druart Date: Tue Aug 18 18:40:31 2015 +0100 Bug 14584: Encoding broken with system preferences The pref are double encoded. From bug 12411: "This will fix the encoding issues existing in 3.14 and 3.16. The issue still appear in master but is fixed by bug 11944." They should not have been pushed together. Test plan: 1) You need an accentuated language installed. 2) Go to NoLoginInstructions pref, and add some accentuated message like "H?lo m?dames ? m?cie?x" 3) refresh opac home page, message should be gibberish 4) apply patch. Message should be ok now. Signed-off-by: Tomas Cohen Arazi Works as expected. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 813a047e236947a815c4be3c3dde38f19844b962) Signed-off-by: Chris Cormack commit 01af0c4dc7b575f914753b265fc958f25ac30b9a Author: Jonathan Druart Date: Mon Aug 24 10:07:37 2015 +0100 Bug 14709: Do not access to C4::Context->userenv from the commandline The script dies with Can't use an undefined value as a HASH reference at tools/export.pl line 149. if it is called from the command line. This is introduced by bug 13040. The C4::Context->userenv is not defined in this case. Test plan: Execute the script using the command line. With the patch applies you should not get the error. Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 6ad59e7ab45bbd2858f4cfad83d862688a48e49b) Signed-off-by: Chris Cormack commit 25f30fec2d93b7c0678a131d65da3c3c8ae8c18c Author: Tomas Cohen Arazi Date: Wed Sep 2 09:49:41 2015 -0300 Bug 14205: (RM followup) DBIx updates Signed-off-by: Tomas Cohen Arazi (cherry picked from commit ce2ea94f304b8e3a0c5fa6c967c2b864e5d0e7bc) Signed-off-by: Chris Cormack commit c158f9e27e9e283523a5070ae4e4c718627374d2 Author: Tomas Cohen Arazi Date: Wed Sep 2 09:45:35 2015 -0300 Bug 14205: DBRev 3.20.03.001 Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 4e69b25e71fcb74ce3c2d3830deafdd1569fe361) Signed-off-by: Chris Cormack Conflicts: Koha.pm commit c14c5d180d038e3b772693beed2d20c1c091d95c Author: Jonathan Druart Date: Tue Aug 4 10:00:51 2015 +0100 Bug 14205: Deleting an Item/Record does not remove link to course reserve A constraint is missing on the course_reserves.ci_id field. This patch adds it and removes orphan rows. Test plan: 0/ Don't apply the patch 1/ Login to Staff Site. 2/ Go to Course Reserves 3/ Create Course 4/ Add Reserve 5/ Go to item added (delete item/record) 6/ Refresh Course (see no items attached) 7/ Delete Course 8/ See course still listed in the courses (Not deleted) 9/ Apply the patch and execute the updatedatabase entry. 10/ Delete the Course Note that the course has correctly been removed. NOTE: Make sure to set the UseCourseReserves system preference to test. Tested before (problem existed) and after (problem solved) update. Dropped DB, web installed, and put in dummy data and retested. Problem solved. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit fc568dfb22238a052d7772a0bba374f836543d46) Signed-off-by: Chris Cormack commit 640ad36da42868ec64f6fcf342cf32636179505d Author: Jonathan Druart Date: Tue Aug 18 09:08:09 2015 +0100 Bug 14685: Fix set guarantor for a child or professional accounts Bug 13970 removed some useful code to automatically set the guarantor when creating a child. But finally there is a better way to do the job, we just need to assume that only children or professional can have a guarantor. Test plan: 1/ Create an adult patron and add a child. 2/ The guarantor info should be retrieved and set on the child creation page. 3/ Create an organization and add a child 4/ The guarantor info should be retrieved and set on the adult creation page. Signed-off-by: Liz Rea This patch catches both cases, thanks Jonathan! Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 438b62e8ffcbab3742ab9a48602a9653b1afde6f) Signed-off-by: Chris Cormack commit 5d3e837a5dff36afb24b76d518e745283d1b2086 Author: Joonas Kylm?l? Date: Tue Aug 25 07:24:54 2015 +0000 Bug 14703: Holidays description shows \r\n for every new line Adds a new line for the holiday's description instead of the string \r\n. Test plan: 1. In tools -> Calendar look at some holiday's description (Do a new holiday with description of multiple lines if there is not already) 2. Notice that there is characters \r\n if someone has put a newline in the holiday's description 3. Apply patch 4. See that the new lines show there now nicely Sponsored-by: Vaara-kirjastot Signed-off-by: Marcel de Rooy Amended slightly: no need to replace title. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit fa1311894906821e2b6bc9e4e3a831a855a20bca) Signed-off-by: Chris Cormack commit 2a9d47ea610081e6d1dda9dbbbdac0349263a2d3 Author: Tomas Cohen Arazi Date: Thu Aug 27 11:31:42 2015 -0300 Bug 14737: wrong permissions required for cn_browser.pl plugin The cn_browser.pl cataloguing plugin only searches for used callnumbers on the bibliographic database. There is no need for this plugin to require special permissions besides access to the catalog. To test: - Link the cb_browser.pl cataloguing plugin to 952$o in your favourite cataloguing framework - Login with a superlibrarian user - Try the plugin => SUCCESS: you can use it - Login with a user that has the full 'tools' permission - Try the plugin => SUCCSES: you can use it - Login with a user that doesn't have full 'tools' permission but has the normal catalogue and cataloguing permissions. - Try the plugin => FAIL: you are requested to login with a different user - Apply the patch - Retry => SUCCESS: you can use it - Sign off :-D Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit b348c07f969a5bd17f25e5ced681ad44aa351c0e) Signed-off-by: Chris Cormack commit 5f6d7f62711286273abb1fa352bd16405a7e9862 Author: Joonas Kylm?l? Date: Wed Aug 19 11:00:27 2015 +0000 Bug 14579: 'You are not logged in' should link to log in page To test: 1) Go to any page on the staff client and make sure you are not logged in (ie an error page, cgi-bin/koha/errors/400.pl) 2) Try click on 'You are not logged in |' 3) Notice it is not really a link and doesn't take you anywhere 4) Apply patch 5) Refresh page 6) Click on what now says 'Log in |' 7) Confirm that you are redirected to the intranet log in page Signed-off-by: Aleisha Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 255d133acac24a675dca0106ede20359257d0701) Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/Barcodes/ValueBuilder.pm | 10 ++- C4/Biblio.pm | 2 + C4/HTML5Media.pm | 2 +- C4/Members.pm | 4 + Koha.pm | 2 +- Koha/Schema/Result/CourseItem.pm | 19 ++++- Koha/Schema/Result/CourseReserve.pm | 22 +++++- Koha/Template/Plugin/Koha.pm | 3 +- acqui/addorder.pl | 2 +- acqui/addorderiso2709.pl | 2 +- acqui/finishreceive.pl | 3 +- admin/aqplan.pl | 5 +- admin/itemtypes.pl | 38 ++++++---- catalogue/detail.pl | 9 ++- cataloguing/value_builder/cn_browser.pl | 2 +- cataloguing/value_builder/unimarc_field_4XX.pl | 18 +++++ installer/data/mysql/kohastructure.sql | 4 +- installer/data/mysql/updatedatabase.pl | 34 +++++++++ .../intranet-tmpl/prog/en/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/includes/header.inc | 19 +++-- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 16 ++++ .../prog/en/modules/catalogue/detail.tt | 7 +- .../prog/en/modules/cataloguing/additem.tt | 52 +++++++------ .../cataloguing/value_builder/unimarc_field_4XX.tt | 9 +++ .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/tools/holidays.tt | 2 +- members/memberentry.pl | 3 +- opac/oai.pl | 16 ++++ t/Biblio/TransformHtmlToXml.t | 80 ++++++++++++++++++++ t/db_dependent/Members.t | 26 ++++++- tools/export.pl | 2 +- 32 files changed, 343 insertions(+), 76 deletions(-) create mode 100644 t/Biblio/TransformHtmlToXml.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 04:25:38 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 02:25:38 +0000 Subject: [koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-15-g2727146 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, 3.18.x has been updated via 2727146bdee89c7ee7b910ca2afda6fef72f21bc (commit) via 9d2046b285b9dccead3eb494b006743bf7397431 (commit) via c7d4daddf4682eceac3a3eef502a0de15646dca0 (commit) via 6c5fae2a15ad6bda734a22a433926385b0207a3c (commit) from a14cc8fdc8bdcc3b9f7080c047ff85d839559886 (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 2727146bdee89c7ee7b910ca2afda6fef72f21bc Author: Jonathan Druart Date: Wed Jul 15 12:49:03 2015 +0100 Bug 12885: Fix if url contains +*... and HTML5 Media is enabled The special regex chars are not escaped in C4::HTML5Media. Test plan: 1/ Set 856$u=http://www.mrqe.com/lookup?talented+mr.+ripley 2/ Enable the pref HTML5Media 3/ Go on the detail page It should not explode. Signed-off-by: Mirko Tietgen Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 085d766a0524e399d0c9c9e807d8c0acd0da6a19) Signed-off-by: Liz Rea commit 9d2046b285b9dccead3eb494b006743bf7397431 Author: Jonathan Druart Date: Mon Jul 13 17:34:53 2015 +0100 Bug 13943: Prevent the deletion of items if the user cancels On the edit items page, there is some weird JS code: if the user clicks on the delete link and then cancel, the item is deleted anyway. It's caused by the following JS code in browser.js $('a[href*="biblionumber="]').click(function (ev) { ev.preventDefault(); window.location = $(this).attr('href') + '&searchid=' + me.searchid; }); Test plan: - Do a search with multiple results - Go to the detail page (make sure results browser shows up!) - Use the "Edit items" link from the toolbar - Delete an item (try both way) - Choose "cancel" - Delete an item (try both way) and confirm the deletion You should see the browser after the deletion and the item should have been deleted correctly. - Edit an item (try both way) You should see the browser (did not work before this patch) Note: Before this patch, the 2 first columns didn't contain the edit/delete item links, now it's only the 1st one. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Much better! Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f7214859df15abfe874141bcc1a32b57067f7c54) Signed-off-by: Liz Rea commit c7d4daddf4682eceac3a3eef502a0de15646dca0 Author: Srdjan Date: Thu Nov 14 19:10:30 2013 +1300 Bug 11247: Fix calls of TransformHtmlToXml The ind_tag of TransformHtmlToXml is unused. Some calls to this function incorrectly revert indicator and ind_tag (which is not a problem when both are empty..) Patch of Srdjan Jankovic, amended and signed off by Marcel de Rooy. The following calls are fixed: call in acqui/addorder.pl: switched indicator with ind_tag call in acqui/addorderiso2709.pl replaced too acqui/finishreceive.pl replaced too These calls are fine: two calls in cataloguing/additem.pl are fine call in serials/serials-edit.pl is fine call in tools/batchMod.pl is fine The folllow-up patch adds a simple unit test. Signed-off-by: Marcel de Rooy With AcqCreateItem=='placing an order', tested if adding an order still worked (covered both addorder.pl and addorderiso2709.pl). Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 22b41063981de608402d1dd87f6aa9e2010245dd) Signed-off-by: Liz Rea commit 6c5fae2a15ad6bda734a22a433926385b0207a3c Author: Jonathan Druart Date: Wed Aug 19 16:24:32 2015 +0100 Bug 14696: useless use of String::Random in catalogue/search.pl Bug 10404 adds the use of String::Random to catalogue/search.pl but bug 11369 removes it without removing the import line. Test plan: git grep String::Random catalogue/search.pl should not return anything Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 90285259e898f4734684edf10a64c252a180fdf6) Signed-off-by: Liz Rea ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 2 + C4/HTML5Media.pm | 2 +- acqui/addorder.pl | 2 +- acqui/addorderiso2709.pl | 2 +- acqui/finishreceive.pl | 3 +- catalogue/search.pl | 1 - .../prog/en/modules/cataloguing/additem.tt | 52 +++++++++++--------- 7 files changed, 36 insertions(+), 28 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 04:59:40 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 02:59:40 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-31-g87ed126 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, 3.20.x has been updated via 87ed1269fb1f6dd2624aeace532e25e663e4c509 (commit) from f8b1b50cf8beb03042f69bb771eb99f99599dce3 (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 87ed1269fb1f6dd2624aeace532e25e663e4c509 Author: Chris Cormack Date: Tue Sep 22 15:02:33 2015 +1200 Fixing the number of tests ----------------------------------------------------------------------- Summary of changes: t/Auth_with_shibboleth.t | 2 +- t/db_dependent/Members.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 05:22:13 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 03:22:13 +0000 Subject: [koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-22-gcd3fe1d 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, 3.18.x has been updated via cd3fe1d79e847deef117c4a4254e6591e3d2de9f (commit) via f665e17eb419509822afba80b86c1847eb726dca (commit) via 40c225904281e93c37cc993ef0cc65710af54813 (commit) via 9ceb3957b2344145c3639a333bfd3a6320d91d4b (commit) via 86c01c0fb58cba149233578264892d5bfca52d16 (commit) via 3197f45c2b7d47d50d78f612461761b37fefa8ba (commit) via 5248f73a39a2730ff4f47469961aefa4944d3bdd (commit) from 2727146bdee89c7ee7b910ca2afda6fef72f21bc (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 cd3fe1d79e847deef117c4a4254e6591e3d2de9f Author: Paul Poulain Date: Wed Aug 26 10:54:30 2015 +0200 Bug 14766: Complete cataloguing plugin unimarc_field_4XX Add subfields l, n and o for better UNIMARC compliance Signed-off-by: Chris Cormack Note: I just did a code audit here, as I don't know enough about UNIMARC to know if the 4XX fields should have these subfields. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 503dd6036974b4208bd5cd60a87bb28599987f45) Signed-off-by: Chris Cormack (cherry picked from commit 84ee44110a934632ddcc8da59aa805c45a79786e) Signed-off-by: Liz Rea commit f665e17eb419509822afba80b86c1847eb726dca Author: Jonathan Druart Date: Tue Jul 14 13:12:46 2015 +0100 Bug 11273: FIX barcode generation in acquisition if hbyymmincr When AutoBarcode is activated and you have set AcqCreateItem to 'on order' there is a Javascript error when you try to generate a barcode for the item: TypeError: document.f is undefined http://localhost:8080/intranet-tmpl/lib/jquery/jquery.js Line 11 Test plan: 0/ a. Set AutoBarcode to hbyymmincr b. Set AcqCreateItem to 'on ordering' c. Set the plugin barcode.pl to the barcode field for the default and the ACQ frameworks 1/ Go on the add items page (cataloguing/additem.pl) and confirm that the plugin works as expected. 2/ Go on the New order page (acqui/neworderempty.pl) and confirm that the plugin works as expected. Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5b521eb394771ee305777f0b44098be5fdd11cc7) Signed-off-by: Chris Cormack (cherry picked from commit 272650cb3f1e2d3ac24559ede0049b263b829762) Signed-off-by: Liz Rea commit 40c225904281e93c37cc993ef0cc65710af54813 Author: Jonathan Druart Date: Tue Jul 14 18:07:37 2015 +0100 Bug 14354: Prevent edition of items from other branches if IndependentBranches is on If IdependentBranches is ON, to edit/delete items from other branches you need to be superlibrarian. Currently a "simple" staff user cannot edit them from the edit item page but from the catalogue detail page. The edit links should not be displayed on this table. Test plan: O/ Set IndependentBranches to "Prevent". Create a record and add 2 items: Set homebranch to L1 for item I1. Set homebranch to L2 for item I2. 1/ With a superlibrarian user, you should be able to edit both items. 2/ With a "simple" user attached to L1, you should only be able to edit I1. The edit links should not be displayed for I2. Note that the checkbox is displayed on the catalogue detail page (item list), but on the batch tools, it won't be possible to select non-modifiable items. TODO: Add a server-side check. Indeed it is still possible to edit an item if the user know the url. Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit bcab2416399e93f5ce9b1083395c052046d5d02a) Signed-off-by: Chris Cormack (cherry picked from commit 28fe340ea75475903a1063f734dec45781d35f90) Signed-off-by: Liz Rea commit 9ceb3957b2344145c3639a333bfd3a6320d91d4b Author: Jonathan Druart Date: Wed Sep 2 15:07:07 2015 +0100 Bug 11247: Improve tests This patch makes the tests non dependent on the DB and test the 3 marc flavours. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 6e0b61e2acea7c797c1da727474daf7d7a657574) Signed-off-by: Chris Cormack (cherry picked from commit 27ba1a6fa1a5be170d9bf04747f31caab15766b1) Signed-off-by: Liz Rea commit 86c01c0fb58cba149233578264892d5bfca52d16 Author: Marcel de Rooy Date: Wed Aug 26 14:09:53 2015 +0200 Bug 11247: Add a simple unit test for TransformHtmlToXml The unit test is db dependent (as Jonathan correctly remarked), since the sub checks a preference. Test plan: Run t/db_dependent/Biblio/TransformHtmlToXml.t Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d1335a766d7b54c470701b0055fc99be2e7e7628) Signed-off-by: Chris Cormack (cherry picked from commit 74e46b7467aa69e5a77d0b7689ddd2d24d76805d) Signed-off-by: Liz Rea commit 3197f45c2b7d47d50d78f612461761b37fefa8ba Author: Jonathan Druart Date: Tue Aug 18 18:40:31 2015 +0100 Bug 14584: Encoding broken with system preferences The pref are double encoded. From bug 12411: "This will fix the encoding issues existing in 3.14 and 3.16. The issue still appear in master but is fixed by bug 11944." They should not have been pushed together. Test plan: 1) You need an accentuated language installed. 2) Go to NoLoginInstructions pref, and add some accentuated message like "H?lo m?dames ? m?cie?x" 3) refresh opac home page, message should be gibberish 4) apply patch. Message should be ok now. Signed-off-by: Tomas Cohen Arazi Works as expected. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 813a047e236947a815c4be3c3dde38f19844b962) Signed-off-by: Chris Cormack (cherry picked from commit 270187404e87bdae985e70a590834ed2dc5d49c7) Signed-off-by: Liz Rea commit 5248f73a39a2730ff4f47469961aefa4944d3bdd Author: Jonathan Druart Date: Fri Jul 10 16:11:48 2015 +0100 Bug 12965: Prevent to erase an existing item type On creating an item type, if it already exists, it will replace the existing one. This patch prevent that and display a message to the interface. Note: The fields are lost. Test plan: 1/ Create an item type 'AAA', description 'AAA' 2/ Edit it, update the description with 'BBB' 3/ Create an item type 'AAA' with a description 'CCC' => you should get a warning "already exists". Works well, no errors Signed-off-by: Amit Gupta Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Warning message is triggered. Adding, editing and deleting item types still works. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit eb12ee1e223b662cd1e89c0a56a5d1c083ba1ddc) Signed-off-by: Liz Rea ----------------------------------------------------------------------- Summary of changes: C4/Barcodes/ValueBuilder.pm | 10 ++- Koha/Template/Plugin/Koha.pm | 3 +- admin/itemtypes.pl | 38 ++++++---- catalogue/detail.pl | 9 ++- cataloguing/value_builder/unimarc_field_4XX.pl | 18 +++++ .../prog/en/modules/admin/itemtypes.tt | 16 ++++ .../prog/en/modules/catalogue/detail.tt | 7 +- .../cataloguing/value_builder/unimarc_field_4XX.tt | 9 +++ t/Biblio/TransformHtmlToXml.t | 80 ++++++++++++++++++++ 9 files changed, 166 insertions(+), 24 deletions(-) create mode 100644 t/Biblio/TransformHtmlToXml.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 06:45:47 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 04:45:47 +0000 Subject: [koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-25-gc8bc133 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, 3.18.x has been updated via c8bc1335664511def17dc40be57cba058e26d44b (commit) via b3b10df1e480f16e74abc8eef3ac568d84005c4b (commit) via 25350f519d24257f6ed690425ce853488b21999e (commit) from cd3fe1d79e847deef117c4a4254e6591e3d2de9f (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 c8bc1335664511def17dc40be57cba058e26d44b Author: Blou Date: Wed Sep 2 09:59:45 2015 -0400 Bug 14726: Checkout summary doesn't show title Right after checking out, a small box appear with "Checkout out: Some Title (32154001669305). Due on 24/09/2015". The title doesn't appear anymore (since the move to db schemas). This fixes it. Test: 1) checkout ANY item, for ANY user 2) Look at summary right below the checkout input box. The title doesn't show up. 3) apply patch, reproduce same steps (after checkin if same item). Title appears. Signed-off-by: Andreas Hedstr?m Mace Signed-off-by: Jonathan Druart Todo: You need to track what are the queries generated here. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 658e787834784dec7d7782f45061b66e22211423) Signed-off-by: Chris Cormack (cherry picked from commit 6648417079eb9aa04d9283e55f3e9f263ef13d64) Signed-off-by: Liz Rea Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt commit b3b10df1e480f16e74abc8eef3ac568d84005c4b Author: Fridolin Somers Date: Tue Aug 25 11:33:04 2015 +0200 Bug 14721: OAI-PMH must return error when no results When getting records from OAI-PMH, an error must be returned if there is no results. See : http://www.openarchives.org/OAI/openarchivesprotocol.html#ErrorConditions Test plan : - Enable OAI webservice - Perform a query that will return no results. ie : /cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marcxml&from=2099-12-30&until=2099-12-31 => Without patch you get a response with : => With patch you get a response with error code : No records match the given criteria - Check a good query returns still results - Same test with ListIdentifiers verb Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 64992a05ce87af7bf595c8d6f0b9d528887a2e44) Signed-off-by: Chris Cormack (cherry picked from commit 3d8e059513db08f2070e33ea1562d7cdd915797c) Signed-off-by: Liz Rea commit 25350f519d24257f6ed690425ce853488b21999e Author: Julian Maurice Date: Fri Sep 4 08:57:08 2015 +0200 Bug 14766: unimarc_field_4XX: escape ', ", \n, \r Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit abd71d017ea68f4209e41b34282e8fce8170e175) Signed-off-by: Chris Cormack (cherry picked from commit c7dfbfedd3d298753b4d96d5ce50363c2cfc65fc) Signed-off-by: Liz Rea ----------------------------------------------------------------------- Summary of changes: .../cataloguing/value_builder/unimarc_field_4XX.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- opac/oai.pl | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 18:42:12 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 16:42:12 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-35-gfaab5c4 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, 3.20.x has been updated via faab5c4c2445b8a3454c17d2ab29fb65b601c0c9 (commit) via fba717dca1bf11fb25aa3ce92131c62840b54fe3 (commit) via b3de8b67b54dd407332b6f3d1b326ef436604db4 (commit) via 388b0e43639283cf02fe11f7f24b6c2e832ce10e (commit) from 87ed1269fb1f6dd2624aeace532e25e663e4c509 (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 faab5c4c2445b8a3454c17d2ab29fb65b601c0c9 Author: Jonathan Druart Date: Wed Jul 15 11:50:18 2015 +0100 Bug 12525: Prevent adding several patron lists with the same name If you add patron to a patron list, from the patron search result, a list is created when you click on "Save". The list is considered as new each time. To reproduce: 1/ Launch a patron search 2/ Select 1 patron, and create a new list 'aaa' 3/ Select another patron and click Save again 2 lists are created Test plan: 1/ Launch a patron search 2/ Select 1 patron, and create a new list 'aaa' The dropdown list should be populated with this new list, and should be selected 3/ Select another patron and click Save again Only 1 list should be created Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 7f65aaac748833b57f9f1c8ae754d66c7e144d81) Signed-off-by: Chris Cormack commit fba717dca1bf11fb25aa3ce92131c62840b54fe3 Author: Jonathan Druart Date: Wed Jul 15 11:36:26 2015 +0100 Bug 12525: FIX patron lists dropdown is empty On the patrons home page, the dropdown list is not populated. Test plan: 1/ Go on the patrons home page (members/members-home.pl) 2/ Launch a search 3/ The dropdown list close to "Add selected patrons to" should contain all your patron lists NOTE: Initially tested with both which created lists. git reset --hard origin/master And then dropdown list was missing them. Applied just this one, and they were listed. Signed-off-by: Mark Tompsett Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit e2e50e0b06587f45c5370b313ff7a7d7a432bcd5) Signed-off-by: Chris Cormack commit b3de8b67b54dd407332b6f3d1b326ef436604db4 Author: Jonathan Druart Date: Fri Sep 4 14:53:37 2015 +0100 Bug 14343: Remove the DT pagination It does not make sense to have 2 paginations here. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 65ae7af277d6f64ef42f961c290ab92768a90df3) Signed-off-by: Chris Cormack commit 388b0e43639283cf02fe11f7f24b6c2e832ce10e Author: Lyon3 Team Date: Fri Jun 5 15:37:57 2015 +0200 Bug 14343: Incorrect links to results pages in Receive Shipment List Numbered links have incorrect url. Links to result pages don't work in Receive Shipment List (but fortunately, Next and Previous buttons work) It's because the booksellerid is not furnished in the url. Test Plan : 1) Go to Acquisitions module, enter a bookseller name that you know you can get many page of invoices for and search for it. 2) click on Receive shipment button. 3) On bottom of the first results page, click on page number 2 link. (cf joined screencast) You'll see that the results include invoices from other booksellerid. Indeed, I suppose that you get results from all booksellerid. Intall patch and redo 3 steps. NOTE: I did not follow this test plan. I read the acqui/parcels.pl code. The template parameter numbers is assigned in a function which has no reference to booksellerid at all! Additionally, the booksellerid is set directly elsewhere. It is also strange that the booksellerid references before and after this loop do not use the numbers.booksellerid, but just booksellerid. The change from numbers.booksellerid to booksellerid is correct! Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 2dc5ae238ae0eb58040be4612cae641330b868ba) Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 10 ++++++++++ members/members-home.pl | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 19:20:05 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 17:20:05 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-44-gfc2b340 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, 3.20.x has been updated via fc2b3400eff5965adf5ffd523213de868ad43ac8 (commit) via 7abaacce526a8b7186a3688a111239e46f38d16e (commit) via 625aec5b8541f8e83fa3bbea473616f90ab1396d (commit) via c323e07c0c7ec403af15e40da7d82b997cb3eefc (commit) via bc720464216eca9d5283596af23d2c2c926e7093 (commit) via 227d7b950e682300a7697ada4f6837a950f098e6 (commit) via 6c44d1f4645b4c98577d6af23b05b9608b421253 (commit) via 9c31f1af9bb7b87dd794f40dd2bc7673b720c674 (commit) via d1ce272dd2a5c75862db16d2b0682b0a9d654565 (commit) from faab5c4c2445b8a3454c17d2ab29fb65b601c0c9 (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 fc2b3400eff5965adf5ffd523213de868ad43ac8 Author: Jonathan Druart Date: Mon Sep 14 13:22:21 2015 +0100 Bug 14655: Fix wording Signed-off-by: Katrin Fischer Fixed a missing space after Error: :) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit fdc859281cc2af56431d183c3341ec9f8d4f672c) Signed-off-by: Chris Cormack commit 7abaacce526a8b7186a3688a111239e46f38d16e Author: Jonathan Druart Date: Tue Aug 18 18:15:02 2015 +0100 Bug 14655: Add a warning on the about page if patrons have requested privacy New warning on the about page if at least a patron has requested a privacy on checkin but the AnonymousPatron is not set to a valid patron. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit aaf2903cc0e86a2e59b3c7e223d7d8a85778ca0d) Signed-off-by: Chris Cormack Conflicts: about.pl commit 625aec5b8541f8e83fa3bbea473616f90ab1396d Author: Jonathan Druart Date: Tue Aug 18 18:10:37 2015 +0100 Bug 14655: Add a warning if the checkin will fail On the checkin and checkout page, the checkin will fail if the patron has requested the privacy and the AnonymousPatron is not correctly set. This patch adds a warning message on both pages. Test plan: 0/ Be sure you don't have any patron with privacy=2 (Never) 1/ Set OPACPrivacy, not AnonymousPatron 2/ Go on the checkin, you should a warning (same as before this patch). 3/ Set the privacy=2 for a patron 4/ Go on the circulation page, a warning should appear (for this specific patron) 5/ Check an item out to this patron 6/ Check the item in on the checkin page. The item is not checked in and you get a specific message for this patron. Confirm other/correct situations don't trigger the messages. Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit cb2151529e0c2d031a01e68bd5deab26d2ffbaff) Signed-off-by: Chris Cormack commit c323e07c0c7ec403af15e40da7d82b997cb3eefc Author: Marcel de Rooy Date: Tue Sep 1 16:11:54 2015 +0200 Bug 14683: [QA Follow-up] Similar change for staff Script memberentry.pl contained a similar line. Solution is simpler here. Test plan: [1] Add, change or clear the sms number at staff side. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit bdf4894c507f4bac6b2b79c7ca3b7a556d246ed5) Signed-off-by: Chris Cormack commit bc720464216eca9d5283596af23d2c2c926e7093 Author: Marcel de Rooy Date: Fri Aug 28 09:13:09 2015 +0200 Bug 14683: [QA Follow-up] Mixup between mobile and smsalertnumber This is an issue discussed on older reports already in the past. Column mobile in borrowers is actually 'Other phone', not necessary a mobile number. The name of the field is confusing. (Renaming it is outside the scope of this report.) The field that we are editing here is smsalertnumber. It should not be compared with mobile at all. What could be the side-effect of this correction? === First, the change is only relevant for libraries with pref SMSSendDriver enabled. In the past patrons editing their message preferences saw mobile (read: other phone) in their smsalertnumber field (if the latter was still empty). If they saved it, it was copied to smsalertnumber. This change does not affect these patrons. They just have the same number in two columns. No big deal. What if a patron does not yet have a smsalertnumber? In that case no sms is sent in Letters.pm. So no change in behavior. If he submits opac-messaging now, he will no longer copy his other phone to smsalert [we cannot assume that it was mobile anyway!]. If he enters a mobile number, it will be saved correctly in the right field. Conclusion: this change will not break things or hurt anyone. It only prevents unwanted copying other phone to smsalertnumber. Also modified the compare to prevent uninitialized warnings. And removed a commented warn. Test plan: [1] Add, edit or delete the SMS number on opac-messaging regardless of the value of Other Phone (in the badly named mobile field). Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 9b8d7168beb27342c4c483a0812e3a6789fabced) Signed-off-by: Chris Cormack commit 227d7b950e682300a7697ada4f6837a950f098e6 Author: Joonas Kylm?l? Date: Wed Aug 19 11:42:50 2015 +0000 Bug 14683: Unable to clear SMS number Enables to clear SMS number. To test: 1. Go to opac-messaging.pl 2. Insert SMS number and submit 3. Clear SMS number and submit 4. Observe that the sms number did not change 5. Apply patch 6. Clear SMS number and submit 7. Observe that the sms number changes Sponsored-by: Vaara-kirjastot Signed-off-by: Marcel de Rooy Adding a follow-up. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5b1c7e4c359e974e5aca801579db72b356741a0f) Signed-off-by: Chris Cormack commit 6c44d1f4645b4c98577d6af23b05b9608b421253 Author: Lari Taskula Date: Thu Jul 30 18:34:49 2015 +0300 Bug 14621: Messaging preferences table needs to be sorted I have been working with messaging preferences and I noticed a weird issue in Firefox on Ubuntu. On messaging preferences page, the table is unsorted and the content in rows are generated randomly on every page refresh. When you select/deselect checkboxes and refresh the page (without posting the changes), Firefox will remember your choices. Now the issue is that when the table is unsorted and the rows keep changing on page refresh, Firefox has trouble remembering your choices. This makes it appear as if the checkboxes are magically changing values on each page refresh. Here is a patch that prevents this problem by sorting the messaging settings. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 46ac35f8e11c06a784ca309b0dc876aff9469edb) Signed-off-by: Chris Cormack commit 9c31f1af9bb7b87dd794f40dd2bc7673b720c674 Author: Kyle M Hall Date: Mon Aug 31 09:36:02 2015 -0400 Bug 14760: Disabled courses display in the course reserves list for items If an item is on reserve for two courses but one of those courses is disabled, both courses are still listed on opac-detail.pl! Test Plan: 1) Enable course reserves 2) Create two courses 3) Place one item on reserve for both courses 4) Disable one of the two courses 5) View the record details for that record/item 6) You should see both courses listed in the course reserves column 7) Apply this patch 8) Reload the page 9) You should now only see the active course in the course reseves column Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 73e9dcb70fcf24dc87af7c5af6f38102206863ae) Signed-off-by: Chris Cormack commit d1ce272dd2a5c75862db16d2b0682b0a9d654565 Author: Jonathan Druart Date: Tue Aug 4 10:38:29 2015 +0100 Bug 14470: Do not allow renew for on-site checkouts At the opac, the renew checkbox should not be displayed if it's an on-site checkout (same on the intranet). On the way, this patch adds a specific message to the intranet if the librarian try to renew an on-site checkout. Indeed before this patch a renew was allowed if the barcode was scanned. Test plan: 1/ Create an on-site checkout for a patron 2/ Confirm that the checkbox 'renew' is not displayed on the checkout list tables 3/ At the OPAC, the renew should not be allowed (no checkbox) 4/ Try to check the item out to the same patron, confirm that you get a specifig message to inform you the renew is not allowed for on-site checkouts. Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Changed 'issue' to 'item' in the error message. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit ea92a92f5384c3256de55b770d31342f796edc47) Signed-off-by: Chris Cormack Conflicts: t/db_dependent/Circulation.t ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 10 ++++- C4/Members/Messaging.pm | 3 ++ about.pl | 5 +++ circ/returns.pl | 1 + koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 26 ++++++------ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 ++ .../prog/en/modules/circ/circulation.tt | 9 +++++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 9 +++-- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 18 +++++---- members/memberentry.pl | 14 +++---- opac/opac-messaging.pl | 10 ++--- t/db_dependent/Circulation.t | 42 +++++++++++++++++++- 12 files changed, 107 insertions(+), 43 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 19:50:38 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 17:50:38 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-55-g3d74a82 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, 3.20.x has been updated via 3d74a820b23b7b912dea969f88a865bc714be50c (commit) via cf88d263353ef5305d8e34097310eeeac520dba1 (commit) via 970af1b6abe0cc61374fc372c98365c6e04e6e94 (commit) via 715a7bf4f5ff7c05e310a5e98f7cdc177afd3e8f (commit) via 085272aec0af72e3178f2c6e6ae53f6ea1d48bf1 (commit) via ad0375f740ff4b035a5a43c75f30d578d0d7d251 (commit) via 74e6691cf84e51b20832b45cf7520aec85788771 (commit) via 0a0f8b09d947aabef21c6cb79e796786ce3be7d5 (commit) via 3caa3703c272be52b6cf161a086271ca9be3eb01 (commit) via 04319600c32fc3145cfd2457258e97174e4f2cd6 (commit) via b609ddc5dbb02b631f776e9bc664d88e7c1beeae (commit) from fc2b3400eff5965adf5ffd523213de868ad43ac8 (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 3d74a820b23b7b912dea969f88a865bc714be50c Author: Jonathan Druart Date: Wed Sep 2 14:28:52 2015 +0100 Bug 7634: Prevent permanent_location to be set to NULL if not defined The permanent_location is correctly filled when an item is added from the cataloguing module (routine set_item_default_location from cataloguing/additem.pl). But when records are imported, this filled is not managed. It's only on editing (_do_column_fixes_for_mod called from ModItem). This patch set the permanent_location item fields to the location value for all items created, even the imported ones. Test plan: 0/ Do not apply this patch 1/ Import a record with items using the "Stage MARC for import" tool 2/ Check the values for the permanent_location in the items table. They are set to NULL 3/ Apply this patch 4/ Repeat 2 and confirm that now the permanent_location values are set to the location values. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit a2ca59efb877945f7b2ebc92e7643d4cdaf9d4e1) Signed-off-by: Chris Cormack commit cf88d263353ef5305d8e34097310eeeac520dba1 Author: Jonathan Druart Date: Wed Sep 2 14:46:02 2015 +0100 Bug 7634: Add tests Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit ae5ee62d598ccb0cfe4fb6cc4a3b2ab6408febd8) Signed-off-by: Chris Cormack commit 970af1b6abe0cc61374fc372c98365c6e04e6e94 Author: Jonathan Druart Date: Wed Sep 2 14:43:15 2015 +0100 Bug 7634: Make the tests pass This patch just fixed a master bug, if your database already has some items.homebranch set to CPL Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 704aed77ea03bf8a0a0e4ece457e91fb7937742d) Signed-off-by: Chris Cormack commit 715a7bf4f5ff7c05e310a5e98f7cdc177afd3e8f Author: Jonathan Druart Date: Tue Jul 14 11:38:41 2015 +0100 Bug 6756: Add info messages NOTE: Before patch "./misc/cronjobs/batch_anonymise.pl --help" had no message, and neither did the anonymizing tool in the staff client. After the patch, both had informative messages. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1acddd0f1b41e9e5f75b75d9d101c8b0879c00c5) Signed-off-by: Chris Cormack commit 085272aec0af72e3178f2c6e6ae53f6ea1d48bf1 Author: Jonathan Druart Date: Tue Jul 14 11:30:51 2015 +0100 Bug 6756: Fix bad behaviors if AnonymousPatron is not defined There are at least 2 wrong behaviors if the AnonymousPatron pref is not defined (0 or empty string). 1/ If you use the clean borrower tools, you will get a successful message when the nothing happened (the history has not been anonymised). 2/ At the OPAC, if a patron ask for delete his reading history, he will get an error message "The deletion of your reading history failed, because there is a problem with the configuration of this feature. Please help to fix the system by informing your libr ary of this error". IMO this should not happen, the history should be anonymised. With this patch, the old_issues.borrowernumber field will be set to NULL if the AnonymousPatron pref if not defined. Test plan: 1/ Fill the pref with "" or 0 2/ At the OPAC, go on the privacy tab and click on the "Immedia deletion" button. You should get a green and friendly message. Confirm that the history has been anonymised. 3/ Use the "Batch patron anonymization" tools (tools/cleanborrowers.pl) to anonymize the checkout history. Confirm that a) it works and b) you get a message. Try again with AnonymousPatron set to a valid patron. You should not see any changes with the current behaviors. NOTE: This patch tweaks C4/Circulation.pm and provides tests. applying just this, and running prove success. Reverting just C4/Circulation.pm fails, as expected. Tested OPAC stuff with both patches applied. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 224b1c7976567511f1d6715784274169e006edcf) Signed-off-by: Chris Cormack commit ad0375f740ff4b035a5a43c75f30d578d0d7d251 Author: Jonathan Druart Date: Mon Sep 14 10:28:01 2015 +0100 Bug 14813: Fix encoding issues on editing help pages It has been introduced by bug 11944. Test plan: 1/ Install and set the fr-FR language (or ar-Arab). 2/ Go on the help page and edit it. 3/ The textarea should not contain encoding issues with this patch. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d671b8661cf02d8b039eb5230ab732fd1fde2301) Signed-off-by: Chris Cormack commit 74e6691cf84e51b20832b45cf7520aec85788771 Author: Jonathan Druart Date: Fri Jul 10 15:18:48 2015 +0100 Bug 8723: Update hold_fill_targets, tmp_holdsqueue and linktracker tables Same as previous patch for 3 other tables. Test plan: Same as before but the hold should exist to the 3 tables before the move. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit c7a6745bc0e0241e5f39a12e2ff4e17678288b14) Signed-off-by: Chris Cormack commit 0a0f8b09d947aabef21c6cb79e796786ce3be7d5 Author: Jonathan Druart Date: Fri Jul 10 15:04:55 2015 +0100 Bug 8723: Update the reserves table for item-level holds If an item is moved from a biblio to another, the holds should be updated too. See discussion on the bug report for more information. Test plan: 1/ Place a item-level hold on biblio1 2/ Move the item to biblio2 3/ Confirm that the hold still exists and point to the biblio2 This patch should not change the existing behavior for bib-level holds. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 9f8f33e351e1ae5810441a0c9ff7226aafb63c8b) Signed-off-by: Chris Cormack commit 3caa3703c272be52b6cf161a086271ca9be3eb01 Author: Jonathan Druart Date: Fri Jul 10 14:15:42 2015 +0100 Bug 8723: Cover the existing behavior This patch cover the MoveItemFromBiblio subroutine Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit cb4ce631c316a41ac47a17bfdaa4e5591e0e37df) Signed-off-by: Chris Cormack commit 04319600c32fc3145cfd2457258e97174e4f2cd6 Author: Marc V?ron Date: Sat Sep 5 16:41:58 2015 +0200 Bug 14782: Add possibility to search patrons using the username (userid) This patch makes it possible to search for users using the username (userid / login name). To test: - Apply patch - Do searches from Home > Patrons - Search after a full username or parts of a username with Search fields = Standard and Search fields = Userid - Perform the searches from the top bar (expand with [+]) and from the "Filters" part at the left - Make sure that other searches behave as before Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit a71cc14a52589f45bc30dad81b8c7fc0ac35d9fc) Signed-off-by: Chris Cormack commit b609ddc5dbb02b631f776e9bc664d88e7c1beeae Author: Katrin Fischer Date: Sun Sep 13 18:06:46 2015 +0200 Bug 14782: Add tests Run: perl t/db_dependent/Utils/Datatables_Members.t Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f704fbebd86e0034cf285b2dd29c0d85cb2086a2) Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 5 +- C4/Items.pm | 27 +++- C4/Utils/DataTables/Members.pm | 3 +- edithelp.pl | 15 +-- .../prog/en/includes/patron-search.inc | 5 + .../prog/en/modules/members/member.tt | 5 + .../prog/en/modules/tools/cleanborrowers.tt | 4 + misc/cronjobs/batch_anonymise.pl | 1 + svc/members/search | 2 +- t/db_dependent/Circulation/AnonymiseIssueHistory.t | 138 ++++++++++++++++++++ t/db_dependent/Items.t | 18 ++- t/db_dependent/Items/MoveItemFromBiblio.t | 84 ++++++++++++ t/db_dependent/Utils/Datatables_Members.t | 25 +++- 13 files changed, 310 insertions(+), 22 deletions(-) create mode 100644 t/db_dependent/Circulation/AnonymiseIssueHistory.t create mode 100644 t/db_dependent/Items/MoveItemFromBiblio.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 20:06:48 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 18:06:48 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-67-gcf09864 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, 3.20.x has been updated via cf098649a80ee9ee5fe7f505828b0eec56bef93d (commit) via f2663af7d1ead6efd7ccc121492a9f264e08b9fc (commit) via 047f0a486b8db459b0be20e052b9b3cdbf37a584 (commit) via 08c7606c36f4383b402480ddab8a01dfa9acdccf (commit) via 14e3841f5104480842eba9848d9bf662647b2413 (commit) via b73c432887734ae2bd8de87b0c0d6fec1f6a1d4c (commit) via fbdce06c4cdbd1b9056c7c4d9e385920e3ccb9a5 (commit) via 2d4e38a25774e9a96d00ad69a46337f38fd40e0a (commit) via 4c7bd247ef456190199f941f5a4479e948341d70 (commit) via b565d3a62a0ae7980ac58f653182e0e6c0ccf914 (commit) via 847259a2ef062555c3595858421e93a5f4d0e9f3 (commit) via 1b03fc78a1ac9f84464752c5f35e0ff54ffbbb14 (commit) from 3d74a820b23b7b912dea969f88a865bc714be50c (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 cf098649a80ee9ee5fe7f505828b0eec56bef93d Author: Jonathan Druart Date: Mon Sep 14 10:50:12 2015 +0100 Bug 14298: Add perms for other languages Signed-off-by: Katrin Fischer commit f2663af7d1ead6efd7ccc121492a9f264e08b9fc Author: Jonathan Druart Date: Wed Sep 2 16:30:15 2015 +0100 Bug 14298: Add warning to the about page if the sco user does not have correct permissions Signed-off-by: Chris Cormack Note: Made a little change, changed He should have, to They should have Signed-off-by: Katrin Fischer commit 047f0a486b8db459b0be20e052b9b3cdbf37a584 Author: Jonathan Druart Date: Wed Sep 2 16:10:45 2015 +0100 Bug 14298: Use the new permission in the sco scripts Signed-off-by: Chris Cormack Note without this patch, you won't be able to access the SCO side. So don't panic if you cant use SCO with just the first patch Signed-off-by: Katrin Fischer commit 08c7606c36f4383b402480ddab8a01dfa9acdccf Author: Jonathan Druart Date: Wed Sep 2 16:09:35 2015 +0100 Bug 14298: Add the new 'self_checkout' permissions There is a security issue in the self checkout module. The user used to check items out must have the circulate => circulate_remaining_permissions permissions. So even if a user does not have a login/password or a barcode he cans access to the circulation module of the intranet. Imagine if the sco patron used is a superlibrarian... This patch set will change the behavior and adds a new permission to access to the sco module (circulate => self_checkout). This permission should be the only one defined for this patron. IMPORTANT NOTE: Hopefully, this only works if both interfaces use the same domains (but different ports). Test plan: 0/ Does not apply this patch set 1/ Create a patron with the circulate => circulate_remaining_permissions and some others. Note his userid/pwd (later 'sco/sco'). Turn on WebBasedSelfCheck and AutoSelfCheckAllowed Fill the AutoSelfCheckID and AutoSelfCheckPass wich 'sco' and 'sco' 2/ Log you out from the OPAC and the intranet 3/ Go on the sco page 4/ Note that your are automatically logged in 5/ Go on the circulation module on the intranet side 6/ Oops 7/ Apply this patch 8/ Execute the updatedatabase 9/ Note that the sco user only has the new permission circulate => self_checkout, others have been removed 10/ Try to reproduce the issue, it should not access anything on the intranet side 11/ Confirm that there is no regression in the sco module Signed-off-by: Chris Cormack Works well no regressions, changes the permissions appropriately. Signed-off-by: Katrin Fischer commit 14e3841f5104480842eba9848d9bf662647b2413 Author: Aleisha Date: Wed Jul 22 01:37:30 2015 +0000 Bug 14585: Fixing up online help on main page To test: 1) Go to home page of staff client and click the Help 2) Notice: 'you should now 'got to' Koha' 'settings found in 'a'dministration.' (should be capitalized) 'Once that user is set you should use that user to log in rather than the root user set up as part of installation.' (could be worded better) 3) Apply patch, close Help, reload page, reopen Help 4) Notice: 'got to' --> 'go to' 'administration' --> 'Administration' 'Once that user is set you should use that user to log in rather than the root user set up as part of installation.' Signed-off-by: Joonas Kylm?l? Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d810fd1094541ee4c95289df3f18bf765047335b) Signed-off-by: Chris Cormack commit b73c432887734ae2bd8de87b0c0d6fec1f6a1d4c Author: Genevieve Plantin Date: Tue Sep 8 13:58:10 2015 -0400 Bug 13781: Fix missing heading columns for relative's checkouts table in check out patron page Theres was two missing heading columns Location and Fines in the Check out section of a Patron Tested both patches together. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit bcb6e9ea39dce065e8c7ff80b4d1b7b49e1735f4) Signed-off-by: Chris Cormack commit fbdce06c4cdbd1b9056c7c4d9e385920e3ccb9a5 Author: Genevieve Plantin Date: Fri Sep 4 09:15:26 2015 -0400 Bug 13781: Fix relatives's checkouts missing heading columns There was two missing heading columns (location and fine) and one hidden heading missing column (this hidden column is needing for sorting the table) it was taking the due_date column for the hidden column, so I added them Both patches tested together. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit e0e3efacca9e4e605f0e1c5612ace38194a2f878) Signed-off-by: Chris Cormack commit 2d4e38a25774e9a96d00ad69a46337f38fd40e0a Author: Tomas Cohen Arazi Date: Wed Sep 16 11:51:12 2015 -0300 Bug 14245: (QA followup) already global The original patch correctly unmasks the global variable (by removing the 'my' on the marc2ris function, but wrongly introduces a new global variable. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 7349777f14b8d4c11f74da2098568a6966800e5a) Signed-off-by: Chris Cormack commit 4c7bd247ef456190199f941f5a4479e948341d70 Author: Bernardo Gonzalez Kriegel Date: Thu May 21 14:00:05 2015 -0300 Bug 14245: Problems with RIS export in unimarc Variable $itype is used an all C4/Ris.pm to switch between marc falvors, but is local and not passed along as argument. As a quick solution, is defined as global To test: 1) On UNIMARC setup, export a record as RIS, check that author (and other fields) are displayed incorrectly 2) Apply the patch 3) Export again, improved results 4) Run t/Ris.t There are other problems in this script, needs maintenance (e.g. no Modern::Perl friendly) Signed-off-by: Victor do Ros?rio Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit e15621fee2693059cce67882691ad8eae9a5c9b7) Signed-off-by: Chris Cormack commit b565d3a62a0ae7980ac58f653182e0e6c0ccf914 Author: Kyle M Hall Date: Tue Aug 25 10:35:28 2015 -0400 Bug 14640: 'Cancel Hold' check box on check-out confirmation does not cancel the hold when item is checked out. This bug is dealing with the situation where an item is checked out to a patron that is not the next in line hold-wise for an item. In this case, Koha will warn the librarian that there are holds on the item and show the first person in line. Again, I want to stress that this is the case where the item *is not waiting* for a patron. The hold for the patron listed will just have a priority of 1. The only situation where the "Cancel hold" checkbox will function is when the priority 1 hold is an item level hold. This is due to the fact that CancelReserve is being passed the trio of biblionumber, borrowernumber, and itemnumber rather than the singular reserve_id. 1) place biblio level hold on a book to borrower A. 2) check out an item of the book to borrower B. 3) When confirming checkout, check the 'Cancel hold' check-box, and click the "Yes, check out" button. 4) Note the hold was not canceled 5) Apply this patch 6) Repeat steps 1 through 3 7) Note the hold was indeed canceled Signed-off-by: Joonas Kylm?l? Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit a37b3bb7f76b5ddea7400f5268c592c0cc578a8c) Signed-off-by: Chris Cormack commit 847259a2ef062555c3595858421e93a5f4d0e9f3 Author: Jonathan Druart Date: Tue Sep 1 10:52:51 2015 +0100 Bug 14640: Add tests Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 10820de380695f90fd544b40b52682efcf83a962) Signed-off-by: Chris Cormack commit 1b03fc78a1ac9f84464752c5f35e0ff54ffbbb14 Author: Jonathan Druart Date: Tue Jul 14 15:02:42 2015 +0100 Bug 10005: Inventory - Add an option to not check in items The inventory tools automatically check in items, this patch adds it as an option. Test plan: 1/ Check an item out, fill a file with its barcode, and use this file in the inventory tools. 2/ Check the new checkbox and confirm that the item is not checked in 3/ Repeat again and don't check it, the behavior should be the same as before this patch. Signed-off-by: Jason Robb Signed-off-by: Katrin Fischer Added a missing . Patch works as expected. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit e5f604378a45d62e8b454cd390abb18b34ef53f8) Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 6 +---- C4/Ris.pm | 6 ++--- about.pl | 28 ++++++++++++++++++++ ...98_add_permissions_circulate_self_checkout.perl | 27 +++++++++++++++++++ .../data/mysql/de-DE/mandatory/userpermissions.sql | 1 + .../data/mysql/en/mandatory/userpermissions.sql | 1 + .../data/mysql/es-ES/mandatory/userpermissions.sql | 1 + .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + .../data/mysql/it-IT/necessari/userpermissions.sql | 1 + .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 + .../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 + .../ru-RU/mandatory/permissions_and_user_flags.sql | 1 + .../uk-UA/mandatory/permissions_and_user_flags.sql | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 14 ++++++++-- .../prog/en/modules/circ/circulation.tt | 2 ++ .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 6 ++--- .../prog/en/modules/members/moremember.tt | 3 +++ .../prog/en/modules/tools/inventory.tt | 4 +++ opac/sco/help.pl | 2 +- opac/sco/sco-main.pl | 3 ++- opac/sco/sco-patron-image.pl | 2 +- t/db_dependent/Circulation_issue.t | 26 ++++++++++++------ tools/inventory.pl | 19 +++++++------ 23 files changed, 125 insertions(+), 32 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_14298_add_permissions_circulate_self_checkout.perl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 20:25:16 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 18:25:16 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.03-68-ge0c926e 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, 3.20.x has been updated via e0c926e0104e3fb73d80d8bea07ea8b6f90807b3 (commit) from cf098649a80ee9ee5fe7f505828b0eec56bef93d (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 e0c926e0104e3fb73d80d8bea07ea8b6f90807b3 Author: Chris Cormack Date: Wed Sep 23 06:27:21 2015 +1200 Bug 14298: Update database ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- ...98_add_permissions_circulate_self_checkout.perl | 27 -------------- installer/data/mysql/updatedatabase.pl | 37 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 28 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_14298_add_permissions_circulate_self_checkout.perl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 20:31:41 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 18:31:41 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.04 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, 3.20.x has been updated via 773d77688390e0a7e5b9fac301555176fab3f143 (commit) via 4c5b96c6485cd933dd399428a00e1855f7de41ef (commit) from e0c926e0104e3fb73d80d8bea07ea8b6f90807b3 (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 773d77688390e0a7e5b9fac301555176fab3f143 Author: Chris Cormack Date: Wed Sep 23 06:33:40 2015 +1200 Release notes for 3.20.4 commit 4c5b96c6485cd933dd399428a00e1855f7de41ef Author: Chris Cormack Date: Wed Sep 23 06:31:44 2015 +1200 Bumping version number for release ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 6 + misc/release_notes/release_notes_3_20_4.html | 418 ++++++++++++++++++++ ...e_notes_3_20_3.txt => release_notes_3_20_4.txt} | 244 +++++++----- 4 files changed, 578 insertions(+), 92 deletions(-) create mode 100644 misc/release_notes/release_notes_3_20_4.html copy misc/release_notes/{release_notes_3_20_3.txt => release_notes_3_20_4.txt} (50%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 22 20:31:42 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 18:31:42 +0000 Subject: [koha-commits] main Koha release repository annotated tag v3.20.04 created. v3.20.04 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 annotated tag, v3.20.04 has been created at 433f9fd35d35425d0e1d2513f3949391b300eb64 (tag) tagging 773d77688390e0a7e5b9fac301555176fab3f143 (commit) replaces v3.20.03 tagged by Chris Cormack on Wed Sep 23 06:34:23 2015 +1200 - Log ----------------------------------------------------------------- Koha Release 3.20.04 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJWAZ8vAAoJEG5T+NVYEYs1OXcP/RaTiNIqQYAlpZeOZd4TjsMQ eDDEzTWQO9FY4pHUXKMCcP+35wZQD5XWDstMdlV/R9crNSnvzzj3RorswwjoNqZs LBeiVVZqct0sDCKVNjpi7Mq9ENweoJkYHiqv4obMAO4TgdrR6k5/MmBgZM+jyDGQ idQqTd5Sm0iT9tlZM0oOaGVT9MLK6ekCV+7HbNKbpv0CHQYnHq9dUzivP/aif/i3 eHWVWh1XWsLOVn4j0fQAdJipLp+03rG4c9ocYAyebJSRU0XO2Cz+I28pW5CaHfUw DUeVoGAsflJ98JECk/8pSEWApaW1r9DP4V5AoPADszDKSK0impc6iBCGAjzpVXlp wLXjajFPsSF3xJHeLQrIy7SeVHX223YOsyg1RtwOJpjzA831OtJtR6qgX9fZeStJ suyRAFwmX1Zf5f5muaiOSzEtqrqImUa/MC7Gj7YCuk+nIt6FJHusou966CH/VnxF yhYO6oLXgWmET4saFKFyeql3NIulfmuLvnYfUnvjUnWSvo9Q5f4FuMCAllxKdkq4 WVBCoSO2+hLkk3vcPetzbNjI9fW26TYVFFD4VTnmZ+9yVk52g9p9tvi577CBe+jp XZpMW4A5rQGfXu2D9MPqRlfg8TJ1jjC3kGSmG4D8uWPMVfl4eTqe/Dr0Teo+JMK8 6VSZucdw1LzBYD2RMbxR =Bs7E -----END PGP SIGNATURE----- Aleisha (2): Bug 14634: Warns when placing hold on record with no items Bug 14585: Fixing up online help on main page Benjamin Rokseth (1): Bug 14361: koha-restart-zebra fails and probably breaks upgrade Bernardo Gonzalez Kriegel (1): Bug 14245: Problems with RIS export in unimarc Blou (1): Bug 14726: Checkout summary doesn't show title Chris Cormack (5): Bug 14717: Invalid dates in debarred column Fixing the number of tests Bug 14298: Update database Bumping version number for release Release notes for 3.20.4 Fridolin Somers (2): Bug 14721: OAI-PMH must return error when no results Bug 14649: Followup - correct budget_period_id in fund name link Genevieve Plantin (2): Bug 13781: Fix relatives's checkouts missing heading columns Bug 13781: Fix missing heading columns for relative's checkouts table in check out patron page Jonathan Druart (35): Bug 14685: Fix set guarantor for a child or professional accounts Bug 14205: Deleting an Item/Record does not remove link to course reserve Bug 14709: Do not access to C4::Context->userenv from the commandline Bug 14584: Encoding broken with system preferences Bug 11247: Improve tests Bug 13943: Prevent the deletion of items if the user cancels Bug 12885: Fix if url contains +*... and HTML5 Media is enabled Bug 12965: Prevent to erase an existing item type Bug 14354: Prevent edition of items from other branches if IndependentBranches is on Bug 11273: FIX barcode generation in acquisition if hbyymmincr Bug 14717: Prevent 0000-00-00 on updating a patron Bug 14171: Update borrowers date fields Bug 14649: Fix regression - display fund name on budget planning Bug 14343: Remove the DT pagination Bug 12525: FIX patron lists dropdown is empty Bug 12525: Prevent adding several patron lists with the same name Bug 14470: Do not allow renew for on-site checkouts Bug 14655: Add a warning if the checkin will fail Bug 14655: Add a warning on the about page if patrons have requested privacy Bug 14655: Fix wording Bug 8723: Cover the existing behavior Bug 8723: Update the reserves table for item-level holds Bug 8723: Update hold_fill_targets, tmp_holdsqueue and linktracker tables Bug 14813: Fix encoding issues on editing help pages Bug 6756: Fix bad behaviors if AnonymousPatron is not defined Bug 6756: Add info messages Bug 7634: Make the tests pass Bug 7634: Add tests Bug 7634: Prevent permanent_location to be set to NULL if not defined Bug 10005: Inventory - Add an option to not check in items Bug 14640: Add tests Bug 14298: Add the new 'self_checkout' permissions Bug 14298: Use the new permission in the sco scripts Bug 14298: Add warning to the about page if the sco user does not have correct permissions Bug 14298: Add perms for other languages Joonas Kylm?l? (3): Bug 14579: 'You are not logged in' should link to log in page Bug 14703: Holidays description shows \r\n for every new line Bug 14683: Unable to clear SMS number Julian Maurice (1): Bug 14766: unimarc_field_4XX: escape ', ", \n, \r Katrin Fischer (1): Bug 14782: Add tests Kyle M Hall (3): Bug 12632: Hold limits ignored for record level holds with item level itemtypes Bug 14760: Disabled courses display in the course reserves list for items Bug 14640: 'Cancel Hold' check box on check-out confirmation does not cancel the hold when item is checked out. Lari Taskula (1): Bug 14621: Messaging preferences table needs to be sorted Lyon3 Team (1): Bug 14343: Incorrect links to results pages in Receive Shipment List Marc V?ron (1): Bug 14782: Add possibility to search patrons using the username (userid) Marcel de Rooy (3): Bug 11247: Add a simple unit test for TransformHtmlToXml Bug 14683: [QA Follow-up] Mixup between mobile and smsalertnumber Bug 14683: [QA Follow-up] Similar change for staff Paul Poulain (1): Bug 14766: Complete cataloguing plugin unimarc_field_4XX Srdjan (1): Bug 11247: Fix calls of TransformHtmlToXml Tomas Cohen Arazi (5): Bug 14737: wrong permissions required for cn_browser.pl plugin Bug 14205: DBRev 3.20.03.001 Bug 14205: (RM followup) DBIx updates Bug 14717: DBRev 3.21.00.023 Bug 14245: (QA followup) already global ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Sep 23 01:15:59 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 22 Sep 2015 23:15:59 +0000 Subject: [koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-33-g9d7e88e 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, 3.18.x has been updated via 9d7e88e32582c9561d20d5931a9864ccbc381b7f (commit) via 2776573ba695b817cb7f30bc93437d63b5c85043 (commit) via 7b224a7d3557956666e95553c4e04ce93e42e1e9 (commit) via 79b2b65fdc0fb6895c9161b616ed4db181ce6cb5 (commit) via 2b0cb5b918b3fb456421fbd1bbcdfbe81365bb58 (commit) via bc72ef5ccae6c0b0c42feaba09a410e5185d5bd4 (commit) via 1b686528f78d31afec8fe9a446e6851f6561bde8 (commit) via 2968de1c4e5fe523f1ed23d219908df9d8dfe9a8 (commit) from c8bc1335664511def17dc40be57cba058e26d44b (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 9d7e88e32582c9561d20d5931a9864ccbc381b7f Author: Jonathan Druart Date: Tue Aug 18 18:10:37 2015 +0100 Bug 14655: Add a warning if the checkin will fail On the checkin and checkout page, the checkin will fail if the patron has requested the privacy and the AnonymousPatron is not correctly set. This patch adds a warning message on both pages. Test plan: 0/ Be sure you don't have any patron with privacy=2 (Never) 1/ Set OPACPrivacy, not AnonymousPatron 2/ Go on the checkin, you should a warning (same as before this patch). 3/ Set the privacy=2 for a patron 4/ Go on the circulation page, a warning should appear (for this specific patron) 5/ Check an item out to this patron 6/ Check the item in on the checkin page. The item is not checked in and you get a specific message for this patron. Confirm other/correct situations don't trigger the messages. Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit cb2151529e0c2d031a01e68bd5deab26d2ffbaff) Signed-off-by: Chris Cormack (cherry picked from commit 625aec5b8541f8e83fa3bbea473616f90ab1396d) Signed-off-by: Liz Rea commit 2776573ba695b817cb7f30bc93437d63b5c85043 Author: Marcel de Rooy Date: Tue Sep 1 16:11:54 2015 +0200 Bug 14683: [QA Follow-up] Similar change for staff Script memberentry.pl contained a similar line. Solution is simpler here. Test plan: [1] Add, change or clear the sms number at staff side. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit bdf4894c507f4bac6b2b79c7ca3b7a556d246ed5) Signed-off-by: Chris Cormack (cherry picked from commit c323e07c0c7ec403af15e40da7d82b997cb3eefc) Signed-off-by: Liz Rea commit 7b224a7d3557956666e95553c4e04ce93e42e1e9 Author: Marcel de Rooy Date: Fri Aug 28 09:13:09 2015 +0200 Bug 14683: [QA Follow-up] Mixup between mobile and smsalertnumber This is an issue discussed on older reports already in the past. Column mobile in borrowers is actually 'Other phone', not necessary a mobile number. The name of the field is confusing. (Renaming it is outside the scope of this report.) The field that we are editing here is smsalertnumber. It should not be compared with mobile at all. What could be the side-effect of this correction? === First, the change is only relevant for libraries with pref SMSSendDriver enabled. In the past patrons editing their message preferences saw mobile (read: other phone) in their smsalertnumber field (if the latter was still empty). If they saved it, it was copied to smsalertnumber. This change does not affect these patrons. They just have the same number in two columns. No big deal. What if a patron does not yet have a smsalertnumber? In that case no sms is sent in Letters.pm. So no change in behavior. If he submits opac-messaging now, he will no longer copy his other phone to smsalert [we cannot assume that it was mobile anyway!]. If he enters a mobile number, it will be saved correctly in the right field. Conclusion: this change will not break things or hurt anyone. It only prevents unwanted copying other phone to smsalertnumber. Also modified the compare to prevent uninitialized warnings. And removed a commented warn. Test plan: [1] Add, edit or delete the SMS number on opac-messaging regardless of the value of Other Phone (in the badly named mobile field). Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 9b8d7168beb27342c4c483a0812e3a6789fabced) Signed-off-by: Chris Cormack (cherry picked from commit bc720464216eca9d5283596af23d2c2c926e7093) Signed-off-by: Liz Rea commit 79b2b65fdc0fb6895c9161b616ed4db181ce6cb5 Author: Joonas Kylm?l? Date: Wed Aug 19 11:42:50 2015 +0000 Bug 14683: Unable to clear SMS number Enables to clear SMS number. To test: 1. Go to opac-messaging.pl 2. Insert SMS number and submit 3. Clear SMS number and submit 4. Observe that the sms number did not change 5. Apply patch 6. Clear SMS number and submit 7. Observe that the sms number changes Sponsored-by: Vaara-kirjastot Signed-off-by: Marcel de Rooy Adding a follow-up. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5b1c7e4c359e974e5aca801579db72b356741a0f) Signed-off-by: Chris Cormack (cherry picked from commit 227d7b950e682300a7697ada4f6837a950f098e6) Signed-off-by: Liz Rea commit 2b0cb5b918b3fb456421fbd1bbcdfbe81365bb58 Author: Lari Taskula Date: Thu Jul 30 18:34:49 2015 +0300 Bug 14621: Messaging preferences table needs to be sorted I have been working with messaging preferences and I noticed a weird issue in Firefox on Ubuntu. On messaging preferences page, the table is unsorted and the content in rows are generated randomly on every page refresh. When you select/deselect checkboxes and refresh the page (without posting the changes), Firefox will remember your choices. Now the issue is that when the table is unsorted and the rows keep changing on page refresh, Firefox has trouble remembering your choices. This makes it appear as if the checkboxes are magically changing values on each page refresh. Here is a patch that prevents this problem by sorting the messaging settings. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 46ac35f8e11c06a784ca309b0dc876aff9469edb) Signed-off-by: Chris Cormack (cherry picked from commit 6c44d1f4645b4c98577d6af23b05b9608b421253) Signed-off-by: Liz Rea commit bc72ef5ccae6c0b0c42feaba09a410e5185d5bd4 Author: Kyle M Hall Date: Mon Aug 31 09:36:02 2015 -0400 Bug 14760: Disabled courses display in the course reserves list for items If an item is on reserve for two courses but one of those courses is disabled, both courses are still listed on opac-detail.pl! Test Plan: 1) Enable course reserves 2) Create two courses 3) Place one item on reserve for both courses 4) Disable one of the two courses 5) View the record details for that record/item 6) You should see both courses listed in the course reserves column 7) Apply this patch 8) Reload the page 9) You should now only see the active course in the course reseves column Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 73e9dcb70fcf24dc87af7c5af6f38102206863ae) Signed-off-by: Chris Cormack (cherry picked from commit 9c31f1af9bb7b87dd794f40dd2bc7673b720c674) Signed-off-by: Liz Rea commit 1b686528f78d31afec8fe9a446e6851f6561bde8 Author: Jonathan Druart Date: Tue Aug 4 10:38:29 2015 +0100 Bug 14470: Do not allow renew for on-site checkouts At the opac, the renew checkbox should not be displayed if it's an on-site checkout (same on the intranet). On the way, this patch adds a specific message to the intranet if the librarian try to renew an on-site checkout. Indeed before this patch a renew was allowed if the barcode was scanned. Test plan: 1/ Create an on-site checkout for a patron 2/ Confirm that the checkbox 'renew' is not displayed on the checkout list tables 3/ At the OPAC, the renew should not be allowed (no checkbox) 4/ Try to check the item out to the same patron, confirm that you get a specifig message to inform you the renew is not allowed for on-site checkouts. Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Changed 'issue' to 'item' in the error message. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit ea92a92f5384c3256de55b770d31342f796edc47) Signed-off-by: Chris Cormack Signed-off-by: Liz Rea Conflicts: t/db_dependent/Circulation.t (cherry picked from commit d1ce272dd2a5c75862db16d2b0682b0a9d654565) Signed-off-by: Liz Rea commit 2968de1c4e5fe523f1ed23d219908df9d8dfe9a8 Author: Jonathan Druart Date: Wed Jul 15 11:50:18 2015 +0100 Bug 12525: Prevent adding several patron lists with the same name If you add patron to a patron list, from the patron search result, a list is created when you click on "Save". The list is considered as new each time. To reproduce: 1/ Launch a patron search 2/ Select 1 patron, and create a new list 'aaa' 3/ Select another patron and click Save again 2 lists are created Test plan: 1/ Launch a patron search 2/ Select 1 patron, and create a new list 'aaa' The dropdown list should be populated with this new list, and should be selected 3/ Select another patron and click Save again Only 1 list should be created Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 7f65aaac748833b57f9f1c8ae754d66c7e144d81) Signed-off-by: Chris Cormack (cherry picked from commit faab5c4c2445b8a3454c17d2ab29fb65b601c0c9) Signed-off-by: Liz Rea ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 8 +++- C4/Members/Messaging.pm | 3 ++ circ/returns.pl | 1 + koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 26 ++++++------- .../prog/en/modules/circ/circulation.tt | 9 +++++ .../intranet-tmpl/prog/en/modules/circ/returns.tt | 9 +++-- .../prog/en/modules/members/member.tt | 10 +++++ .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 18 +++++---- members/memberentry.pl | 14 +++---- opac/opac-messaging.pl | 10 ++--- t/db_dependent/Circulation.t | 39 +++++++++++++++++++- 11 files changed, 105 insertions(+), 42 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 25 16:52:18 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 25 Sep 2015 14:52:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-621-gd222e6e 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 d222e6ec21c5d2aea03d839cd82050ca6437f0d4 (commit) via 5d46dbf3e938fbc80436a263cdc417cd798e0ab4 (commit) via 07bad6b3faea8cce9618ca2fa07937925740b30c (commit) via c43b7b63a7d5e8bdb05fa945633af23666d6cfee (commit) via 66d2ded1d2bb68680a799fc6f4e8359623071e2f (commit) via bd021d21035fa25f1732946e0f0a291400ee1c56 (commit) via 8ef69e473b1f1a0daac559bf19818fd04b2c5313 (commit) via 37ad2d78679fc8487811ff9cd1679eecac30faa5 (commit) via e16367f0a8a955c6beac0b165e884be096117db1 (commit) via e131df30a0b939fbec1b89c76eff2d3d84962bd3 (commit) via a888b372f961aee377e8ef037cc249b8e6e523dc (commit) via 8548c6acf962129ef48caa0417aabf3787f9416a (commit) via 995e27b3737dc29f478adad0033c4cc3fa593ec3 (commit) via 0893a7c3dbacd9887f0c196589f1c529e497fcd5 (commit) via f1c9b314bb6c3d20dabbe45880766a63b8c8a7a7 (commit) via 1291dfe5cf5b4c945ac8ae383814a5145fb1904d (commit) from 1e93bd3a94ddb94f0d2ed2dee2e5dee6b73ad808 (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 d222e6ec21c5d2aea03d839cd82050ca6437f0d4 Author: Joonas Kylm?l? Date: Thu Aug 20 09:24:17 2015 +0000 Bug 14505: single quotes in journal number cause print routing list window to not appear Escapes single quotes from serial.serialseq string. Test plan: 1. Have a serial with a number which has single quote in it. 2. Go to Serials -> Find some serial subscription -> Serial collection. 3. Set up a routing list for this serial. 4. Click on Print list under the column Routing. 5. Notice that the print window doesn't open. 6. Apply patch. 7. Notice that the print window opens. Sponsored-by: Vaara-kirjastot Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 5d46dbf3e938fbc80436a263cdc417cd798e0ab4 Author: Tomas Cohen Arazi Date: Wed Jul 8 12:37:31 2015 -0300 Bug 14217: Add 'condition' attribute for DOM index definition This patch introduces an extension to the current syntax for DOM index definition. Specifically, it extends the 'index_subfields' tag to allow adding a 'condition' attribute that is used as a condition ofr applying the specified index. This (exotic) example is self-explanatory: The previous syntax (which is keeped by this patch) took this snippet from biblio-koha-indexdefs.xml Encuadernador:w and generated an XSLT snippet in the DOM indexing XSLT that looks like this: This patch introduces this syntax change (note the 'condition' attribute: Encuadernador:w which yields to this XSLT snippet in the DOM indexing XSLT: To test: - Verify that the shipped XSLT files are current regarding the shipped index definitions: $ for i in marc21 normarc unimarc; do xsltproc etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl \ etc/zebradb/marc_defs/$i/biblios/biblio-koha-indexdefs.xml \ > etc/zebradb/marc_defs/$i/biblios/biblio-zebra-indexdefs.xsl done $ git status (repeat for authorities, skip normarc which doesn't have authorities) - Apply the patch - Re-run the previous commands => SUCCESS: no changes - Add a condition to an index_subfields tag (for example, condition="@ind2='7'" in the Author's index - Regenerate the specific XSLT => SUCCESS: doing a diff shows the only change is the code has been wrapped inside an xslo:if using the condition for the test - Apply the generated xsl to a MARCXML record that has a field matching the condition like this: $ xsltproc .../biblio-zebra-indexdefs.xsl sample_record.xml => SUCCESS: There's an index on the result, containing the configured field/subfields, that matches the criteria. - Sign off and feel really happy :-D Note: the attached sample record includes a 100 field, with ind2=7 and $a=Tomasito Edit: This patch was squashed once I figured it got too complex and Jonathan required a followup to avoid code duplication. This avoids code duplication, with the same results. Sponsored-by: Orex Digital Signed-off-by: Barton Chittenden Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 07bad6b3faea8cce9618ca2fa07937925740b30c Author: Marc V?ron Date: Sun Sep 20 21:39:44 2015 +0200 Bug 14873: Remove C4::Dates from reserve/request.pl This bug removes deprecated C4::Dates from reserve/request.pl To test: - Apply patch - In staff client, search a biblio and try to put a hold for a borrower (Home > Catalog > [Some Biblio] > Place a hold to [Some biblio]) Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit c43b7b63a7d5e8bdb05fa945633af23666d6cfee Author: Jonathan Druart Date: Thu Sep 24 11:28:42 2015 +0100 Bug 14879: Move the date displays to the template There is no special need to format the date in the perl script. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 66d2ded1d2bb68680a799fc6f4e8359623071e2f Author: Marc V?ron Date: Sun Sep 20 23:36:32 2015 +0200 Bug 14879: Remove C4::Dates from catalogue/detail.pl This bug removes deprecated C4::Dates from catalogue/detail.pl To test: Apply patch Go to Home > Catalog > Details for [some biblio with items and holdings] Make sure that biblio and Holdings and Acquisition details display as appropriate Signed-off-by: Josef Moravec Bug 14879 - Remove C4::Dates from catalogue/detail.pl Remove forbidden patterns (tab) to pass QA tools Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit bd021d21035fa25f1732946e0f0a291400ee1c56 Author: Tomas Cohen Arazi Date: Fri Sep 25 11:47:23 2015 -0300 Bug 14733: (QA followup) make tests independent of already defined branches The current tests were expecting the first defined branch to be CPL. That's not the case on my box so they failed. This patch adds the creation of two new random branches/branchcodes, and replaces the legacy use of CPL and MPL in favour of the new ones. It relies on TestBuilder for the task. Signed-off-by: Tomas Cohen Arazi commit 8ef69e473b1f1a0daac559bf19818fd04b2c5313 Author: Jonathan Druart Date: Mon Sep 21 16:46:00 2015 +0100 Bug 14733: Replace 'priority' with 'estimated priority' Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 37ad2d78679fc8487811ff9cd1679eecac30faa5 Author: Kyle M Hall Date: Wed Aug 26 11:43:08 2015 -0400 Bug 14733: Prevent a record from having holds with duplicate priorities It is possible to create holds with duplicate priorities. The reason for this is that typically the priority is calculated before placing the hold. When the hold is placed the priority is calculated. This can easily be shown by opening up two browser windows and starting to place a hold for a record in each one. You'll see that both list the same priority. If you than place the hold in each window, both holds will have the same priority! Test Plan: 1) Run unit tests pre-patch, note they fail 2) Run unit tests post-patch, note they succeed Signed-off-by: Heather Braum Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit e16367f0a8a955c6beac0b165e884be096117db1 Author: Kyle M Hall Date: Wed Aug 26 11:42:14 2015 -0400 Bug 14733: Unit Tests Signed-off-by: Heather Braum Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit e131df30a0b939fbec1b89c76eff2d3d84962bd3 Author: Tomas Cohen Arazi Date: Fri Sep 25 11:20:13 2015 -0300 Bug 14298: DBRev 3.21.00.027 Signed-off-by: Tomas Cohen Arazi commit a888b372f961aee377e8ef037cc249b8e6e523dc Author: Jonathan Druart Date: Mon Sep 14 10:50:12 2015 +0100 Bug 14298: Add perms for other languages Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 8548c6acf962129ef48caa0417aabf3787f9416a Author: Jonathan Druart Date: Wed Sep 2 16:30:15 2015 +0100 Bug 14298: Add warning to the about page if the sco user does not have correct permissions Signed-off-by: Chris Cormack Note: Made a little change, changed He should have, to They should have Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 995e27b3737dc29f478adad0033c4cc3fa593ec3 Author: Jonathan Druart Date: Wed Sep 2 16:10:45 2015 +0100 Bug 14298: Use the new permission in the sco scripts Signed-off-by: Chris Cormack Note without this patch, you won't be able to access the SCO side. So don't panic if you cant use SCO with just the first patch Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 0893a7c3dbacd9887f0c196589f1c529e497fcd5 Author: Jonathan Druart Date: Wed Sep 2 16:09:35 2015 +0100 Bug 14298: Add the new 'self_checkout' permissions There is a security issue in the self checkout module. The user used to check items out must have the circulate => circulate_remaining_permissions permissions. So even if a user does not have a login/password or a barcode he cans access to the circulation module of the intranet. Imagine if the sco patron used is a superlibrarian... This patch set will change the behavior and adds a new permission to access to the sco module (circulate => self_checkout). This permission should be the only one defined for this patron. IMPORTANT NOTE: Hopefully, this only works if both interfaces use the same domains (but different ports). Test plan: 0/ Does not apply this patch set 1/ Create a patron with the circulate => circulate_remaining_permissions and some others. Note his userid/pwd (later 'sco/sco'). Turn on WebBasedSelfCheck and AutoSelfCheckAllowed Fill the AutoSelfCheckID and AutoSelfCheckPass wich 'sco' and 'sco' 2/ Log you out from the OPAC and the intranet 3/ Go on the sco page 4/ Note that your are automatically logged in 5/ Go on the circulation module on the intranet side 6/ Oops 7/ Apply this patch 8/ Execute the updatedatabase 9/ Note that the sco user only has the new permission circulate => self_checkout, others have been removed 10/ Try to reproduce the issue, it should not access anything on the intranet side 11/ Confirm that there is no regression in the sco module Signed-off-by: Chris Cormack Works well no regressions, changes the permissions appropriately. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit f1c9b314bb6c3d20dabbe45880766a63b8c8a7a7 Author: Jonathan Druart Date: Wed Sep 16 09:24:07 2015 +0100 Bug 14817: (follow-up) Fix encoding issues in columns.def Follow-up for reports. Test plan: 1/ Use a translated template (fr-FR or ar-Arab) 2/ Go on the report guided page, step 3 3/ The field names should be correctly encoded. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 1291dfe5cf5b4c945ac8ae383814a5145fb1904d Author: Jonathan Druart Date: Mon Sep 14 15:02:50 2015 +0100 Bug 14817: Fix encoding issues in columns.def Test plan: 1/ Use a translated template (fr-FR or ar-Arab) 2/ Go on the tools/import_patrons.pl page 3/ The field names in the "default values" block should be correctly encoded. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Reports/Guided.pm | 2 +- C4/Reserves.pm | 2 + C4/Templates.pm | 2 +- Koha.pm | 2 +- about.pl | 28 +++++++ catalogue/detail.pl | 8 +- etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl | 71 ++++++++++------- .../data/mysql/de-DE/mandatory/userpermissions.sql | 1 + .../data/mysql/en/mandatory/userpermissions.sql | 1 + .../data/mysql/es-ES/mandatory/userpermissions.sql | 1 + .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + .../data/mysql/it-IT/necessari/userpermissions.sql | 1 + .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 + .../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 + .../ru-RU/mandatory/permissions_and_user_flags.sql | 1 + .../uk-UA/mandatory/permissions_and_user_flags.sql | 1 + installer/data/mysql/updatedatabase.pl | 28 +++++++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 14 +++- .../prog/en/modules/catalogue/detail.tt | 6 +- .../prog/en/modules/reserve/request.tt | 2 +- .../prog/en/modules/serials/serials-collection.tt | 2 +- opac/sco/help.pl | 2 +- opac/sco/sco-main.pl | 3 +- opac/sco/sco-patron-image.pl | 2 +- reserve/request.pl | 12 +-- t/db_dependent/Holds.t | 80 +++++++++++--------- 26 files changed, 186 insertions(+), 89 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 25 20:38:55 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 25 Sep 2015 18:38:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-637-ge818299 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 e8182991804b591dc1730e46da343495af377d2f (commit) via d46c13248741dc76e2e371d297a311f6143f459e (commit) via 0a95ba06f31cd9b648e01047126e2d2a93704209 (commit) via 11c3b688fccbd17cdf7a68d0761f9f1d059b6fdf (commit) via 29216e030f1c2b56d9548dc145e502c9e7d68f36 (commit) via 42c19ee1cc817d28a21591b2ed5fba5f1172f133 (commit) via 9f753799d8f644f0d3706574583a817ffda58bf9 (commit) via 1f5be3ffabdf259f4c415634359aa682d6455c45 (commit) via 9e8d89dd70d1a5dde4dc700eea16b5b1d6edf3fe (commit) via f8a58d310ee96a4bf272c9ae16dc347bf1d0e4ea (commit) via 83ea49a0095853ab414981ff11b93b6f97886fc9 (commit) via ba62a7ef24c9886d15bdc7d526ee92518bffc6f4 (commit) via d94251e017703719c904c66e198bba360f6f9525 (commit) via 54cf0a8aaff2a3484b38ae605124f701072ef802 (commit) via d75da287eacc3bdc2148386beb7a22b738e558f9 (commit) via 9acd29fc25baf17aa018e0827f7379483632beaa (commit) from d222e6ec21c5d2aea03d839cd82050ca6437f0d4 (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 e8182991804b591dc1730e46da343495af377d2f Author: Kyle M Hall Date: Wed Sep 23 10:44:20 2015 -0400 Bug 14883: Librarians are not warned if patron is restricted when placing holds Librarians should be warned that a patron is restricted when placing holds, as they are warned that a patron's acount has expired. Test Plan: 1) Apply this patch 2) Add a restriction for a patron 3) Attempt to place a hold for that patron 4) Note the notice at the top notifying you that the patron is restricted Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit d46c13248741dc76e2e371d297a311f6143f459e Author: Kyle M Hall Date: Wed Sep 23 10:38:32 2015 -0400 Bug 14882: Librarians are not warned if patron owe more than maxoutstanding when placing holds If a patron owes more than the system preference maxoutstanding in fees and fines, the patron will be unable to place holds via the opac. However, a librarian placing a hold for a patron is not even warned! Test Plan: 1) Apply this patch 2) Set maxoutstanding to 1.00 3) Find a patron owing more than 1.00 4) Attempt to place a hold 5) Note the warning that the patron owes money Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 0a95ba06f31cd9b648e01047126e2d2a93704209 Author: Jonathan Druart Date: Mon Aug 24 13:19:28 2015 +0100 Bug 14710: Make the export checkout list export only the checked out item infos This has been introduced by bug 11703. Bug 13190 should have been fixed it. If the pref ExportWithCsvProfile is defined with a MARC CSV profile and it contains item infos to display, only info from the checked out item should be displayed. Test plan: 0/ Don't apply this patch 1/ Create a biblio with 1+ items 2/ Check one of the item out to a patron 3/ Define a CSV profile which contains item fields ("245$a|952$p" for instance) 4/ Export the item (from circ/circulation/pl) using the CSV option Note that the csv contains the barcode from all items 5/ Apply this patch and repeat 4. 6/ Note that the csv contains only the barcode from the checked out item. Signed-off-by: Hector Castro Works as advertised Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 11c3b688fccbd17cdf7a68d0761f9f1d059b6fdf Author: Tomas Cohen Arazi Date: Fri Sep 25 15:33:42 2015 -0300 Bug 14321: (QA followup) remove Test::CGI::Multipart dependency Signed-off-by: Tomas Cohen Arazi commit 29216e030f1c2b56d9548dc145e502c9e7d68f36 Author: Tomas Cohen Arazi Date: Fri Sep 25 15:22:07 2015 -0300 Bug 14321: (RM followup) DBIx update Signed-off-by: Tomas Cohen Arazi commit 42c19ee1cc817d28a21591b2ed5fba5f1172f133 Author: Tomas Cohen Arazi Date: Fri Sep 25 15:17:34 2015 -0300 Bug 14321: DBRev 3.21.00.028 Signed-off-by: Tomas Cohen Arazi commit 9f753799d8f644f0d3706574583a817ffda58bf9 Author: Marcel de Rooy Date: Fri Sep 18 16:01:20 2015 +0200 Bug 14321: [QA Follow-up] Additional QA requests This patch makes following requested changes: [1] Renamed categorycode to uploadcategorycode (with atomicupdate file) [2] Confirmation before deleting an uploaded file [3] Label for Public checkbox can be clicked [4] Back button on result list (not in plugin mode) [5] Correct additional variable interpolation from sql queries Signed-off-by: Marcel de Rooy Tested the db revision, unit test. Uploaded temporary and permanent file, incl. plugin mode. Deleted an upload. Ran stage-marc-import.pl. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 1f5be3ffabdf259f4c415634359aa682d6455c45 Author: Marcel de Rooy Date: Wed Sep 16 13:53:38 2015 +0200 Bug 14321: [QA Follow-up] Changes for Upload.pm and upload-file.pl Based on QA comments, this patch does the following: [1] Destroy an empty DESTROY. [2] Promote some comment lines to POD. [3] Use File::Spec->catfile in sub _full_fname. [4] Remove variable interpolation from a sql query. [5] Add a comment in upload-file.pl. Signed-off-by: Marcel de Rooy Run the unit test again, and uploaded a file. Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 9e8d89dd70d1a5dde4dc700eea16b5b1d6edf3fe Author: Jonathan Druart Date: Wed Sep 16 11:12:04 2015 +0100 Bug 14321: QA Fix Remove QA errors (keys on reference is experimental). Signed-off-by: Marcel de Rooy Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit f8a58d310ee96a4bf272c9ae16dc347bf1d0e4ea Author: Marcel de Rooy Date: Mon Aug 17 13:54:44 2015 +0200 Bug 14321: Final cleanup, removing obsolete files The new Upload.pm, unit test and file-upload.js obsolete a number of files, including an older jQuery plugin. The test files progressbar.pl and progressbarsubmit.pl are outdated and do not serve any purpose in this form. (Actually, we could argue if they should be here or just be part of a debugging phase.) Test plan: [1] Git grep on file-progress, file-upload.inc, UploadedFile, ajaxfileupload, ajaxFileUpload UploadedFile: Only a reference to DBIx file is found ajaxfileupload: Only release notes [2] Upload a file with tools/upload and stage-marc-import. Signed-off-by: Mirko Tietgen Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 83ea49a0095853ab414981ff11b93b6f97886fc9 Author: Marcel de Rooy Date: Sat Aug 8 17:28:25 2015 +0200 Bug 14321: Integrate Upload.pm into Koha This patch makes the following changes to achieve that: [1] Use Upload.pm in stage-marc-import.pl, upload-cover-image.pl, offline_circ/process_koc.pl and enqueue_koc.pl. [2] A new file-upload.js replaces file-upload.inc in the associated template. We now use ajax to get progress figures instead of launching perl script upload-file-progress. The js changes now also allow for aborting a file upload. [3] Adds a tools/upload script and template. It allows to upload multiple files at once. [4] Makes upload-file return error messages in JSON. For a multiple upload, we could have some files with errors and others without errors. The upload is now marked as Failed only if there was no upload at all. [5] The upload plugin is converted to use tools/upload with plugin param. Deleting an upload is now presented via the search results form. NOTE: In editing the process_koc.tt I noticed that the form enqueuefile was hidden and no longer used (with associated code in process_koc.pl). When a file has been uploaded, I display the form again (with the Apply directly button). The code still works. NOTE: We fix an error in upload-file from one of the patches of bug 6874. The userid of the Koha admin user is passed to haspermission, but we should pick the userid from the session. NOTE: Bug 14686 will add a specific permission for tools/upload.pl, and will add the tools/upload script to the Tools menu. For now, you need edit_catalogue to start upload.pl and you will additionally need a permission like upload_local_cover_images to successfully upload a new file. Test plan: [1] Upload a marc file in stage-marc-import. (This is temp storage.) [2] Check new entry in table uploaded_files. Look for the file in your temporary directory (/tmp ?), subfolder koha_upload. Bonus: Remove permissions on this subfolder. Retry, check error and restore permissions again. [3] Upload another (larger) file and abort the upload. Check table and directory again. You should have a partial file, but no record. [4] Verify that Stage for import still works as expected. [5] Test Upload local cover image. (Enable OPACLocalCoverImages.) You can test an individual image or a zip file including images and a file called datalink.txt (with lines biblionumber,filename). [6] Test uploading a offline circulation file: Enable AllowOfflineCirculation, and create a koc file (plain text): Line1: Version=1.0\tA=1\tB=2 Line2: 2015-08-06 08:00:00 345\treturn\t[barcode] Note: Replace tabs and barcode. The number of tabs is essential! Checkout the item with your barcode. Go to Offline circulation file upload. Upload and click Apply directly. Checkout again. Upload again, click Add to offline circulation queue. [7] Upload three files via tools/upload.pl with a category and marked as public. Check the results in the table. Verify that you can download the file in OPAC without being logged in. [8] Pick one new file and one of the files of step 7. Upload them in the same category. One upload should succeed. Check for reported error. [9] Connect upload.pl to field 856$u. Goto Cataloguing editor. In an empty 856$u, click the tag editor. Upload a file and click Choose. Save the record. Open the record in the OPAC and click the link. Copy this link to your clipboard for next step. [A] Go back to editor. Click the tag editor on the same 856 field. Choose for Delete. Open the link in your clipboard again. Error message? [B] Check the process of upload, search, download and delete of an upload with some diacritical characters in the filename. (Bonus points for adding special chars in the category code.) Note: You can add categories via authorized values, UPLOAD key. Signed-off-by: Mirko Tietgen Signed-off-by: Julian Maurice Bug 14321: [QA Follow-up] Perltidy upload.pl Run perltidy -pro=xt/perltidyrc on tools/upload.pl. No other changes. Signed-off-by: Marcel de Rooy Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit ba62a7ef24c9886d15bdc7d526ee92518bffc6f4 Author: Marcel de Rooy Date: Thu Jul 30 19:19:44 2015 +0200 Bug 14321: Introduce Koha::Upload This patch introduces Koha::Upload. It will replace the modules C4::UploadedFile.pm and the new C4::UploadedFiles.pm (from BZ 6874). It also includes a new unit test. NOTE: This unit test will replace the test for UploadedFiles.pm. It will no longer use dependency Test::CGI::Multipart. We are now mocking CGI and its hook to achieve the same result. Test plan: [1] Run t/db_dependent/Upload.t. Note that if you see a WARNING, you will still need to add an entry upload_path to your koha-conf.xml. Or you need to give write permission to your Koha instance user for that folder. Signed-off-by: Mirko Tietgen Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit d94251e017703719c904c66e198bba360f6f9525 Author: Marcel de Rooy Date: Thu Aug 6 15:34:57 2015 +0200 Bug 14321: Add two columns to uploaded_files This patch adds uploaded_files.public and permanent. Public will be used later to mark uploaded files as available via OPAC. Permanent will be used to make the distinction between temporary and permanent storage. The db rev sets both flags for all current records (uploaded via the plugin from BZ 6874). Test plan: [1] If you tested this before, drop the column public first. [1] Run the dbrev. Signed-off-by: Mirko Tietgen Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 54cf0a8aaff2a3484b38ae605124f701072ef802 Author: Kyle M Hall Date: Thu Sep 3 11:03:02 2015 -0400 Bug 14297: (QA followup) Remove unnecessary line Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit d75da287eacc3bdc2148386beb7a22b738e558f9 Author: Kyle M Hall Date: Fri May 29 06:46:24 2015 -0400 Bug 14297: Holds Queue building ignoring holds where pickup & home branch don't match and item is not from least cost branch If a record has a hold on it where the pickup and home branch do not match, the holds queue builder will only look at items from the least cost branch ( as defined by the transport cost matrix or the sys pref StaticHoldsQueueWeight. Test Plan: 1) Create a record with two items, one for library A and one for library B 2) Set your circulation rules such that the book from library A is holdable by all and the book from library B is holdable only by library B patrons 3) Create a hold for a Library C patron for pickup at library C 4) Set the syspref StaticHoldsQueueWeight to by Library B, Library A, Library C in that order 5) Rebuild the holds queue 6) Note the hold wasn't picked up even though the item from library A could have filled the hold 7) Apply this patch 8) Rebuild the holds queue 9) View the holds queue again 10) Note the hold now displays Signed-off-by: Nora Blake Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 9acd29fc25baf17aa018e0827f7379483632beaa Author: Kyle M Hall Date: Thu Aug 27 09:16:43 2015 -0400 Bug 14297: Unit Tests Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/HoldsQueue.pm | 20 + C4/Installer/PerlDependencies.pm | 5 - C4/UploadedFile.pm | 309 -------------- C4/UploadedFiles.pm | 323 --------------- Koha.pm | 2 +- Koha/Schema/Result/UploadedFile.pm | 22 +- Koha/Upload.pm | 427 ++++++++++++++++++++ cataloguing/value_builder/upload.pl | 153 +------ installer/data/mysql/kohastructure.sql | 4 +- installer/data/mysql/updatedatabase.pl | 18 + .../lib/jquery/plugins/ajaxfileupload.js | 200 --------- .../intranet-tmpl/prog/en/includes/file-upload.inc | 70 ---- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 5 +- koha-tmpl/intranet-tmpl/prog/en/js/file-upload.js | 32 ++ .../en/modules/cataloguing/value_builder/upload.tt | 103 ----- .../value_builder/upload_delete_file.tt | 63 --- .../prog/en/modules/offline_circ/process_koc.tt | 39 +- .../prog/en/modules/reserve/request.tt | 9 + .../prog/en/modules/test/progressbar.tt | 43 -- .../prog/en/modules/tools/stage-marc-import.tt | 64 ++- .../prog/en/modules/tools/upload-images.tt | 45 ++- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 361 +++++++++++++++++ .../bootstrap/en/modules/opac-retrieve-file.tt | 6 + offline_circ/enqueue_koc.pl | 6 +- offline_circ/process_koc.pl | 8 +- opac/opac-retrieve-file.pl | 36 +- reserve/request.pl | 5 +- t/db_dependent/HoldsQueue.t | 61 ++- t/db_dependent/Upload.t | 183 +++++++++ t/db_dependent/UploadedFile.t | 16 - t/db_dependent/UploadedFiles.t | 61 --- test/progressbar.pl | 55 --- test/progressbarsubmit.pl | 104 ----- tools/stage-marc-import.pl | 9 +- tools/upload-cover-image.pl | 8 +- tools/upload-file-progress.pl | 62 --- tools/upload-file.pl | 83 ++-- tools/upload.pl | 101 +++++ 38 files changed, 1478 insertions(+), 1643 deletions(-) delete mode 100644 C4/UploadedFile.pm delete mode 100644 C4/UploadedFiles.pm create mode 100644 Koha/Upload.pm delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/ajaxfileupload.js delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/file-upload.js delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-retrieve-file.tt create mode 100644 t/db_dependent/Upload.t delete mode 100755 t/db_dependent/UploadedFile.t delete mode 100644 t/db_dependent/UploadedFiles.t delete mode 100755 test/progressbar.pl delete mode 100755 test/progressbarsubmit.pl delete mode 100755 tools/upload-file-progress.pl create mode 100755 tools/upload.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 28 17:09:55 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 28 Sep 2015 15:09:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-650-g6a5ca69 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 6a5ca69bca091869773863b4436b78f3956589ec (commit) via 72656f3aa3bbd4bbed89e98e235a16e8e597a298 (commit) via e46aa8395b359c773961b1a705d4b9c7f9d3db01 (commit) via 8c3fb9c3ae4729c67a057d5531eb7ae8eb9396c0 (commit) via ecdfa41f8461abb4423e447730deb9b8256ca046 (commit) via 0f56f2b7fcb5c0a92c4fa104eeb9b51a29d5b935 (commit) via c34c8ee853c4ec6a457c5ae8f75729507e242207 (commit) via 67fa231a74426197b4a78f7d7620be2edff08f31 (commit) via 53dd856c66a2c2f77db5e04d8bdf4f34c583b638 (commit) via 1b8f3194e9f616f46260c849eda5a9f6c717d5fa (commit) via 2d69e143d8649aa569f673b37036c3a303b4ffdf (commit) via 71a9b187d86bd5f7c3679d38b3919c9260c3feef (commit) via d7d64c0718cfbb816e9677baecf722427060d3b5 (commit) from e8182991804b591dc1730e46da343495af377d2f (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 6a5ca69bca091869773863b4436b78f3956589ec Author: Tomas Cohen Arazi Date: Mon Sep 28 12:09:40 2015 -0300 Bug 14368: (RM followup) DBIx update Signed-off-by: Tomas Cohen Arazi commit 72656f3aa3bbd4bbed89e98e235a16e8e597a298 Author: Tomas Cohen Arazi Date: Mon Sep 28 12:08:09 2015 -0300 Bug 14368: DBRev 3.21.00.029 Signed-off-by: Tomas Cohen Arazi commit e46aa8395b359c773961b1a705d4b9c7f9d3db01 Author: Matthias Meusburger Date: Mon Sep 21 14:52:03 2015 +0200 Bug 14368: [Follow-up] Fix workflow Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 8c3fb9c3ae4729c67a057d5531eb7ae8eb9396c0 Author: Jonathan Druart Date: Thu Sep 17 10:27:42 2015 +0100 Bug 14368: Add some missing tests Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit ecdfa41f8461abb4423e447730deb9b8256ca046 Author: Matthias Meusburger Date: Wed Sep 16 16:13:21 2015 +0200 Bug 14368: [Follow-up] Add filter on borrower when displaying discharges history on borrower's page. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 0f56f2b7fcb5c0a92c4fa104eeb9b51a29d5b935 Author: Matthias Meusburger Date: Wed Sep 16 14:54:13 2015 +0200 Bug 14368: [Follow-up] Fix tests Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit c34c8ee853c4ec6a457c5ae8f75729507e242207 Author: Matthias Meusburger Date: Tue Jun 9 14:35:07 2015 +0200 Bug 14368: Add discharges history. Currently, once a user is discharged, lifting the discharge debarment does not allow the user to ask for a discharge again. This patch adds the ability for a user to be discharged several times and to keep an history of the discharges. Test plan: - As a user, ask for a discharge. - As a librarian, allow the discharge. - Check that the requested and validated dates appear on the discharge panel of the borrower in the admin interface. - Lift the discharge debarment of the user. - Check that you can repeat these steps and that the new discharges are added in the discharge panel of the borrower in the admin interface. Please note that you will need to run misc/devel/update_dbix_class_files.pl after the SQL update. Adding a primary key to the discharges table was mandatory for DBIX::Class to be able to query with order_by. Signed-off-by: Indranil Das Gupta (L2C2 Technologies) Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 67fa231a74426197b4a78f7d7620be2edff08f31 Author: Winona Salesky Date: Tue Jun 9 10:18:05 2015 -0400 Bug 14054: 246 XSLT Improvements Adds other title type based on ind2 value. ind2 overridden by $i value. Signed-off-by: Indranil Das Gupta (L2C2 Technologies) Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 53dd856c66a2c2f77db5e04d8bdf4f34c583b638 Author: Jonathan Druart Date: Wed Sep 2 09:43:51 2015 +0100 Bug 14509: (follow-up) Reject invalid passwords The members.js was not included in member-password.tt And it cannot, there are specific code which cannot be used outside of memberentry.tt Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 1b8f3194e9f616f46260c849eda5a9f6c717d5fa Author: Jonathan Druart Date: Tue Jul 14 15:33:34 2015 +0100 Bug 14509: Reject invalid passwords Bug 10177 rejects password with leading or trailing whitespaces, but only on the member-password page. It's not consistent to only do this check on 1 place. This patch adds the check for the 2 other places: memberentry and at the OPAC. Test plan: 1/ Edit a patron and set a password with leading and/or trailing whitespaces. You should not be allowed to do it (no server side check). 2/ Same at the OPAC ("Change you password" tab). Here there is a server side check. Followed test plan. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 2d69e143d8649aa569f673b37036c3a303b4ffdf Author: Marcel de Rooy Date: Mon Sep 28 08:38:26 2015 +0200 Bug 14904: Resolve warning from tt_valid.t Test tt_valid.t warns that opac-retrieve-file.tt has no id and class attribute on the body tag. This patch adds them to clear the warning. Test plan: Apply patch and run xt/tt_valid.t. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 71a9b187d86bd5f7c3679d38b3919c9260c3feef Author: Marcel de Rooy Date: Mon Sep 28 12:17:39 2015 +0200 Bug 14909: Warnings from search_utf8.t when empty idx= misses in base The regex in this test looks like: opac-search.pl\?idx=&q=%CE%91%CE%B8%CE%AE%CE%BD%CE%B1 The result it got was: opac-search.pl?q=%CE%91%CE%B8%CE%AE%CE%BD%CE%B1 The empty idx should not be a reason to fail the test. I changed the original regex to make the 'idx=&' part optional and added a base_unlike test to verify that the base does not include a idx=\w+ anywhere. Also corrected the typo Goog. Good! Signed-off-by: Marcel de Rooy All 66 tests now pass with me. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit d7d64c0718cfbb816e9677baecf722427060d3b5 Author: Marcel de Rooy Date: Mon Sep 28 10:54:55 2015 +0200 Bug 14905: Search_utf8.t fails to upload a file Running the test fails on test 7: not ok 7 - upload succeeded The changes on bug 14321 included a temp flag for script upload-file.pl. Since this upload for stage-marc-import should be temporary, adding this flag to line 131 resolves the problem. Test plan: Run the adjusted test. NOTE: I still had some problems with this test. And will still be looking to these errors (perhaps open a new report). But this fix should at least fix the above-mentioned test. Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Borrower/Discharge.pm | 35 +++++++++- Koha/Schema/Result/Discharge.pm | 24 ++++++- installer/data/mysql/kohastructure.sql | 2 + installer/data/mysql/updatedatabase.pl | 10 +++ koha-tmpl/intranet-tmpl/prog/en/js/members.js | 11 +++ .../prog/en/modules/members/discharge.tt | 22 ++++++ .../prog/en/modules/members/member-password.tt | 13 +++- .../prog/en/modules/members/memberentrygen.tt | 1 + .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 42 ++++++++---- .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 3 + .../bootstrap/en/modules/opac-retrieve-file.tt | 2 +- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 48 ++++++++----- members/discharge.pl | 9 ++- opac/opac-discharge.pl | 2 +- opac/opac-passwd.pl | 8 ++- t/db_dependent/Borrower_Discharge.t | 72 ++++++++++++++------ t/db_dependent/www/search_utf8.t | 14 ++-- 18 files changed, 252 insertions(+), 68 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 28 19:51:19 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 28 Sep 2015 17:51:19 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-655-g19ae949 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 19ae949e6af0509a1a76c74d69985eb67b9d9a4d (commit) via 9b0f065392f58f635e8cef8259d56d1f6476bdae (commit) via c57fb17f076f67a6d3abb93a6dc415a24dad65ca (commit) via 1203a93c877e86e5c9743a471068cfdaf4ca2cce (commit) via 4c2e4cd0abac7e647b90695e5c4782b6a89bfe70 (commit) from 6a5ca69bca091869773863b4436b78f3956589ec (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 19ae949e6af0509a1a76c74d69985eb67b9d9a4d Author: Kyle M Hall Date: Fri Sep 18 07:03:13 2015 -0400 Bug 14597: (QA followup) Make Logger package level Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 9b0f065392f58f635e8cef8259d56d1f6476bdae Author: Kyle M Hall Date: Thu Jul 23 12:14:25 2015 -0400 Bug 14597: Reverting a batch where a record overlaid is now deleted record will fail If batch of records is used to overlay existing records, and one of those records is deleted, any attempt to revert this batch will fail. The unanimous consensus is that deleted records should stay deleted ( https://lists.katipo.co.nz/public/koha/2015-June/043048.html ). Test Plan: 1) Import a batch of records 2) Import the same batch again, using ISBN as a matcher for overlay 3) Find a record that overlayed a previous record and delete it ( the match type will be "match applied" and there will be a link in "match details" ) 4) Attempt to revert the second batch ( that overlayed the first ) 5) The progress will stop at some point and never complete 6) Apply this patch 7) Attempt to revert the second batch again 8) This time it should succeed! Signed-off-by: Do, Tam T Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit c57fb17f076f67a6d3abb93a6dc415a24dad65ca Author: Marcel de Rooy Date: Tue Jul 14 18:40:47 2015 +0200 Bug 14201: Yes, goodbye to the third plugin marc21_leader_video too A closer look at this plugin revealed the same things as earlier: [1] Since the click redirects to leader, the launcher is not used. In this case no template file existed. [2] Leader_video does not use Focus while leader does. This patch removes 'all' traces of leader_video. It includes a tiny db revision for those brave people using it. The only behavior change for them is the focus change. Test plan: [1] Run the db revision. [2] Check if the leader plugin still works as expected. [3] Git grep on marc21_leader_video. Ignore atomicupdate. No PO files :) Signed-off-by: Hector Castro Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 1203a93c877e86e5c9743a471068cfdaf4ca2cce Author: Marcel de Rooy Date: Tue Jul 14 18:26:40 2015 +0200 Bug 14201: We can do without plugin marc21_leader_computerfile A closer look at this plugin revealed the same things as the previous patch for leader_book. [1] Template leader_computerfile is not used. [2] The unused template is not up-to-date either. [3] Leader_computerfile does not use Focus while leader does. This patch removes all traces of leader_computerfile. It includes a tiny db revision for those brave people using it. The only behavior change for them is the focus change. Test plan: [1] Run the db revision. [2] Check if the leader plugin still works as expected. [3] Git grep on marc21_leader_computerfile. Ignore PO files. Signed-off-by: Hector Castro Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 4c2e4cd0abac7e647b90695e5c4782b6a89bfe70 Author: Marcel de Rooy Date: Tue Jul 14 17:26:55 2015 +0200 Bug 14201: Plugin marc21_leader_book is useless A closer look at this plugin revealed the following: [1] The leader_book builder redirects to leader.pl; the launcher code with leader_book.tt is dead. [2] A diff of the two templates showed that most changes are minimal and irrelevant. Some updates to leader have not been incorporated into the unused leader_book. [3] Leader_book does not use Focus while leader does. This patch removes all traces of leader_book :) It includes a tiny db revision for those brave people using it. The only behavior change for them is the focus change. Another small change: we do not need Search.pm in marc21_leader. Test plan: [1] Run the db revision. If you had some field attached to leader_book, it should be gone. [2] Check if the leader plugin still works as expected. [3] Run the FrameworkPlugin unit test. Ignore warnings from field_007. [4] Git grep on marc21_leader_book. You will only find references to PO files in misc/translator. Signed-off-by: Hector Castro Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 9 + cataloguing/value_builder/marc21_leader.pl | 9 +- cataloguing/value_builder/marc21_leader_book.pl | 91 ------ .../value_builder/marc21_leader_computerfile.pl | 91 ------ cataloguing/value_builder/marc21_leader_video.pl | 91 ------ .../atomicupdate/14201_marc21_leader_book.sql | 2 + .../mysql/atomicupdate/14201b_computerfile.sql | 2 + installer/data/mysql/atomicupdate/14201c_video.sql | 2 + .../value_builder/marc21_leader_book.tt | 338 ------------------- .../value_builder/marc21_leader_computerfile.tt | 340 -------------------- 10 files changed, 18 insertions(+), 957 deletions(-) delete mode 100755 cataloguing/value_builder/marc21_leader_book.pl delete mode 100755 cataloguing/value_builder/marc21_leader_computerfile.pl delete mode 100755 cataloguing/value_builder/marc21_leader_video.pl create mode 100644 installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql create mode 100644 installer/data/mysql/atomicupdate/14201b_computerfile.sql create mode 100644 installer/data/mysql/atomicupdate/14201c_video.sql delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 28 23:06:36 2015 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 28 Sep 2015 21:06:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.20.00-656-g3007208 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 3007208c70274a2bab326bc3ccf31bced32dab2b (commit) from 19ae949e6af0509a1a76c74d69985eb67b9d9a4d (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 3007208c70274a2bab326bc3ccf31bced32dab2b Author: Tomas Cohen Arazi Date: Mon Sep 28 18:06:53 2015 -0300 Bug 14201: DBRev 3.21.00.030 Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- .../atomicupdate/14201_marc21_leader_book.sql | 2 -- .../mysql/atomicupdate/14201b_computerfile.sql | 2 -- installer/data/mysql/atomicupdate/14201c_video.sql | 2 -- installer/data/mysql/updatedatabase.pl | 21 ++++++++++++++++++++ 5 files changed, 22 insertions(+), 7 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql delete mode 100644 installer/data/mysql/atomicupdate/14201b_computerfile.sql delete mode 100644 installer/data/mysql/atomicupdate/14201c_video.sql hooks/post-receive -- main Koha release repository