[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.06-30-g40b9ebd
Git repo owner
gitmaster at git.koha-community.org
Mon Nov 11 14:51:45 CET 2013
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.12.x has been updated
via 40b9ebdf6317e9ca4330a25d6fba35e96297c50f (commit)
via 214f19ead31f1e35de906933743369dd2780e78d (commit)
via eacd23f3616be850594ce9fe1e219c84332a2682 (commit)
via 61a7d41fdd0f1ff49217110e34a39d3fe0bcc712 (commit)
via b78dd5aeaa31092747f9e7142cf61e096b37609d (commit)
via 29dca939e0bd3a090d908a2bde30c942bac86342 (commit)
from a461452de234fcdd3d08974c9f0b9b03772710f3 (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 40b9ebdf6317e9ca4330a25d6fba35e96297c50f
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Sep 10 21:10:28 2013 +0200
Bug 10871: Make confirmation message for deleting news translatable
To test:
- Create a news entry in tools > news
- Delete the news entry or multiple entries by selecting them
using the checkboxes to the left and the delete button at the
bottom of the page.
Verify confirmation message shows up correctly with patch applied.
Bonus:
- Update one of the po files and make sure the new strings shows up
there.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit da856fc46cfd4cccb092c339eee0e3ce1262e9d8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 214f19ead31f1e35de906933743369dd2780e78d
Author: David Roberts <david.roberts at ptfs-europe.com>
Date: Mon Sep 16 16:51:33 2013 +0100
Bug 10894: Add ID to main address in member entry form
Add an ID to ease customization via jQuery; an ID is already present
on alt address but was missing from main address
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ace550530550ba72b93f34b446e681ab72024f8c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit eacd23f3616be850594ce9fe1e219c84332a2682
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 29 14:24:05 2013 +0200
Bug 10376: fix ability to print cart from IE9 & 10
Test plan:
1) Test with Firefox (or any other browser except IE):
Add biblio to cart
Go to Cart and click Print
Does the Cart window come back to its original state after confirm/cancel Print?
2) Test with Internet Explorer (I used IE9; testing another version is fine)
Do the same as above. Is behavior now more or less the same?
Signed-off-by: Marc Veron <veron at veron.ch>
1) Test without patch:
IE 10: Does not show print dialog
IE 9 (Developer Emulation in IE 10): Does not show print dialog (as expected)
FF 21.0 OK
Chrome 27.0.1453.110 m: OK
2) Test with patch:
IE 10: OK
IE 9 (Developer Emulation in IE 10): OK
IE 8 (Developer Emulation in IE 10): OK
IE 7 (Developer Emulation in IE 10): OK
FF 21.0 OK
Chrome 27.0.1453.110 m: OK
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Trusting Marc here, as I don't have IE available.
Regression tests in Firefox and Chromium went well.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 990eebf132fef94dfbac4d3e17fe7acd9ce7b2c6)
commit 61a7d41fdd0f1ff49217110e34a39d3fe0bcc712
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Aug 14 14:36:37 2013 -0400
Bug 10731 - IntranetSlipPrinterJS is not working for hold slips [v3.10/v3.12]
Hold slips aren't printing automatically with JS Print Setup because it
appears the system preference IntranetSlipPrint is never being passed to
the template.
Test Plan:
1) Set up JSPrintSetup
http://wiki.koha-community.org/wiki/Setting_up_slip_printer_to_print_silently
2) Place a hold
3) Check the item in to capture the hold
4) Click "Print and confirm"
5) Note the slip does not print automatically
6) Apply this patch
7) Repeat steps 2 through 4
8) Observe that the slip now prints automatically
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Tested successfully in 3.10.x and 3.12.x
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b78dd5aeaa31092747f9e7142cf61e096b37609d
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Sep 16 15:29:04 2013 -0300
Bug 10872: UT for GetHiddenItemnumbers and POD fix
This patch adds several unit tests for GetHiddenItemnumbers and fixes the POD for it.
It also wraps the tests for rollback, modernizes and adds a license text to it.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5d8ad739293ef8cf22a808404e52a9c74275aaf0)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
"Fixed" 'wthdrawn' column name for 3.12.x
commit 29dca939e0bd3a090d908a2bde30c942bac86342
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Sep 10 16:19:58 2013 -0400
Bug 10872 - C4::Items GetHiddenItems fix and optimization
There should be a:
"require YAML;"
or
"use YAML qw/Load/;"
as the GetHiddenItems routine has a reference to YAML::Load.
This was discovered while adding a GetHiddenItems() call into
opac/opac-MARCdetail.pl. I believe this problem dates back to
bug 6488 or bug 5984.
I also added an optimization to GetHiddenItems to prevent
processing if there is nothing in the system preference. Test
by searching for a biblio which has some or all of its items
hidden.
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Maybe
return () unless $yaml =~ /\S/;
or
return () if $yaml =~ /^\s*$/;
would have been easier to read.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9ab593440b6d2b1f9c417631a4cf5cabcf1a0032)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 10 +-
circ/hold-transfer-slip.pl | 1 +
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/tools/koha-news.tt | 4 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt | 19 ++-
t/db_dependent/Items.t | 158 ++++++++++++++++----
6 files changed, 157 insertions(+), 37 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list