[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-42-g66b2148
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 13 16:19:15 CEST 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 66b214899fe6624a023ee16e3e920414f27abb8a (commit)
via a55080c88593b5e0e0d3d8192ee9c7f09e78d258 (commit)
via 3ca258cd4aeba3b8bcb86dbdb28b55657e1c1e46 (commit)
via a011492c7e5cdc3c0ef9db1ca1c415ec078e1f6c (commit)
via 624af4b7f11a4ff8bccf3252e72880cec9c22b1b (commit)
via d97742d0a6426bfb6a880b998ad57278a4ac0b3f (commit)
via 885e928aaeddca5adc24061b615a0388d1c8e828 (commit)
via 3cd7313007061c0e644d0daf37cf79739c342717 (commit)
via 70681a47f2cefcdee665d4d8076f3228eee891de (commit)
via f0203f9e9cc985e6b4eb9fb8d2f99d65d3337973 (commit)
via 25c84440cd1123a0f454d4a7ebb33da4634d76a3 (commit)
via 5d3f5023019f0d09688ebb44d35259fd2ec9990a (commit)
via 27f96f606c90f85756b290e1a832377f5465bf40 (commit)
from a85f9e1928a89e5c8f01983f1b853b090ec8cd1e (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 66b214899fe6624a023ee16e3e920414f27abb8a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 19 10:55:52 2013 -0400
Bug 8670 - Update POD of C4::Branch::GetBranches() to use TT syntax
This patch updates the example template syntax in the POD for
C4::Branch::GetBranches() to use Template Toolkit syntax.
To test, view the POD for C4::Branch::GetBranches() and confirm that it
looks correct.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Checked the POD with "perldoc C4/Branch.pm" before and after applying
the patch. The example now uses TT syntax, and looks sensible.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7ae3ea68579b3f870d7e42968c3727ecffac7f02)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a55080c88593b5e0e0d3d8192ee9c7f09e78d258
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 19 11:16:51 2013 -0400
Bug 10763 - [SIGNED-OFF] Update POD of C4::Creators::Lib::html_table() to use TT syntax
This patch updates the example template syntax in the POD for
C4::Creators::Lib::html_table() to use Template Toolkit syntax.
To test, view the POD for C4::Creators::Lib::html_table() and confirm
that it looks correct.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Checked the POD with "perldoc C4/Creators/Lib.pm" before and after applying
the patch. The example now uses TT syntax, and looks sensible.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 54c6dccca70a142c14fff049cb3212694af86610)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3ca258cd4aeba3b8bcb86dbdb28b55657e1c1e46
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 19 11:37:55 2013 -0400
Bug 10764 - Update POD of C4::Items::GetItemStatus() to use TT syntax
This patch updates the example template syntax in the POD for
C4::Items::GetItemStatus() to use Template Toolkit syntax.
To test, view the POD for C4::Items::GetItemStatus() and confirm that it
looks correct.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
This patch works as advertised (verified with "perldoc C4::Items"),
for GetItemStatus, but it does not fix a a similar example for
GetItemLocation in the same file, which still has the old template
syntax. So a followup or separate bug for that is called for.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
It seems the default option is not in used in templates.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit d515457c719197e66bd0a10c7011b407af2faa23)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a011492c7e5cdc3c0ef9db1ca1c415ec078e1f6c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 19 12:06:31 2013 -0400
Bug 10765 - [SIGNED-OFF] Update POD of C4::Koha::GetSupportList() to use TT syntax
This patch updates the example template syntax in the POD for
C4::Koha::GetSupportList() to use Template Toolkit syntax.
To test, view the POD for C4::Koha::GetSupportList() and confirm that
it looks correct.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
This patch works as advertised (verified with "perldoc C4::Koha"),
for GetSupportList, but it does not fix a a similar example for
GetItemTypes, getauthtypes and getframework in the same file,
which still has the old template syntax. So a followup or separate
bug(s) for those are called for.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
It seems the default option is not in used in templates.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3429e5e16da0b23615fac4ca0bb6251fac70301c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 624af4b7f11a4ff8bccf3252e72880cec9c22b1b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 13 12:27:28 2013 -0400
Bug 10081: add library name to IndependentBranches error message
With IndependentBranches turned on, if you try to check out an item
which belongs to another library you will get an error message which is
missing the library name. This patch corrects the problem by passing the
necessary variable to the template and outputting the library name using
the KohaBranchName TT plugin.
To test, turn on IndependentBranches and try to check out an item
belonging to another library (note that you must test with a staff user
who is not a superlibrarian). The error message you see should include
the name of the library to which the item belongs:
"This item belongs to Nelsonville and cannot be checked out from this
location."
Checkouts of items belonging to the library should be unaffected.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 50ff4f4a94598ce197c0ca5656d314195cf69d07)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d97742d0a6426bfb6a880b998ad57278a4ac0b3f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 8 15:37:35 2013 -0400
Bug 10701: fix display of transit status on the bibliographic detail page
The patch for Bug 10083 incorrectly changed some template variable names
so that in-transit details could not be shown on the biblio detail page.
This patch corrects the error.
To test, perform any action that will trigger an transfer between
libraries (for instance, check in an item from Library A at Library B).
View the detail page for that title and look for the transfer details in
the status column of the holdings table. It should show correct
information:
"In transit from Athens to Nelsonville since 08/08/2013"
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Work as described, no errors.
Before patch incorrect information: "In transit from to since"
after patch correct information.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works perfectly and passes all tests.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0a6e9c48c5c63e17318f4c8e5c7f0400bab0c363)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 885e928aaeddca5adc24061b615a0388d1c8e828
Author: Jonathan Field <jonathan.field at ptfs-europe.com>
Date: Fri Aug 9 11:38:31 2013 +0100
Bug 10704: make OPAC highlighting work across previous/next travel
To test
Enable 'OpacHighlightedWords'
1) Run a search with multiple results
2) Click on a title of one of the results to get the full record
display. Hit highlighting SHOULD work on this page.
3) Use either the "Next" or "Previous" buttons on this page
(opac-detail) to move to the next or previous record.
4) Moving forward or back, the highlighting should still be working on
the page.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7d0aea7c39e22f42760c3ecbba4c0cd0818785a7)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3cd7313007061c0e644d0daf37cf79739c342717
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Aug 14 14:53:25 2013 +0000
bug 10728: fix additional log noise generated by subscription-renew.pl
To test:
[1] Use the renew link to bring up the subscription renewal form.
[2] Verify that a warning message containing the text
'Problem = a value of 1 has been passed to param without key'
was not added to the Apache error log.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 6e864430caaa951b06d5fecff3fe7864317e5e26)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 70681a47f2cefcdee665d4d8076f3228eee891de
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Aug 14 15:26:34 2013 +0100
Bug 10728: fix log noise generated by subscription-renew.pl
Error log is showing warnings because mode is undefined
and we are doing string comparisons on it.
Set it to a default value (we were already assigning it a variable
which we were not using) and use the the result in the comparison
To test, after applying the patch:
[1] Use the renew link from the subscription detail page to renew
a subscription.
[2] Verifying that doing this did not add a warning containing
'subscription-renew.pl: Use of uninitialized value $mode in string eq '
to the Apache error log.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 27edb618dd604e0a718f43e98ed97255f72eb515)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f0203f9e9cc985e6b4eb9fb8d2f99d65d3337973
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Aug 17 16:04:34 2013 +0000
Bug 10573: (follow-up) update license and copyright statement
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 971449866fc23ff9c0c083754e4dd9c53d8d4cdc)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 25c84440cd1123a0f454d4a7ebb33da4634d76a3
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu Aug 8 15:54:22 2013 -0300
Bug 10573: (followup) French translation for printing a basketgroup
small followup to fix tabs
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit a9cd81e6858dda89d95625520108fa0b269ff770)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5d3f5023019f0d09688ebb44d35259fd2ec9990a
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Wed Jul 10 16:57:12 2013 +0200
Bug 10573: French translation for printing a basketgroup
If you want to print a basketgroup with pdf format, it will be in
English. The pdf is done with layout2pages.pm or layout3pages.pm,
which call layout2pages.pdf or layout3pages.pdf.
This patch adds layout3pagesfr.pm in src/acqui/pdfformat/ which
calls layout3pagesfr.pdf.
And adds in basketgroup.pl the check for layout3pagesfr
To use it you have to change the systempreferences to pdfformat::layout3pagesfr
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Work as described, koha-qa reports some tab errors.
Corrected in a followup.
Please, always add a test plan, it's easier to test.
Test:
1) apply the patch
2) change syspref OrderPdfFormat to pdfformat::layout3pagesfr
3) select a vendor
4) create a basket group (empty works)
5) close basket group
6) print basket group
7) PDF is in french
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
This works nicely, although it would be better if we could
find a more general solution to make the templates editable
and translatable.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit a7fe13a52f320e6aded1f3313f721bd7fd73fb52)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
I don't like the approach, but I wouldn't hold this one until a proper solution comes up.
commit 27f96f606c90f85756b290e1a832377f5465bf40
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 11 12:00:45 2013 +0200
Bug 10028: fix how ModReceiveOrder() calls NewOrder()
In C4::Acquisition::ModReceiveOrder, a call to NewOrder is badly used.
NewOrder returns ($basketno, $ordernumber) but in ModReceiveOrder the
ordernumber is got with
my $ordernumber = NewOrder( $args );
It works because:
sub t{
return ("a", "b");
}
my $a = t();
say $a;
Will display 'b'.
But it is not really clear.
Test plan:
Check that there is no regression for partial receives.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 29689de399a8927547c36e53461c7766ecc604f0)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 3 +-
C4/Branch.pm | 14 +++--
C4/Circulation.pm | 6 +-
C4/Creators/Lib.pm | 46 +++++++-------
C4/Items.pm | 16 +++--
C4/Koha.pm | 20 +++---
acqui/basketgroup.pl | 2 +-
.../{layout3pages.pm => layout3pagesfr.pm} | 65 ++++++++++----------
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 3 +-
.../intranet-tmpl/prog/pdf/layout3pagesfr.odt | Bin 0 -> 13284 bytes
.../intranet-tmpl/prog/pdf/layout3pagesfr.pdf | Bin 0 -> 24394 bytes
opac/opac-detail.pl | 4 +-
serials/subscription-renew.pl | 6 +-
14 files changed, 98 insertions(+), 89 deletions(-)
copy acqui/pdfformat/{layout3pages.pm => layout3pagesfr.pm} (93%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.odt
create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.pdf
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list