[koha-commits] main Koha release repository branch 3.4.x updated. v3.04.05-82-g52bcc25
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 19 22:25:08 CEST 2011
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.4.x has been updated
via 52bcc2560a71f38f8e4ef840a180603612c14f50 (commit)
via d4b9ac0b967bc9a01162ddaf58fd581796ad3fda (commit)
via b262ab329e93e297c194b8afd285ca78eb16dfa6 (commit)
via 2f610df500712a091930e7338136584a506af7c2 (commit)
via fc875a596823a433f46d494df2271ecb7cdff424 (commit)
via 65e03f15257dfa6510fc5752c07ccd8a21131058 (commit)
via af65c1402cd186f7eb53b8ef79978f7c979db23b (commit)
via 8558f011e48679322aa2e40150aeefbe5fcd3bae (commit)
via b7f7c10761d11ecf201d622579e4c4caec33300c (commit)
via 39a060940877b61b05d2d5aef37c8fd76bf30382 (commit)
via 92913143c895af00d0fed09b3b1e3e3d284ff3ca (commit)
via 0d3e10b2fbbd45e3695b6fd9e58b01e1cedefcaa (commit)
via 244eb3515b357038c9c1e5fcc9c7a5884d4287a8 (commit)
via ef27e89d8bf85d06507240c2bee025d48d6eeab1 (commit)
via e916ac6d6ef8870e3f1a1acb47e05d9ecd7c3263 (commit)
via ec258f8ff1986aef2338c7d4f4a5b4167359e171 (commit)
via 90a0154160be1a449ff4642e2f636de15df7f2a4 (commit)
via 9de80e949c9b892ce382d19c5b481c6fdf33a423 (commit)
via 6591d95ddde49f7d1e6512f2b2b504676cdb2cf0 (commit)
via 0dd0768f1862563359eb98a3342dac5d982a2d2e (commit)
via 84f49a61c509e1fe6a71f0eb371ab39732b8c849 (commit)
via db4a789fd6fe4745ff96420aebc9782525782957 (commit)
via 34d5d48308ba0895d349d83516e9d27b38c33054 (commit)
via b21fc3a12fa05c9e30ce25301d98ec0961e92f47 (commit)
via cdbc9358d0609adef845c4daa87ed623edb3f5e3 (commit)
via adb6d020ac0b591da7d6e3b8e1e380c4dde0081c (commit)
via 814e486e582abec1787b57228776beb7981423cd (commit)
via c12eed540b06938dee739bf684e08536d39d055c (commit)
via be58a851c4455aecca6d56cda7cffffac065fb86 (commit)
via fba73262c85b51344ec5565034b0de5b536014eb (commit)
via b60844edbc3a324bc77fc7c0d3b3de95ee84a0cd (commit)
via 2207cef5c41e8c0d3b30b243e3cf8df6f6074254 (commit)
from d030e746f98c99bfd5ab4825e24a19200a4a8244 (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 52bcc2560a71f38f8e4ef840a180603612c14f50
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Fri Oct 14 22:39:56 2011 -0400
Bug 7044 OPAC Branch Selector Fix
There was a typo in the OPAC branch selector added by
the OpacAddMastheadLibraryPulldown preference where the
current branch wasn't selected. This patch fixes that typo.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5938eb306acc2668b00178d88f319ad18c93e775)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d4b9ac0b967bc9a01162ddaf58fd581796ad3fda
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 13 10:02:38 2011 -0400
Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on
The display of messages "to the patron" on the checkout screen
lacked the same logic controlling messages "to other librarians,"
affecting conditions under which the [Delete] link would be shown.
This match makes the two categories consistent with each other:
A delete link will be shown if the logged in branch matches the
branch where the message was set OR if AllowAllMessageDeletion
is turned on.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 41928b088075a5da9bffb19edf906e94aa84466f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b262ab329e93e297c194b8afd285ca78eb16dfa6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 13 11:59:48 2011 -0400
Fix for Bug 7019 - Circulation History Sort Order Wrong
The return column sort was not using the right sort algorithm
because it was confused by the combination of date data and
text data ("Checked out"). I've added an explicit instruction
to sort by date. The downside to this change is that checked
out items are sorted with the oldest checkouts rather than
the newest:
Checked Out
Checked Out
10/14/1988
07/14/2005
Not perfect, but an improvement over completely incorrect
sorting. This patch also adds the necessary check for system
dateformat preference to properly sort metric dates.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit bfaf07b2780ed033677683ef40ce04e55d7c2b3d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2f610df500712a091930e7338136584a506af7c2
Author: Liz Rea <lrea at nekls.org>
Date: Thu Sep 29 12:31:09 2011 -0500
Bug 6942 - Add link to manual to help/authorities/authorities-home.tt
To test:
Verify link to manual shows on authorities home page in-app help.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
(cherry picked from commit 5affbfc9fd5b6e5974aa9e64d074235046359950)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fc875a596823a433f46d494df2271ecb7cdff424
Author: Liz Rea <lrea at nekls.org>
Date: Thu Sep 29 12:26:07 2011 -0500
Bug 6942 - Add link to manual to help/admin/admin-home.tt
To test:
Verify link to manual shows on administration home page in-app help.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
(cherry picked from commit a43974029205fb830eef8989b8a5899d0561840d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 65e03f15257dfa6510fc5752c07ccd8a21131058
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sat Oct 15 14:10:04 2011 +1300
Adding another developer to the history
(cherry picked from commit 1576e3f410b3c4914d1b803953f64e32c20d3e74)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit af65c1402cd186f7eb53b8ef79978f7c979db23b
Author: Greg Barniskis <gbarniskis at gmail.com>
Date: Mon Sep 26 12:07:20 2011 -0500
Bug 6915 - [SIGNED-OFF] reduce module name truncation problem in koha_perl_deps.pl
Widen module name allowance in the format statement, adjust other
columns to be generous but not-so-much as before, modify report
header and footer print statements to align and clarify. Very very
long module names or version numbers are still subject to possible
truncation.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Sign off comment: With this patch module names are not truncated, which is an
improvement. Lines are still too long to fit an 80 column display, and so they
wrap around, but tht is a minor annoyance compared to the truncated names.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit e5e5e3155e4c4b3f51415d08a324f84142e91f3d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 8558f011e48679322aa2e40150aeefbe5fcd3bae
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Aug 30 14:58:36 2011 +0100
Bug 6806 Fix encoding of title in subscription-add
Port of Maxime Pelletier <maxime.pelletier at libeo.com>'s patch for
3.2 to TT
Stops the mangling of titles containing accented characters
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 d010412c66a9291d13676ed7a3fbdaaf1b269b59)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b7f7c10761d11ecf201d622579e4c4caec33300c
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Thu Aug 25 18:32:51 2011 -0400
Bug 6789: biblios with many items can result in broken search results link
This patch fixes an issue whereby biblios with many items (often > 500) would index,
but not the biblionumber itself, resulting in search results with a) inaccurate item counts
and b) no biblionumber to use in the link to the details page. This is due to Net::Z3950::ZOOM not providing
a mechanism for specifying different connection attributes; the maximumRecordSize ZOOM connection attribute,
if not specified, defaults to 1MB, which is less than the size of a MARC record with many, many 952 fields. Since
it is unlikely we can fix Net::Z3950::ZOOM in a timely fashion, this patch aims to build a workaround on the Koha end.
This patch changes EmbedItemsInMarcBiblio to use append_fields instead of insert_ordered_fields,
so the 999$c will come before the item records. It's VERY unlikely we will encounter more than 1MB of biblio-level MARC
content, as this would break the ISO-2709 standard by a large factor.
To this end, it also moves the fix_biblio_ids portion of get_corrected_marc_record out of rebuild_zebra.pl,
and makes it a part of GetMarcBiblio (right before EmbedItemsInMarcBiblio, so the 952s still come last). fix_biblio_ids
is kept as a subroutine for the deletion portion of rebuild_zebra.pl, which still uses it.
It also uses the subroutine parameter in GetMarcBiblio to do the EmbedItemsInMarcBiblio action, rather than having
rebuild_zebra.pl perform it on the itemless record returned from GetMarcBiblio. Simpler and cleaner that way.
To verify bug issue:
1. Find a biblio with over 700 items (or enough that the resulting MARCXML is greater than 1MB)
2. search for this biblio (in a search that would return multiple results, not just this title). You should get the title in
the results list
3. attempt to click the link to this biblio's details page; the biblionumber should be blank, leading to a 404
To test solution:
1. Apply patch
2. modify the biblio slightly (click the 005 for example) and save
OR manually add the biblio to zebraqueue for reindexing
3. after rebuild_zebra.pl -z -b -x runs, use the same search as above. The title should still appear.
4. click the link, and find yourself on the biblio detail page as desired
Signed-off-by: D Ruth Bavousett <ruth 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 4e95e94727b09b33d2f6c597bdd218a59dcc3681)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 39a060940877b61b05d2d5aef37c8fd76bf30382
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Oct 14 16:37:54 2011 -0400
Bug 5995 Followup: checkpw was returning inconsistent values
In the case of LDAP, checkpw was returning the cardnumber of there user, but it was being treated as the
userid. This patch updates checkpw_ldap to return the cardnumber AND the userid, and updates checkpw to
uniformly return cardnumber and userid in all instances, so that whoever is authenticating can use the
desired value in the right way.
(cherry picked from commit dcb4ac77fbfd813cc0eb39e060b49a7b8d491016)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 92913143c895af00d0fed09b3b1e3e3d284ff3ca
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Oct 5 09:53:02 2011 -0400
Fix for Bug 6970 - logout not redirecting to login page
For some reason the latest version of Firefox doesn't like
the javascript which empties the cart on logout. As Ian points
out, there is code which tries to redirect to "about:blank"
and close the window (since the main context of the function
is the Cart's popup window.
This patch adds a parameter to the delBasket function so
that we can pass a "popup" context to the function and
choose whether or not we want to ask JS to close the window.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d139d400b11e76f19ed208d4898d57f678acf9f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0d3e10b2fbbd45e3695b6fd9e58b01e1cedefcaa
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Wed Oct 19 16:01:49 2011 -0400
Updating Version Number to 3.04.05.001
commit 244eb3515b357038c9c1e5fcc9c7a5884d4287a8
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Sep 9 11:17:19 2011 -0400
Bug 6862: Duplicate VOKAL Book icons
Removes duplicate VOKAL icons for Book.png and Book-32px.png. Database updated in both
itemtypes and authorised_values tables to reflect change, so no icon loss should be seen
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ef27e89d8bf85d06507240c2bee025d48d6eeab1
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Aug 30 15:27:27 2011 -0400
bug 5780 followup: RIS export now includes all URLs
Also cleanup whitespace and adjust the line ending per
bug 6769.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 72eeac56fdb967d3fcfb08fc3f8dfb56bf74e755)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e916ac6d6ef8870e3f1a1acb47e05d9ecd7c3263
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Feb 21 10:29:48 2011 +1300
Bug 5780 - Export the URI as part of a RIS export
Squashed commit of the following:
commit 8486cd30caf879ddff93aaa5fab722838db946a1
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Feb 21 10:23:07 2011 +1300
WR76962 - Fixing typos
commit f3ac9d9233db2b410fded112e16e54b27280af0a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Feb 21 09:56:43 2011 +1300
WR76962 - Extending RIS support to handle URI
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 412666e52b4e8f7bc5ae70f2b2978b1bd088a885)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ec258f8ff1986aef2338c7d4f4a5b4167359e171
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Thu Sep 29 18:05:49 2011 +1300
Bug 6938 - replace two subscription fields that were incorrectly removed
The "Note for OPAC" and "Note for staff" fields in subscriptions were
removed, but they are their own fields in the database and display in
other places too. This patch puts them back so that they can once again
be edited.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 2f11d527a0749e86350d62055f289aaee9435848)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 90a0154160be1a449ff4642e2f636de15df7f2a4
Author: Juan Romay Sieira <juan.sieira at xercode.es>
Date: Tue Sep 27 18:53:52 2011 +0200
Bug 6925 : The way to show the plural of the word "Item" is not compatible with multilanguage
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 518710878972a72b8d7b306af571b7c543267ddd)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9de80e949c9b892ce382d19c5b481c6fdf33a423
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Sep 2 18:39:53 2011 +0200
Bug 6840 warning in logs
In staff interface, in search (catalogue/search.pl), there is a warning saying:
[Fri Sep 2 18:20:24 2011] search.pl: Use of uninitialized value $key in hash
element at /home/paul/koha.dev/koha-community/C4/Templates.pm line 227.
The problem happens when searching from the quick search toolbar, not when you
search from advanced search.
Investigating, it seems it's because the sort_by is not defined in this case.
This patch
* fixes the problem in Search.pl by setting the parameter only if there is a sort_by field
* modify te Template->param sub to get a better error message. Instead of having just "use of uninitia..." get the value you try to set to an empty key. Much easier to understand which line causes the problem
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6591d95ddde49f7d1e6512f2b2b504676cdb2cf0
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sun Sep 25 11:25:25 2011 +0200
Bug 6912 Test 008 presence in get CoinS function
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 7621591ae697328798a44a95757352a147e33d72)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0dd0768f1862563359eb98a3342dac5d982a2d2e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Oct 13 15:54:48 2011 +1300
Bug 6885 Follow up to fix superlibarian permission check
(cherry picked from commit cdd798ec3216c6019adccc40935e93736ce4dc3b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 84f49a61c509e1fe6a71f0eb371ab39732b8c849
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Mon Sep 19 19:53:38 2011 +0200
Bug 6885 Allow superlib to delete items from any library
When IndependantBranches syspref is enabled, a 'regular' user can only
delete items belonging to his/her library. But a superlibrarian should
have the permission to delete items from all libraries. He can't for the
time being. This is fix by this patch.
How to test?
- On a multi-libraries Koha, activate IndependantBranches
- Log in with a superlibrarian user
- Find a biblio with one item from another library than the user home
library
- Click on Edit > Edit Items
- On the list of items, all lines have Delete link
- If you try to delete an item from another library than the user home
library, deletion will fail.
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 b64dbb246c8f29ac1c5e40b88a1f26f8d207b18d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit db4a789fd6fe4745ff96420aebc9782525782957
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Sep 1 11:53:16 2011 +0200
6278 Funny translation bug with XSLT subfieldSelect parameters
This patch resolves the situation of translating the parameters at (meaning subfield a and t) of subfieldSelect by replacing at with a_t. This string will not be translated and the xslt function subfieldSelect just ignores the underscore.
It is a pragmatic and easy solution. Theoretically, we should look for a solution in the translation parser. This is much harder and would probably not result in better code in those modules.
Test this patch with the following remarks in mind:
1) This patch deals with XSLT. So you should enable XSLT at OPAC detail.
2) In English or any language not translating the word at: Just check if the links for a MARC 490, 773, 780 or 785 still work at the opac detail page.
3) For a language translating the word at (like Dutch where at becomes bij), you should first rerun your translation process (at least for the OPAC).
4) In that language: Check the results on the vernacular opac detail page for MARC 490, 773, 780 or 785. Without the patch, you would not see a link following e.g. the Series label (with 490 first indicator set to 1). With the patch, you should see a link now.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Pragmatic solution for an annoying problem.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a4baa4df1843f1390f372d1569eb446171705742)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 34d5d48308ba0895d349d83516e9d27b38c33054
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Sep 23 11:49:37 2011 -0400
Fix for Bug 5898 - search to hold feature not clearing
Search to hold cookie is now cleared when the user loads a blank
circulation page and when the user logs out.
The user also now has the option to "forget" the current
search to hold patron by choosing an option from the
search to hold menu on the search results page.
Signed-off-by: Liz Rea <lrea at nekls.org>
Tested:
Forget <patron> from search to hold results clears cookie
Logging out clears the cookie - testing note: i had to clear my cookies and test fresh before this would work
Loading a blank circulation page (Check Out from the circulation-home) clears the cookie.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 7f6656aff84b2e9e47dd3317e8c72d69aaa8e433)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b21fc3a12fa05c9e30ce25301d98ec0961e92f47
Author: Frédérick Capovilla <frederick.capovilla at libeo.com>
Date: Wed Oct 5 13:16:37 2011 -0400
Bug 6977 : Adds support for repeatable subfields when importing authorities.
Before this patch, if we tried to import an authority with multiple $x
subfields into a bibliographic record, only the last value get added
to the form.
All repeated values should now be sent to the form.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit f97726406697f7973d2f8118049acaac2f95a3ed)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit cdbc9358d0609adef845c4daa87ed623edb3f5e3
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Sep 2 18:12:10 2011 +0200
Bug 5630, follow-up
Fixes chris comment 28, that was a consequence of Marcel comment 27
Recent error
[Thu Sep 01 14:22:45 2011] [error] [client 192.87.126.61] [Thu Sep 1 14:22:45
2011] opac-MARCdetail.pl: DBD::mysql::st execute failed: Unknown column
'limit_desc' in 'field list' at /usr/share/koha/testclone/C4/Auth.pm line 276.
Seems to come from this commit 9a3950f673c28688a2ead6514c3320e34ec0cc4c (5630
CAS Improvements)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1c0702c76e50173289a0ee340a9c5f190515d9c3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit adb6d020ac0b591da7d6e3b8e1e380c4dde0081c
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Aug 30 10:41:10 2011 -0400
Bug 5630 Followup: checkpw_ldap not imported
If LDAP authentication is used, Koha barks that C4::Auth::checkpw_ldap is
undefined, which is true. checkpw_ldap needs to be imported from C4::Auth_with_ldap,
like it was before the bug fix for 5630
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 74c7c4e3a5d6a3ec20b525936c5ffe2f9b188744)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 814e486e582abec1787b57228776beb7981423cd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Mar 31 10:06:46 2011 +1300
Bug 5630 CAS improvements
Squashed commit of the following:
commit 0e13a5278e11b288e48190dc26f31e96d06598dd
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date: Wed Jan 19 21:24:39 2011 +0100
Bug 5630 : fixing C4/Auth.pm
commit b55abc7a0dc1ca43b2610a27246293e9a9346e18
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Wed Jan 19 21:24:38 2011 +0100
Bug 5630 : Adds CAS documentation
commit df0098a6a65465e6e734f99f65fb453dd3fa11d1
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date: Wed Jan 19 21:24:37 2011 +0100
Bug 5630 : ilsdi service AuthenticatePatron doesn't with CAS syspref on
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
commit 31c8f0c0facfafae011ad24c9d458c50f2fad296
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Wed Jan 19 21:24:36 2011 +0100
Bug 5630 : Adds the ability to authenticate against multiple CAS servers
commit 9d0def826135d5756533dc0dcf8e0a107d1ac8fc
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date: Wed Jan 19 21:24:34 2011 +0100
Auth_with_cas : removing a warning
$sth was defined twice in a function
Removing the second definition
commit 5ee550e9a2bb7ab6bc09f14fced6ce0df8011eb0
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Wed Jan 19 21:24:33 2011 +0100
Bug 6012 : MT 2270: CAS proxy
CAS Proxy
Examples included are now really usable
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>
(cherry picked from commit 046c996c2fa8150b8c6a037976c9c22826e04b8b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c12eed540b06938dee739bf684e08536d39d055c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Sep 5 11:02:19 2011 +1200
Bug 5459 - Holds not being shifted when merging biblios
Holds are now shifted and reordered by date placed.
Holds already marked waiting, or in transit are not reordered.
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>
(cherry picked from commit 71defcbc6c851f54da223c040aa5d95e0bd43b73)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit be58a851c4455aecca6d56cda7cffffac065fb86
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Oct 10 22:10:41 2011 +1300
Fixing line endings
(cherry picked from commit fd052de5e179a26f9fec32141cc6d0f07b31ad9d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fba73262c85b51344ec5565034b0de5b536014eb
Author: Mason James <mtj at kohaaloha.com>
Date: Mon Oct 10 05:12:07 2011 +1300
Bug 6992 - add missing tab chars to history.txt
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c42e0084bd4a29f383c7a23724c8255da70ba836)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b60844edbc3a324bc77fc7c0d3b3de95ee84a0cd
Author: Mason James <mtj at kohaaloha.com>
Date: Mon Oct 10 03:15:44 2011 +1300
Bug 6991 - correcting committer info and adding company to koha-team page
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4216b980f3580eeec5af60ef030ac39277e587eb)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2207cef5c41e8c0d3b30b243e3cf8df6f6074254
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Aug 4 12:57:52 2011 +0100
Bug 6667 Correct documentation of function
Return list was documented as being in the reverse order
to how it is returned. Correct the perldoc description
also removed comments which did not help anyone trying
to make sense of this subroutine
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Just improving text comments. No code changes involved.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 0cf8194d5f6d1a401eb78abad88476ef061928c5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 127 +-
C4/Auth_cas_servers.yaml.orig | 12 +
C4/Auth_with_cas.pm | 181 +-
C4/Auth_with_ldap.pm | 4 +-
C4/Biblio.pm | 7 +-
C4/Items.pm | 6 +-
C4/Members.pm | 5 +-
C4/Reserves.pm | 49 +-
C4/Ris.pm | 22 +
C4/Templates.pm | 6 +-
authorities/blinddetail-biblio-search.pl | 21 +-
catalogue/search.pl | 2 +-
cataloguing/merge.pl | 5 +
docs/CAS/CAS/README | 8 +
docs/CAS/CASProxy/README | 9 +
docs/CAS/CASProxy/examples/casSession.tmp | Bin 0 -> 134 bytes
docs/CAS/CASProxy/examples/koha_webservice.pl | 58 +
docs/CAS/CASProxy/examples/proxy_cas.pl | 91 +
docs/CAS/CASProxy/examples/proxy_cas_callback.pl | 62 +
docs/CAS/CASProxy/examples/proxy_cas_data.pl | 80 +
docs/history.txt | 39 +-
installer/data/mysql/updatedatabase.pl | 10 +
.../intranet-tmpl/prog/en/css/staff-global.css | 12 +
.../intranet-tmpl/prog/en/includes/header.inc | 4 +-
koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 15 +-
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 4 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 +-
.../authorities/blinddetail-biblio-search.tt | 79 +-
.../intranet-tmpl/prog/en/modules/basket/basket.tt | 2 +-
.../prog/en/modules/catalogue/results.tt | 22 +-
.../prog/en/modules/circ/circulation.tt | 7 +-
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +-
.../prog/en/modules/help/admin/admin-home.tt | 4 +-
.../modules/help/authorities/authorities-home.tt | 3 +
.../prog/en/modules/members/readingrec.tt | 5 +-
.../prog/en/modules/serials/result.tt | 8 +-
.../prog/en/modules/serials/subscription-add.tt | 41 +-
.../prog/en/modules/serials/subscription-detail.tt | 2 +
.../intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl | 3758 ++++++++--------
.../prog/en/xslt/MARC21slim2MODS3-1.xsl | 5040 ++++++++++----------
.../prog/en/xslt/MARC21slim2RDFDC.xsl | 392 +-
.../prog/img/itemtypeimg/vokal/BOOK-32px.png | Bin 897 -> 0 bytes
.../prog/img/itemtypeimg/vokal/BOOK.png | Bin 3825 -> 0 bytes
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt | 14 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 10 +-
.../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 4 +-
.../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 4 +-
.../opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png | Bin 897 -> 0 bytes
.../opac-tmpl/prog/itemtypeimg/vokal/BOOK.png | Bin 3825 -> 0 bytes
koha_perl_deps.pl | 13 +-
kohaversion.pl | 2 +-
misc/migration_tools/rebuild_zebra.pl | 9 +-
53 files changed, 5471 insertions(+), 4795 deletions(-)
create mode 100644 C4/Auth_cas_servers.yaml.orig
create mode 100644 docs/CAS/CAS/README
create mode 100644 docs/CAS/CASProxy/README
create mode 100644 docs/CAS/CASProxy/examples/casSession.tmp
create mode 100755 docs/CAS/CASProxy/examples/koha_webservice.pl
create mode 100755 docs/CAS/CASProxy/examples/proxy_cas.pl
create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_callback.pl
create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_data.pl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK-32px.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK.png
delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png
delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK.png
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list