[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.09-46-g89e8607
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 15 21:33:35 CEST 2012
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.6.x has been updated
via 89e8607a7fa5154af9083d56556c4b95d7a2325b (commit)
via 0254b78a753131ddaa34baee1b8c29b31643a2b8 (commit)
via 7f24b0daa76aa22709315ead2417b648d4e7d677 (commit)
via 56032cae80fcccfe28fa76e3a4f4bc2f815b9ff5 (commit)
via 8ec4beb4df465e2c2b8a5403a00949a092810a76 (commit)
via 5f7287dfa4d5a7b7a32bac476b067c7bfc9ac041 (commit)
via fe018638c6d22d3ed7bf20391dc2033962423c3d (commit)
via 2af581331027784a3537d84439f2c32436b0e1c7 (commit)
via 7b65b3faed56337ded75c452d6955442aa43b39e (commit)
via 3243ba1148ed2ad0a6e715b3bef8f6268db76f66 (commit)
via 0b74746d8f500659842a17d28f01f18c120b092b (commit)
via f0b6a13bd535b1e28b07bf50d86dff7e97969761 (commit)
via aab0e776c6a0f91748afcaa00ed16273a184844e (commit)
via c97452826114c6aa2f0646fd1510f25d91c3c887 (commit)
via 55b20df30d0626cd2fa86af9357ed49a96e9b80b (commit)
via 08ea2b7a34ca52e0b1049c610498947644a91ff9 (commit)
via 8a464138faaea2f42ef4c4e2b462cb817434f2c7 (commit)
via 4ddc8cc5a509f4765740ae2b5b3e4112c1e86488 (commit)
via 273da77ed52e06185e014573427868e1a5a86733 (commit)
via a18636dcd295e6b70e0908c0245a2f5ebff4723c (commit)
via a33bf1b8fd4011c7597cb1a668f1005c40d31d92 (commit)
via 487436d90716fc59a30c0cedbf67fd4be4a8d910 (commit)
via 6860e43126377a1bb75d6218e3dd9411823a38f1 (commit)
via 6dae653b405bc05144fe28fd77955be25838958a (commit)
via 3b476a4ab9eec3c298e7230afda415dfa6119c90 (commit)
via 9be894c6bf757395e60960411c993f2a1e034126 (commit)
via 4b53bbe5b13be31e86160152c481df44bcfd6ea8 (commit)
via c8e43883323254e1f40b9bb24d542385334c2669 (commit)
via e5b1aab8cf87f0bc431dc4fcc88c70660f0bc7b3 (commit)
via e6fcd51bb209a4d350470bcbe5dcc4ac419284ef (commit)
via 5a4a50f9b4f4fbdedd8b41cbccb126d1da252f83 (commit)
via 3f16c2a18e651159b85179f8d6bc8b21e986512e (commit)
via bbce8fe4c844d80f5833eaa8e05936db64914531 (commit)
via 186fdbd600367d96efe50a1260b167419b50b9d9 (commit)
via 728c077a6039c78920eedf21a0d78abd5f51169c (commit)
via d093bab93f015a2d2061d17ee9feabb70699b8a7 (commit)
via 77c2dbd594683ab0dd2aec62358c57dda9906186 (commit)
via 5ffc76ab190642f694692747377c01336d788804 (commit)
via 17689beb57e8d9295ed43bbe075a85f89c84c845 (commit)
via 1fef39c0b2b8d0f377fe0121404f188f096a2048 (commit)
via e931c9c5bd618ede0c01be30c520f459bc3b8ae9 (commit)
via 3ab565fb58120c469f0ca72dd4e9b9fbc57d811e (commit)
via dd6d4f777227bdd7ed24442ad70fda44ba13ea26 (commit)
via a2510b9e594e8fc752d7717c2b6e532e7246efbd (commit)
via 7cda06cd90884944a51b7731bf76c5c1555c5219 (commit)
via bd0efebffe9798e47ca5624b79c96beaaa87c6d0 (commit)
from b577c32064f391c281b0414a999231ba2cf2903a (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 89e8607a7fa5154af9083d56556c4b95d7a2325b
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Mon Jun 11 03:44:04 2012 +1200
Bug 8806 - [3.6.x] Update changelog for 3.6.5-3.6.9, dependencies.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 0254b78a753131ddaa34baee1b8c29b31643a2b8
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Oct 9 14:19:18 2012 +1300
Bug 3652 XSS vulnerability in facets
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Confirmed bug with test plan on the bug and checked that
problem is fixed after applying the patch and that facets
still work.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Conflicts:
koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 7f24b0daa76aa22709315ead2417b648d4e7d677
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Oct 9 14:11:10 2012 +1300
Bug 3652: XSS vulnerability in page numbering
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Confirmed the problem with test plan on the bug and checked that
paging works correctly after the patch.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Conflicts:
koha-tmpl/opac-tmpl/prog/en/includes/page-numbers.inc
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 56032cae80fcccfe28fa76e3a4f4bc2f815b9ff5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Oct 8 21:30:49 2012 +1300
Bug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Works as advertised. After applying the patch, <blink>fish</blink>
is displayed on the page, but no blinking occurs.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 8ec4beb4df465e2c2b8a5403a00949a092810a76
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Sep 19 00:05:24 2012 +0800
Bug 8772 - Uninitialized variable triggers error log entry in smart_rules.pl
Changed declartion from:
my $op = $input->param('op');
to
my $op = $input->param('op') || q{};
in order to give an empty string default preventing error
logs from filling needlessly.
Signed-off-by: Marc Veron <veron at veron.ch>
The patch removes warnings like:
Use of uninitialized value $op in string eq at...
However there is one more warning, but it is not related to $op (addressed by this patch):
smart-rules.pl: Use of uninitialized value in string ne at .../admin/smart-rules.pl line 388.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 5f7287dfa4d5a7b7a32bac476b067c7bfc9ac041
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Sep 14 12:33:42 2012 -0400
Bug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page
Extra </div> returned. Killing it again.
After applying the patch the validator should only warn of
invalid "autocomplete" attribute.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit fe018638c6d22d3ed7bf20391dc2033962423c3d
Author: Marc Veron <veron at veron.ch>
Date: Mon Sep 24 22:19:56 2012 +0200
Bug 8796 - patron cards not starting on designated card
Better wording for the meaning of 'Position' to prevent mistakes on behaviour.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 2af581331027784a3537d84439f2c32436b0e1c7
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Tue Oct 2 13:49:32 2012 +0200
Bug 8497: Strange behavior when modifying the timeout system preference
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Tested standard login, patron auto-complete, and system preferences.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 7b65b3faed56337ded75c452d6955442aa43b39e
Author: Marc Veron <veron at veron.ch>
Date: Mon Sep 24 15:05:12 2012 +0200
Bug 8810 - Opac: Cart should display branchname instead of branchcode
In Opac, the cart should display the branchname instead of the branchcode.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 3243ba1148ed2ad0a6e715b3bef8f6268db76f66
Author: Mason James <mtj at kohaaloha.com>
Date: Tue May 8 16:59:20 2012 +1200
Bug 7589 - tinymce editor broken in .deb packages - in 'en' templates
this patch fixes a glitchy symlink to tiny_mce
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Note that you have to *remove* koha-common then install fresh in order
to recreate the symlink.
VERY IMPORTANT!!! debian/rules MUST USE TABS. USE -n WHEN COMMITING
THIS PATCH, AND DO NOT REPLACE TABS WITH SPACES.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 0b74746d8f500659842a17d28f01f18c120b092b
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Sep 9 08:55:12 2012 -0400
Bug 8744: Thesaurus in authorities should not lock fields
Although fields in the authority editor should support thesaurus
control, they should never be locked, as authority records commonly
refer to other records that may not be in use locally (and therefore
might not be in the authority file).
Test plan:
1) Make sure a 5xx field in one of your authority frameworks is
thesaurus-controlled.
2) Note that you cannot edit the field directly.
3) Apply patch.
4) Note that you can now edit the field irectly.
Signed-off-by: wajasu <matted-34813 at mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit f0b6a13bd535b1e28b07bf50d86dff7e97969761
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Aug 30 15:06:07 2012 +0800
Bug 8350: warning in logs when searching for nonexistent ISBN
Searching for a 10 or 13 digit numeric string that does not exist in
one's catalog will fail to affect SQL statement correctly
in C4::Breeding. Moved string substitution, which was triggering error
when search was undefined, and fixed if statements accordingly.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit aab0e776c6a0f91748afcaa00ed16273a184844e
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date: Tue Aug 21 18:02:31 2012 -0400
Bug 8659 Remove and readd the inactive funds in javascript to make it work in all browsers
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit c97452826114c6aa2f0646fd1510f25d91c3c887
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Tue Sep 18 15:59:37 2012 +0200
Bug 8702: System preferences search does not allow accented letters
This bug enables accented/diacritic system preference text to be matched
when searching for sysprefs.
Signed-off-by: wajasu <matted-34813 at mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 55b20df30d0626cd2fa86af9357ed49a96e9b80b
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Tue Sep 4 11:22:48 2012 -0400
Bug 8721: Fixes minor typo in AllowItemsOnHoldCheckout
Small string fix to remove repeated word.
Signed-off-by: Marc Veron <veron at veron.ch>
Tiny typo fix
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 08ea2b7a34ca52e0b1049c610498947644a91ff9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Aug 22 22:33:26 2012 +0200
Bug 3782: Remove broken z39.50 targets from sample files
Removes NYPL and NYU from the list of sample z39.50 servers, because
they don't work or only work inconsistently.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 8a464138faaea2f42ef4c4e2b462cb817434f2c7
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Jul 19 11:37:16 2012 +0200
Bug 8275: xml parsing error when the webservice GetPatronInfo/show_loans is called
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 4ddc8cc5a509f4765740ae2b5b3e4112c1e86488
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Sep 3 11:00:32 2012 +0800
Bug 8713 - Warning message triggered by clicking Keywords to MARC mapping
In the Koha Administration screen, clicking
Keywords to MARC mapping triggered an uninitialized $op warning
in the koha error logs. Added a "|| q{}" to ensure it is set.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 273da77ed52e06185e014573427868e1a5a86733
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Aug 9 12:43:20 2012 +0200
Bug 7690: hidelostitems not working in Normal Display
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Tested by toggling both the hidelostitems preference and the
OpacHiddenItems preference. Both work as expected in the normal
search results display.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit a18636dcd295e6b70e0908c0245a2f5ebff4723c
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Sep 3 12:27:58 2012 +0800
Bug 8714 - Poorly ordered and triggers warning in marctagstructure.pl
An array boundary check was after a comparison using the array.
By changing the logic which had " and ( $j < $cnt)" to be at the
beginning "( $j < $cnt ) and ", the warning is no longer shown
in the error log.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit a33bf1b8fd4011c7597cb1a668f1005c40d31d92
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Aug 30 18:42:26 2012 +0200
Bug 8705: Software error on help of main page
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 487436d90716fc59a30c0cedbf67fd4be4a8d910
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Sep 14 15:59:50 2012 +0200
Bug 8743 follow-up, throw a more explanatory error message
When testing bug 8743, I discovered a missing index in my authority file.
The error message was
"CCL parsing error (10014) Unknown qualifier ZOOM"
which is not very helpfull because it does not show the query that was made.
This patch add the query itself after the zebra error
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 6860e43126377a1bb75d6218e3dd9411823a38f1
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Sep 9 08:18:05 2012 -0400
Bug 8743: ZOOM error when merging authority change to biblios
The merge fails and the following errors appear in the log:
[Sun Sep 02 23:38:10 2012] [error] [client 75.149.175.233] ZOOM error 25
"Specified element set name not valid for specified database" (addinfo:
"F") from diag-set 'Bib-1', referer:
http://****/cgi-bin/koha/authorities/authorities.pl?authid=3010
[Sun Sep 02 23:38:11 2012] [error] [client 75.149.175.233] Premature end of
script headers: authorities.pl, referer:
http://****/cgi-bin/koha/authorities/authorities.pl?authid=3010
Test plan:
1) Set dontmerge to "Do"
2) Find an authority that is linked to a bib record.
3) Edit the main entry of the authority.
4) Save the authority record.
5) Notice that you got a nasty error and the bib record was not updated.
6) Apply patch.
7) Edit the main entry of the authority again (you can just set it back
to what it was to start with).
8) Save authority record.
9) Notice that there was no error, and the bib record was updated.
10) Sign off.
Signed-off-by: Doug Kingston <dpk at randomnotes.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 6dae653b405bc05144fe28fd77955be25838958a
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Aug 28 14:34:55 2012 +0100
Bug 6976 Close loophole allowing borrowers extra holds via opac
The check that the max number of reserves has
not been reached needs to take account of the fact
that we may have added enouch reserves to
reach the limit while this script is running.
Add a check against the incrementing count
The variable canreserve was only used when looping
through multiple holds but was not being
reinitialized on every iteration
make variable local to loop it is used in and
initialize to zero
Have used perltidy to correct the indention of
the while loop as it was misleading to the reader
Some numeric comparisons were using a string operator
fix them before strange bugs manifest themselves
The loophole manifests thus:
borrowers are only allowed Y holds.
If holds are done individually, it is
obeying that law i.e. X has held Y separate books –
when I tried to do a 6th
book it told me that I could not place a hold.
However, if a borrower checks the catalogue,
gets the intial list up and clicks items on the “results”
box and then clicks “place hold” they can hold more than Y
items Please enter the commit message for your changes. Lines starting
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 3b476a4ab9eec3c298e7230afda415dfa6119c90
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Fri Sep 7 10:58:53 2012 -0400
Bug 8447: Make sure we have enough subfields for broader_headings
Thanks to wajasu for providing the debugging information, as I cannot
seem to duplicate the problem, even seeing where it could come from.
Fix corrects cases where upon save, a software error complaing about
indicators being wrong as a side effect of a poorly autogenerated
biblio/authority record.
Behvior with this fix causes existing bilio data to to be preserved
while linking to the authority via subtag 9.
Signed-off-by: wajasu <matted-34813 at mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 9be894c6bf757395e60960411c993f2a1e034126
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jul 25 17:59:54 2012 +0200
Bug 8071: link between bib and authorities with the authid
Do not automatically populate $9 in bibliographic headings when the
$9 is set in the authorized heading field of the authority record.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 4b53bbe5b13be31e86160152c481df44bcfd6ea8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 6 15:02:29 2012 -0400
Bug 8730 - browse overlaying powered by
This patch adds a "z-index" property to the CSS for
the browse results menu so that it will appear
on top of the "Powered by Koha" link.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit c8e43883323254e1f40b9bb24d542385334c2669
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Sep 12 00:57:43 2012 +0800
Bug 8339 - div id="login" should be id="login_controls" in header.inc
After experiencing what I believe was stale CSS, I have
implemented oleonard's suggested fix which does work. That is:
header.inc change login to login_controls, and in
staff-global.css change the #login to #login_controls.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit e5b1aab8cf87f0bc431dc4fcc88c70660f0bc7b3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Sep 7 11:23:08 2012 -0400
Bug 8677 - table overlapping to the right on holds waiting
Converting layout to 100% flexible width to allow
table to expand as needed.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit e6fcd51bb209a4d350470bcbe5dcc4ac419284ef
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Tue Sep 4 16:53:36 2012 +0200
Bug 8716 - make the routing list reordering function work
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 5a4a50f9b4f4fbdedd8b41cbccb126d1da252f83
Author: MJ Ray <mjr at phonecoop.coop>
Date: Fri Sep 7 17:40:26 2012 +0100
Bug 7068 - autobarcode not working when duplicating patrons
Fixed by blanking cardnumber in the code and showing it in the template,
instead of just not showing it in the template
Autobarcode now correctly fills in on a duplicated patron.
Signed-off-by: Melia Meggs <melia at test.bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 3f16c2a18e651159b85179f8d6bc8b21e986512e
Author: Melia Meggs <melia at test.bywatersolutions.com>
Date: Tue Sep 11 16:38:28 2012 -0500
Bug 7143: Adding Kathryn Tyree to the history and About page.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit bbce8fe4c844d80f5833eaa8e05936db64914531
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Thu Aug 23 12:27:49 2012 -0400
Bug 8678: XSLT stylesheets output XML, but HTML is needed
Because we are embedding the results of XSLT stylesheets in HTML, we
need to output HTML instead of XML. Outputting XML results in
non-standard-compliant (or at least non-Firefox-compliant) markup.
To test:
View a variety of XSLT-rendered pages on the OPAC and intranet, and
confirm that all look as expected.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 186fdbd600367d96efe50a1260b167419b50b9d9
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Aug 8 18:02:13 2012 +0200
Bug 8594 - prevent the report system from breaking some subqueries
If you had a report query that had a subquery in the fields list, and
that subquery had a LIMIT specifier, then it would be removed which
could break your query. This patch prevents this case from breaking by
ensuring that only a LIMIT that follows the last WHERE in the query is
removed.
If you don't have a WHERE, then it will behave like it always
did, removing all the cases of LIMIT (which would still break a subquery
but this is a) more rare, and b) would require more intelligent parsing
to deal with.
Also adds test cases and function documentation.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Tested with this report:
select biblionumber, (select itemnumber from items where items.biblionumber=biblio.biblionumber LIMIT 1) from biblio where biblionumber<1000;
and it worked like a charm
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5a34c64b9374a8c3de2658d588e63ed0d828cc6d)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 728c077a6039c78920eedf21a0d78abd5f51169c
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Sep 4 08:15:19 2012 +0800
Bug 4064 - Uninitialized variable errors in opac-search.pl
In 3.6.3 the error was triggered. It was already fixed with some
particularly ugly logic: if (($params->{'offset'}||'') eq '') {
Having read through the code, $offset is a better choice and
produces prettier, clearer code: if (!$offset) {
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 86a1246fcef0456758c7c61985d427202bbfb860)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit d093bab93f015a2d2061d17ee9feabb70699b8a7
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date: Fri Aug 17 08:42:12 2012 -0400
Bug 8012: default values for defaultSortField/defaultSortOrder NULL on install
...which *looks* like "relevance/ascending" in the staff client, which doesn't make sense.
This patch initializes the values at "relevance/descending", which is a functional
combination.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5bc1246b6d1e3e25ff6c4b430bd698185ba876cc)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 77c2dbd594683ab0dd2aec62358c57dda9906186
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Thu Aug 16 16:57:29 2012 +0200
Bug 8646 - prevent the highlighter from going infinite loop
On certain search queries, for example
http://koha-intra/cgi-bin/koha/catalogue/search.pl?kw=idx&q=ti:book%20
the highlighter starts going into an infinite loop until the browser
decides to kill it.
This patch prevents the bad input going to the highlighter.
It also includes the fix on the OPAC, even though the issue doesn't come
up there. Better to be safe...
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 3e599787d4a3b918f45914347344f4a1d99241c2)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 5ffc76ab190642f694692747377c01336d788804
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jul 31 08:14:19 2012 -0400
Bug 8533 - Non-numeric cardnumbers screw up autoMemberNum
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Removes a warning from mysql:
Truncated incorrect INTEGER value: 'P13000'
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 0db4288861251f069a4ae96dbe89ab9e5059ab0c)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 17689beb57e8d9295ed43bbe075a85f89c84c845
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Fri Jul 20 12:20:47 2012 +0200
Bug 8162: allow packages to work on Ubuntu Precise
The newer version of MySQL in Ubuntu 12.04 installs a default
'localhost' user with no username. Due to the way that MySQL looks up
user details when you connect, if you connect from localhost and the
user was only created with a wildcard host (%), the anonymous localhost
user will be found instead. This means that your username is lost for
the connection, and you have no privileges.
This patch creates a second user with a hostname of 'localhost'. This
will not work if your database is on a remote server, but you probably
know what you are doing if that's the case. Patches to determine this
server's name relative to the MySQL server are welcome (or even ideas on
how to do it.)
It also fixes up a couple of other small things:
* make koha-remove stop zebra properly
* stop the warning that the password file is missing on create
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Works as promised.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Allows 3.8.4 packages to work on Ubuntu 12.04
(cherry picked from commit 7d8078472d6ad04e1fb61ab3542f86226517a45a)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 1fef39c0b2b8d0f377fe0121404f188f096a2048
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Mon Aug 6 15:01:09 2012 +0200
Bug 8576: Software error on authority edition when using merge
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 36d6f725806f383bb5b1c08f0afbc66d94b32d66)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit e931c9c5bd618ede0c01be30c520f459bc3b8ae9
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jun 29 22:24:50 2012 +0800
Bug 8172 - Missing dereference marker for buildQuery parameter in addbooks.pl Added a dereference to an array parameter of buildQuery.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 030df9893eb235efb870d66e8f644129a4a4091d)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 3ab565fb58120c469f0ca72dd4e9b9fbc57d811e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Jul 20 10:48:27 2012 +0200
Bug 7628: Escape '+' characters for categorycode
uri escape the following characters:
&, @, /, ;, :, =, +, ? and $
Signed-off-by: Marc Veron <veron at veron.ch>
Test and sign off second patch (independently from first patch).
Added categories like '+zwoelf' or '? Test' before applying the patch.
Deletion was not possible.
After applying patch deletion is possible, patch works as expected.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 50f164c58dd10ac81c07e2f64c14288d8b11ce2c)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit dd6d4f777227bdd7ed24442ad70fda44ba13ea26
Author: Marc Veron <veron at veron.ch>
Date: Wed Jul 18 07:57:36 2012 +0200
Bug 7628 - Required format is not enforced for Patron Categories
Enforces category code with allowed characters only.
Test plan:
- Before applying patch, create a category code like Test+
- Try to delete category with this code -> does not work
- Apply patch
- Try to create category with code containg other characters than letters, numbers, - and _
- Result: You are not allowed to do so, appropriate message pops up
Signed-off-by: David Cook <dcook at prosentient.com.au>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 601228f6585b6b942a31a8cfa642216925b09148)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit a2510b9e594e8fc752d7717c2b6e532e7246efbd
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Jul 17 18:30:13 2012 +1000
Bug 8455 - Check ins processed through "Check Out" tab of the Patron Record ignore Circulation System Preferences
If you check-in an item through the "Check Out" tab of the Patron Record, the return/check-in ignores the "InProcessingToShelvingCart" and "ReturnToShelvingCart" circulation system preferences. Or rather, there just isn't any logic to handle them in the renewscript.pl file.
I'm pretty much just bringing the code straight across from returns.pl, although some minor changes need to be made due to context.
Both system preferences are important to include, since you can check-out an in processing item to a patron. While a regular check-in will clear the in processing status, a check-in through the Patron module will cause the item to have its status returned to "In Processing" rather than going to "Shelving Cart", if the preference is set, of course.
To test the scenario, turn on one of (or both of) these settings and try checking books in through the Circulation module and the Patron module.
Before the patch, you will see that only the Circulation module will change the shelving location.
After the patch, you should see identical behaviour.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8da4f376b4bdd66df966060536ee80adb672a643)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 7cda06cd90884944a51b7731bf76c5c1555c5219
Author: Elliott Davis <elliott at bywatersolutions.com>
Date: Wed Jul 11 05:52:53 2012 -0500
Bug 8421 : Added a URI filter to encode a cardnumber for borrowers as to not break patronimage.pl
To Test:
Add a + (or any char that would need to be encoded) to a card number of a patron with an image attached.
Go to member/moremember.pl.
If the patrons image is there, you are golden.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c6e83d1156cc0ac2d2d299df43cc57a31e2249ef)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit bd0efebffe9798e47ca5624b79c96beaaa87c6d0
Author: Meenakshi.R <meenakshi.r at osslabs.biz>
Date: Wed May 23 10:37:19 2012 +0530
Bug 6655 - Sorting order of serial issues in OPAC
Works as advertised.
Signed-off-by: Elliott Davis <elliott at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit ce015d0e470a76e3d714358f07cd7e6eb2012c2e)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 22 +-
C4/AuthoritiesMarc.pm | 12 +-
C4/Biblio.pm | 203 ++++----
C4/Breeding.pm | 8 +-
C4/ILSDI/Services.pm | 4 +
C4/Linker/Default.pm | 9 +-
C4/Members.pm | 5 +-
C4/Reports/Guided.pm | 43 ++-
C4/Search.pm | 35 +-
C4/Serials.pm | 2 +-
admin/fieldmapping.pl | 2 +-
admin/marctagstructure.pl | 2 +-
admin/preferences.pl | 5 +-
admin/smart-rules.pl | 2 +-
authorities/authorities.pl | 5 +-
authorities/blinddetail-biblio-search.pl | 1 +
cataloguing/addbooks.pl | 2 +-
debian/changelog | 30 ++
debian/control | 10 +-
debian/rules | 3 +-
debian/scripts/koha-create | 7 +-
debian/scripts/koha-remove | 10 +-
docs/history.txt | 1 +
help.pl | 19 +-
.../mysql/de-DE/optional/sample_z3950_servers.sql | 2 -
.../mysql/en/optional/sample_z3950_servers.sql | 2 -
.../mysql/es-ES/optional/sample_z3950_servers.sql | 2 -
.../mysql/pl-PL/optional/sample_z3950_servers.sql | 4 +-
installer/data/mysql/sysprefs.sql | 8 +-
.../intranet-tmpl/prog/en/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../intranet-tmpl/prog/en/includes/header.inc | 2 +-
.../prog/en/includes/prefs-admin-search.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +-
.../prog/en/modules/acqui/neworderempty.tt | 13 +-
.../prog/en/modules/admin/categorie.tt | 22 +-
.../prog/en/modules/admin/fieldmapping.tt | 2 +-
.../prog/en/modules/admin/preferences.tt | 2 +-
.../en/modules/admin/preferences/circulation.pref | 2 +-
.../authorities/blinddetail-biblio-search.tt | 39 +-
.../prog/en/modules/catalogue/results.tt | 5 +
.../prog/en/modules/circ/waitingreserves.tt | 2 +-
.../prog/en/modules/labels/label-print.tt | 6 +-
.../prog/en/modules/members/memberentrygen.tt | 6 +-
.../prog/en/modules/serials/routing.tt | 2 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl} | 478 +++++--------------
.../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/NORMARCslim2intranetResults.xsl} | 503 ++++++++------------
.../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 69 +++
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 1 +
.../opac-tmpl/prog/en/includes/opac-facets.inc | 6 +-
.../opac-tmpl/prog/en/includes/page-numbers.inc | 6 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt | 4 +-
.../prog/en/modules/opac-results-grouped.tt | 5 +
.../opac-tmpl/prog/en/modules/opac-results.tt | 9 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tt | 2 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +-
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 2 +-
.../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 2 +-
.../prog/en/xslt/NORMARCslim2OPACResults.xsl | 2 +-
.../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 2 +-
.../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 2 +-
members/memberentry.pl | 3 +-
misc/batchImportMARCWithBiblionumbers.pl | 2 +-
opac/opac-reserve.pl | 84 ++--
opac/opac-search.pl | 4 +-
reserve/renewscript.pl | 22 +
t/db_dependent/Reports/Guided.t | 92 ++++
70 files changed, 916 insertions(+), 964 deletions(-)
copy koha-tmpl/{opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl => intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl} (62%)
copy koha-tmpl/{opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl => intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl} (71%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
create mode 100644 t/db_dependent/Reports/Guided.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list