[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.01-51-g1d9ac2b
Git repo owner
gitmaster at git.koha-community.org
Mon Jul 15 19:56:46 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 1d9ac2b10a96800d301524978f00ee393b5bb75e (commit)
via 42d93d1e342d0f450fcbe80767be91a3bbba20ac (commit)
via 059732c23c23be77da1c18fac3290aa9c0ba2d67 (commit)
via de8d3f7d0a74a037cf95652a6f69fb6afde24ac9 (commit)
via b31e993b74a81d2b8c063410218a40374f2d8cdd (commit)
via a97b62379f82a94157916959109c7c1a75582d8a (commit)
via 509972e3858d3b3c9f915d09a1e10f77cbe105fd (commit)
via 20d43f6c02e2bc3fbc1a79b00b995c128a4b41ef (commit)
from dceefcfac1e54dbfa3e13174cc8a5d73acbf07fe (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 1d9ac2b10a96800d301524978f00ee393b5bb75e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jun 17 12:28:13 2013 -0400
Bug 10484: serials-edit.pl not checking for barcode field before checking for barcode subfield
The script serials-edit.pl is not checking for the existence of the
barcode field before checking for barcode subfield for autoBarcode =
incremental. If the barcode field doesn't exist, the script dies with
errors.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes tests and QA script.
Checked that adding items on serial receive still works.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9af08e4e2d2091de489633b3f1c4fb03fcf323cd)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 42d93d1e342d0f450fcbe80767be91a3bbba20ac
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Jun 19 08:52:56 2013 -0700
Bug 10494: remove spurious warnings from the KohaBranchName plugin
The KohaBranchName plugin now returns an empty string if
given a NULL (undefined) library code or a library code that
is not present in the database (e.g., the '__ANY__' placeholder
that purchase suggestions can use).
To test:
[1] Create a purchase suggestion, setting the library
to 'Any'. Create a second one setting the library to
a specific one.
[2] Go to the suggestions overview page in the staff interface.
When you do so, the Apache logs should contain a warning
that looks like this:
[Wed Jun 19 07:13:06 2013] [error] [client 192.168.1.10] [Wed Jun 19 07:13:06 2013] suggestion.pl: Use of uninitialized value in concatenation (.) or string at /home/koha/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt line 487., referer: http://koha-staff.metaquarry/cgi-bin/koha/acqui/acqui-home.pl
[3] Apply the patch.
[4] Refresh the suggestions overview page. This time, there should be
no new warning logged.
[5] Verify that the library names for the two pending suggestions
created in step 1 are displayed correctly.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script. Also adds new tests!
Note: For the test plan to work you have to add the suggestion
from the intranet, as Any is not an available option in OPAC.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ad2c1b3b8f20b3060c9a3a35c21a0757c685cbec)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 059732c23c23be77da1c18fac3290aa9c0ba2d67
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Jun 19 08:47:34 2013 -0700
Bug 10494: test cases for the KohaBranchName plugin
To test, in a test database that has the sample branches
loaded, run
prove -v t/db_dependent/Koha_template_plugin_KohaBranchName.t
Note that this includes regression tests for the issues
reported in bug 10494; these won't pass without applying
the patch that fixes them.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 96320a786bac92418b08b5af4d2b68746627482b)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit de8d3f7d0a74a037cf95652a6f69fb6afde24ac9
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Jun 14 15:55:02 2013 -0700
Bug 8884: (follow-up) rearrange placement of the top-bar div in CCSR
This patch makes it easier to avoid having the top bar
overlap other OPAC page content (particularly custom
header content set via the opacheader system preference).
This is done by moving the top-nav div outside of the
main doc3 div and adjusting the CSS accordingly. Yes,
this does end up having top-nav.inc be included from
opac-bottom.inc, but it would require touching rather
more templates to have it be included immediately after
the <body> tag.
This patch also removes a duplicate instance of the
cmspan span.
To test:
[1] Change to the CCSR OPAC theme.
[2] Before applying the patch, open a set of OPAC
pages (e.g., main page, user page, search results, bib
details) in your web browser.
[3] Apply the patch, and open the same OPAC pages in separate
tabs. Comparing the pre- and post- version of each page
to verify that the placement
[4] Add an OpAC header using the opacheader system preference.
[5] Verify that the header is displayed without overlapping
the top bar.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 33c12cf39588aa022eacaa0bca403c373a6bf8d5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b31e993b74a81d2b8c063410218a40374f2d8cdd
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Mon May 20 12:55:17 2013 -0400
Bug 8884: opacheader is not in the header on CCSR
In CCSR the opacheader preference isn't really in the header it's to the
right of the search box (see attached). I'm okay with a customizable
region over there, but we should have a new preference for that and
header should be above the search box as it implies.
To test:
1) Put something in the OpacHeader syspref. Preferably something large
and header-like for maximum effect.
2) Select CCSR theme.
3) View OPAC. Notice placement of "header" content.
4) Apply patch.
5) View OPAC. Notice placement of "header" content.
6) Sign off.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, works as advertised with one caveat; the content of
opacheader is by default underneath the div "top-bar". A couple breaks
in my OpacHeader test made it visible, so I'm going to assume this is a
styling issue and not a bug as such.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 905292b6328bbc847b1b932fc15dfef9e9845295)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a97b62379f82a94157916959109c7c1a75582d8a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jun 3 15:27:50 2013 +0200
Bug 10386: improvements to VirtualShelves.t
Most important: Does no longer delete all shelves!
Checks if there are ten borrowers for testing. But even works without them :)
When creating or modifying lists, takes name clashes into consideration.
Small change to _CheckShelfName in VirtualShelves module. Making it possible to
check a name for a list whose owner has been set to NULL. Note that a test
like field=? with undef for placeholder will not work in MySql.
Test plan:
How do you test a test? Well, you could run it on various databases..
But for real hacking, you could also add some debug lines.
I tested this by forcing 10 undefs in @borrowernumbers.
And by overwriting the return value of randomname with an existing name.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 93e87ca0b61611fc35238bf13eb226f477cf9c4e)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 509972e3858d3b3c9f915d09a1e10f77cbe105fd
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri May 24 16:18:59 2013 +0200
Bug 10336: HoldsQueue.t needs to create its own data
After applying this patch and the patch submitted in bug 10495, you can
run prove t/db_dependent/HoldsQueue.t and admire that all tests pass.
This patch creates a borrower and uses Koha routines instead of directly
updating the database.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit bfbc646fdd9ca4b90a0bc2751d0faa95d9e93ba1)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 20d43f6c02e2bc3fbc1a79b00b995c128a4b41ef
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Jun 19 10:30:58 2013 -0700
bug 10495: set precondition for HoldsQueue test
t/db_dependent/HoldsQueue.t assumed, but did not check,
that the AutomaticItemReturns system preference was off
at the beginning of the test un. This patch makes sure
that that assumption is met.
To test:
[1] Make sure that at least one item is on loan (this is
another assumption that the test case makes, one
that should be corrected with the work proposed
for bug 10336.
[2] Turn the AutomaticItemReturn system preference on.
[3] Run the test:
prove -v t/db_dependent/HoldsQueue.t
[4] Tests 4 and 6 should fail.
[5] Apply the patch.
[6] Run the test case again; this time, all tests should pass.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 4e51ec5aae50c878bbdca6994361b12d7ba20d0a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/VirtualShelves.pm | 13 ++-
Koha/Template/Plugin/KohaBranchName.pm | 10 +-
koha-tmpl/opac-tmpl/ccsr/en/css/colors.css | 1 -
koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 4 +
koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 82 +---------
.../opac-tmpl/ccsr/en/includes/opac-bottom.inc | 7 +
koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc | 73 +++++++++
serials/serials-edit.pl | 8 +-
t/db_dependent/HoldsQueue.t | 50 ++++---
.../Koha_template_plugin_KohaBranchName.t | 37 +++++
t/db_dependent/VirtualShelves.t | 168 +++++++++++++-------
11 files changed, 282 insertions(+), 171 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
create mode 100644 t/db_dependent/Koha_template_plugin_KohaBranchName.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list