From gitmaster at git.koha-community.org Fri Feb 1 09:07:57 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2013 08:07:57 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.09-8-g188ac0a 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.8.x has been updated via 188ac0a8c97259c927096fcb917b356e6edbb0b9 (commit) via eb9af39998d40014391b907f14a7d161fd4543f5 (commit) via 13c9a79a15d3ed7a4b126995e68bb664d1bab648 (commit) from dc4477897cfb8951e662e4ac9db99efd46a480e9 (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 188ac0a8c97259c927096fcb917b356e6edbb0b9 Author: Owen Leonard Date: Wed Dec 12 11:43:27 2012 -0500 Bug 9276 - Display of biblio-level auth vals on OPAC search broken If you have your MARC framework configured to link a biblio-level field with an authorized value, and that value is linked to an image, and the AuthorisedValueImages system preference is turned on, the OPAC is supposed to display that image in search results much like item type images are displayed if item-level itemtypes are enabled. The switch to Template::Toolkit broke this feature with a variable scope error. This patch corrects the variable scope of the sytem preference check and adds a check for the existence of the image so that the template doesn't try to display broken images. To test: 1. Turn on the AuthorisedValueImages system preference. 2. If necessary, create or configure an authorized value with images. 3. Configure a MARC framework to link a field to the authorized value. I chose an arbitrary field, 942e. 4. Edit a bibliographic record and set a value for the MARC field you configured. 5. Make sure Zebra has reindexed, and perform an OPAC search which will include the record you edited. With AuthorisedValueImages ON, you should see the correct authorized value image. 6. With AuthorisedValueImages OFF, you should see no image. 7. Turn AuthorisedValueImages back on. Edit the authorized value again and configure it with no image. Perform your search again. You should see no image. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit eb9af39998d40014391b907f14a7d161fd4543f5 Author: Owen Leonard Date: Mon Nov 26 08:41:57 2012 -0500 Bug 9310 - Patron image upload template corrections This patch fixes some template structure problems and makes some improvements: - Correct grid structure so that page isn't narrower than it needs to be. - Move image upload messages out of message/error dialog and into table so that lines are distinct and legible. - Expand breadcrumbs specificity - Capitalization corrections To test: Upload patron images using both single images and zip files. Test zip file upload with a file which contains valid and invalid contents (non-existant patron numbers, invalid image files, etc). In all cases image uploads should work correctly and errors should be legibly displayed. Signed-off-by: Marc Veron With patch, error messages are displayed in a nice table. Signed-off-by: Jonathan Druart Tested with zip and png files. Works great. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit 13c9a79a15d3ed7a4b126995e68bb664d1bab648 Author: Fridolyn SOMERS Date: Mon Nov 26 15:15:18 2012 +0100 Bug 9147: OPAC hidden fields are not hidden in ISBD view When in framework a subfield has a number > 0 in hidden, it his hidden in MARCview. It should be hidden also in ISBD view. Signed-off-by: Chris Cormack Does what it says, hides hidden fields on the OPAC Signed-off-by: Katrin Fischer All tests and QA script pass. To test: 1) Hide 245$b or another field from ISBD view in your MARC framework by assigning a hidden value greater 0 2) Check the different views in OPAC, the field should be hidden now from - Labelled MARC view (as it was before this patch) - ISBD view It will still show up for plain MARC and XSLT views. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 8 +++ .../prog/en/modules/tools/picture-upload.tt | 67 +++++++++++--------- .../opac-tmpl/prog/en/modules/opac-results.tt | 6 +- 3 files changed, 49 insertions(+), 32 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 09:18:08 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2013 08:18:08 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.02-17-gf9ee893 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.10.x has been updated via f9ee893e0edd61f2024804f51e9774f186bafb35 (commit) via 342ae0b816ddef727046543edbcfedf88d6da65c (commit) via 17f8ad80e729b615562c05fe09f50f050c8487cb (commit) via ce145c35158be0b59d5772d1bbe35de86a9a4a30 (commit) via 5c864124e775a71a23b66e21ea958afbbe4e7ee6 (commit) via 495353c94f0a746d564da68167fe56d055e187e8 (commit) via f704201dde1425901bb96e092eaddd53f606c01d (commit) via 83e96f1b72a92c223e9c09b6096cd5e2f741a1f5 (commit) from 711431ab45e29412666dab05c3e1454bf703f7c9 (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 f9ee893e0edd61f2024804f51e9774f186bafb35 Author: Jonathan Druart Date: Wed Dec 12 15:14:08 2012 +0100 Bug 9236 : Redirect to the parcel page after deleting an item/order Signed-off-by: mathieu saby Signed-off-by: Katrin Fischer 1) Receive shipment for a previously created basket with multiple order lines 2) Verify 'Delete order' links only have 2 parameters and when you delete an order, you are not redirected to the basket. 3) Verify the same is true for 'Delete order and catalog record'. 4) Apply both patches from Bug 9236. 5) Redo tests and verify page redirects correctly now. Links now also show the basket number as third parameter. Also: make sure orders/items and records are deleted correctly. Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit 342ae0b816ddef727046543edbcfedf88d6da65c Author: Jonathan Druart Date: Tue Dec 11 14:24:40 2012 +0100 Bug 9236: FIX delete order when receiving Before this patch the "delete order" links were broken on the receiving page (parcel.pl) Signed-off-by: mathieu saby Before applying the patch, when recieving a parcel, if you delete an order line, Koha tries to open the page of the basket linked to that order, but can not find it. Koha displays "Vendor not found". With the patch, Koha finds the right basket. I Sign off this patch, to be applied with the other patch ("Redirect to the parcel page after deleting an item/order") Signed-off-by: Katrin Fischer Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit 17f8ad80e729b615562c05fe09f50f050c8487cb Author: Adrien Saurat Date: Tue Jan 8 12:18:18 2013 +0100 Bug 9364: fixes billing/delivery addresses for new baskets Corrects the parameters used for the NewBasket call, when creating a new basket. Signed-off-by: Mathieu Saby Signed-off-by: Elliott Davis I am passing this with a warning. You must go back and resave the locations. After just rereshing I got the same results but upon resubmitting the form I got the result described in the test plan. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit ce145c35158be0b59d5772d1bbe35de86a9a4a30 Author: Bernardo Gonzalez Kriegel Date: Mon Jan 7 13:01:21 2013 -0300 Bug 9357: Missing 'c' option in MARC21 LEADER_18 value builder This patch adds option 'c' to the position 18 of the leader value builder. Also corrects label for option 'i' Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Galen Charlton Signed-off-by: Elliott Davis Works as described Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit 5c864124e775a71a23b66e21ea958afbbe4e7ee6 Author: Kyle M Hall Date: Fri Jan 4 08:04:25 2013 -0500 Bug 9348 - Format dates in HOLD notices consistently Right now notices for holds awaiting pickup read something like this: You have a hold available for pickup as of 2011-02-12. This hold will expire if it is not picked up before: 02/22/2011. If you no longer need this item or have any questions please contact us Both dates should be formatting based on the dateformat system preference. Test Plan: 1) Apply patch 2) Set the HOLD notice to the following: <> / <> 3) Place a hold for a patron 4) Enable the HOLD notice via email for that patron ( requires EnhancedMessaging ) 5) Check the item in 6) Go to the borrower's Notices tab, check the body of the new HOLD notice, it should have two dates separated by a '/' in the format set by the dateformat system preference. Signed-off-by: Owen Leonard Patch works as advertised according to the test plan. Signed-off-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov Tested also with the HOLD_PRINT notice. Signed-off-by: Chris Cormack commit 495353c94f0a746d564da68167fe56d055e187e8 Author: Owen Leonard Date: Wed Dec 12 11:43:27 2012 -0500 Bug 9276 - Display of biblio-level auth vals on OPAC search broken If you have your MARC framework configured to link a biblio-level field with an authorized value, and that value is linked to an image, and the AuthorisedValueImages system preference is turned on, the OPAC is supposed to display that image in search results much like item type images are displayed if item-level itemtypes are enabled. The switch to Template::Toolkit broke this feature with a variable scope error. This patch corrects the variable scope of the sytem preference check and adds a check for the existence of the image so that the template doesn't try to display broken images. To test: 1. Turn on the AuthorisedValueImages system preference. 2. If necessary, create or configure an authorized value with images. 3. Configure a MARC framework to link a field to the authorized value. I chose an arbitrary field, 942e. 4. Edit a bibliographic record and set a value for the MARC field you configured. 5. Make sure Zebra has reindexed, and perform an OPAC search which will include the record you edited. With AuthorisedValueImages ON, you should see the correct authorized value image. 6. With AuthorisedValueImages OFF, you should see no image. 7. Turn AuthorisedValueImages back on. Edit the authorized value again and configure it with no image. Perform your search again. You should see no image. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit f704201dde1425901bb96e092eaddd53f606c01d Author: Owen Leonard Date: Mon Nov 26 08:41:57 2012 -0500 Bug 9310 - Patron image upload template corrections This patch fixes some template structure problems and makes some improvements: - Correct grid structure so that page isn't narrower than it needs to be. - Move image upload messages out of message/error dialog and into table so that lines are distinct and legible. - Expand breadcrumbs specificity - Capitalization corrections To test: Upload patron images using both single images and zip files. Test zip file upload with a file which contains valid and invalid contents (non-existant patron numbers, invalid image files, etc). In all cases image uploads should work correctly and errors should be legibly displayed. Signed-off-by: Marc Veron With patch, error messages are displayed in a nice table. Signed-off-by: Jonathan Druart Tested with zip and png files. Works great. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit 83e96f1b72a92c223e9c09b6096cd5e2f741a1f5 Author: Fridolyn SOMERS Date: Mon Nov 26 15:15:18 2012 +0100 Bug 9147: OPAC hidden fields are not hidden in ISBD view When in framework a subfield has a number > 0 in hidden, it his hidden in MARCview. It should be hidden also in ISBD view. Signed-off-by: Chris Cormack Does what it says, hides hidden fields on the OPAC Signed-off-by: Katrin Fischer All tests and QA script pass. To test: 1) Hide 245$b or another field from ISBD view in your MARC framework by assigning a hidden value greater 0 2) Check the different views in OPAC, the field should be hidden now from - Labelled MARC view (as it was before this patch) - ISBD view It will still show up for plain MARC and XSLT views. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 8 +++ C4/Letters.pm | 23 +++----- acqui/addorder.pl | 2 + acqui/basketheader.pl | 1 - .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 +- .../cataloguing/value_builder/marc21_leader.tt | 9 ++- .../value_builder/marc21_leader_book.tt | 9 ++- .../value_builder/marc21_leader_computerfile.tt | 9 ++- .../prog/en/modules/tools/picture-upload.tt | 67 +++++++++++--------- .../opac-tmpl/prog/en/modules/opac-results.tt | 6 +- 10 files changed, 84 insertions(+), 58 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 1 09:52:27 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Feb 2013 08:52:27 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.02-25-g8c7c8ec 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.10.x has been updated via 8c7c8ec75a1b63baa85055efdbc90e0ad7472e77 (commit) via fa106c3eb12566528657438f271e160995387d1b (commit) via 847df9ab3fca2ef30cf2069a82e719b889e84332 (commit) via 344d9ec63dd3401a8f59f4f233dfb68db6e054c2 (commit) via d4c86ff52cead6806a1867ed5c7f4a803412aecf (commit) via 88fbb6c561cc27a2af3b64a870d93ff00af4c37d (commit) via 6844ccbfe1ce04ea6bae9f84b81b6bfadf2436f9 (commit) via a6f2e86fa2b4725abb5c3506c5f57b374bfcc984 (commit) from f9ee893e0edd61f2024804f51e9774f186bafb35 (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 8c7c8ec75a1b63baa85055efdbc90e0ad7472e77 Author: Magnus Enger Date: Sun Jan 27 14:00:45 2013 +0100 Bug 9497 - Make it easier to add new encodings for Z39.50 servers and add ISO 8859-1 This patch does three things: - Makes admin/z3950servers.pl create one variable for encoding, not one variable for each encoding - Makes the template create encoding options from a list - Adds ISO 8859-1 to the list of available encodings See the bug for a lengthier description To test: - Apply the patch - Edit one Z39.50 server several times, choosing each available encoding in turn - Check that for each encoding, the correct encoding is shown both in the list of Z39.50 servers and in the dropdown on the edit screen Comment: Works as described, no errors. Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Mason James Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit fa106c3eb12566528657438f271e160995387d1b Author: Jared Camins-Esakov Date: Thu Jan 24 13:58:07 2013 -0500 Bug 9486: t/Letters.t loads modules in wrong order Because the unit test t/Letters.t loads C4::Letters before C4::Context, and C4::Letters is not even vaguely thread-safe, the test tends to fail. Usually. Moving the dbh mocking to before the use_ok('C4::Letters') test fixes the problem. To test: 1) Before applying patch, run `prove t/Letters.t` a few times. Note that it fails most of the time, if not all the time. 2) Apply patch. 3) Repeat step (1), noting that now it passes every time. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as advertised. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit 847df9ab3fca2ef30cf2069a82e719b889e84332 Author: Tomas Cohen Arazi Date: Tue Dec 4 15:32:28 2012 -0300 Bug 9211 - days_between wrong behaviour As noted in comments #15, #16 and #17 of bug 8486, and its API, Koha::Calendar->days_between should always returns a positive number irrespective of the relative order of the parameters. This is still an open bug, which arised when rewriting the Calendar.t file (Bug 9209). Regards To+ Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Kyle M Hall Signed-off-by: Paul Poulain Signed-off-by: Jared Camins-Esakov Added Paul's sign-off line, as despite it showing up in Bugzilla, it wasn't on the patch. Signed-off-by: Chris Cormack commit 344d9ec63dd3401a8f59f4f233dfb68db6e054c2 Author: Mathieu Saby Date: Wed Jan 16 12:19:23 2013 +0100 Bug 9402: letter v between 2 option tags In HTML code generated for advanced search, a useless "v" letter is visible after "dissertation or thesis (revised)". This patch suppress "v" letter is outside ". This patch suppress "v" letter is outside