[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.01-61-g85130da
Git repo owner
gitmaster at git.koha-community.org
Tue Jul 16 01:24:17 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 85130dafc515363eba8f44973291a7af893a8b52 (commit)
via 3865b14a57c4e0d4547980acf67060eac181161f (commit)
via dbd52acf2958bca6b126a35a47d03b6d4d4d541d (commit)
via 7c92496cf7f7ee1016b934a8e01e995b680f9761 (commit)
via 7000aa561c7fb33c422f9b60c4f7590a6071ee08 (commit)
via 54d414ee2d16a2969c91e5a83cb8c66858fed03c (commit)
via 2dff5177f2d7c542175b28adf1832e201c0ae864 (commit)
via d3636aee9fe920106b8b9ea84d058c357e1e2fcc (commit)
via 2898cf57e5c3b9c6fd8f4fe8f0d5c180ab28fc06 (commit)
via 45c883c3e509eacf2a1e3737db6bb6e7c4a9d2d8 (commit)
from 1d9ac2b10a96800d301524978f00ee393b5bb75e (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 85130dafc515363eba8f44973291a7af893a8b52
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri May 31 10:17:08 2013 +0200
Bug 10384: fall back to normal authentication if LDAP server is not available
This fixes a bug where, assuming LDAP authentication is enabled, if a user
tries to log in while the LDAP server is down, the following fatal error
is displayed:
Can't call method "bind" on an undefined value at C4/Auth_with_ldap.pm line 134, <DATA> line 558.
This patch catches this error to allow normal authentication when LDAP connexion fails.
Test plan :
- Configure LDAP connexion with a host not having LDAP. ie :
<useldapserver>1</useldapserver>
<ldapserver id="ldapserver">
<hostname>localhost</hostname>
<base>dc=test,dc=com</base>
<user>cn=Manager,dc=test,dc=com</user>
<pass>passwd</pass>
<replicate>0</replicate>
<update>0</update>
<auth_by_bind>0</auth_by_bind>
<mapping>
<firstname is="givenname" ></firstname>
<surname is="sn" ></surname>
<branchcode is="branch" >MAIN</branchcode>
<userid is="uid" ></userid>
<password is="userpassword" ></password>
<email is="mail" ></email>
<categorycode is="employeetype" >PT</categorycode>
</mapping>
</ldapserver>
- Try to connect with mysql user (defined in koha-conf.xml)
- Try to connect with a user defined in borrowers
You may try to connect with working LDAP connexion
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 96ac578960cb4f2c5a964b3ac7fa4f9ba676b95d)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3865b14a57c4e0d4547980acf67060eac181161f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Apr 17 09:33:55 2013 -0400
Bug 9533: batch item modification form now shows default field values only by request
This patch makes the pre-population of the fields for the batch
item editor with the default values from the default framework
optional and off by default.
Test Plan:
1) Apply patch
2) Add default values for cost and replacement cost to the
default framework.
3) Browse to Tools / Batch item modification
4) Choose a file, or entire some barcodes in the text area
5) Ensure that the 'Populate fields with default values from default
framework' is *not* checked
6) Click 'Continue'
7) Observe that the fields for cost and replacement cost are blank
8) Click the 'back' button on your browser
9) Check the checkbox to enable the default value
10) Click 'Continue'
11) Observe that the fields for cost and replacement cost now contain
the default values you assigned them in the default MARC framework
Signed-off-by: David Cook <dcook at prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Switch works correctly, all tests and QA script pass.
Note: there is a bug with default values for all non text input
fields. Default values won't be applied for those fields as the
pull downs are not preselected correctly with the default values
defined in the framework.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2d32ab38148f7d75412a36e928dea799717bc5fb)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit dbd52acf2958bca6b126a35a47d03b6d4d4d541d
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jun 26 17:52:40 2013 +0200
Bug 9113: fix handling of certain characters by item batch modification tool
If you're using the batch modification tool and entering a call number
like "E+ 123 ABC", the tool removes the + and puts a space in its place,
e.g., "E 123 ABC"
This is because the form is posted via Ajax by background-job-progressbar.js.
Values are URI-encoded using escape(), but this method does not escape some
characters: * @ - _ + . /
Also, "+" is considered as a space in a URI.
This patch replaces escape() by encodeURIComponent() which encodes every character.
Test plan :
Perform an items batch modification by setting '* @ - _ + . /' in a field
(notes for example) and see that all characters are saved correctly.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0397e7ea64c208c140d7178ed34c3bd4b266fcfb)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7c92496cf7f7ee1016b934a8e01e995b680f9761
Author: Marc Veron <veron at veron.ch>
Date: Fri Jun 14 16:37:23 2013 +0200
Bug 5894: Display all titles when confirming copy of items from cart to list
Adds missing code that splits biblios before calling template.
To test:
- Add some items to cart
- Open cart, select some or all items
- Add to list; with patch, following window shold show something
like "Add 3 items to a list:", followed by list of items
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.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit bed99a851646fd0c7a4c906dd9dfe60c485b40c6)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7000aa561c7fb33c422f9b60c4f7590a6071ee08
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 5 14:03:51 2013 -0400
Bug 10346 - "Add multiple copies" should be labelled "Add multiple items"
The Koha interface standardizes on the term "item" instead of "copy," so
the "Add multiple copies" button would be more correctly labeled "Add
multiple items."
To test, view the add item screen for an existing or new record. You
should see a button labeled "Add multiple items."
Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 79df5211d6faff8ab31b46c815ed50c70093a057)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 54d414ee2d16a2969c91e5a83cb8c66858fed03c
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Jun 7 10:17:54 2013 +0200
Bug 10428: undefined check in add additem.pl
In additem.pl, in the code that generates item form you find:
@values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)->subfield($subtag)));
This patch adds the check of $itemrecord->field($tag) undef.
I did not found a way to test it because item tag is always defined
when editing an item, but it would be safer/prettier to add this check.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e31b158245f4eff36decebf30c8a87c8cfebe472)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2dff5177f2d7c542175b28adf1832e201c0ae864
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Apr 11 16:46:23 2013 +0200
Bug 10029 - CAS authentication fails in OPAC reserve
If OPAC reserve page is accessed without being logged-in, login form is displayed as well as a CAS authentication link (if enabled). A click on this link will lead to CAS server but one comming back to Koha, page shows an error : "ERROR: No biblionumber received".
This is because CAS link only contains the query path "/cgi-bin/koha/opac-reserve.pl", not the query parameters.
This patch adds query parameters to URI sent to CAS.
Test plan :
- Enable CAS
- Go to opac without been logged-in
- Try to place hold on a record
=> You get to /cgi-bin/koha/opac-reserve.pl?biblionumber=XXX showing authentication page
=> Check that CAS link contains query param "biblionumber"
- Click on CAS link and log in
=> Check you return well logged-in to reserve page with biblionumber param
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I have followed the test plan as far as I could and the links
contain the biblionumber now, which they didn't before.
I couldn't check the CAS login, but my normal login worked
as expected.
All tests and the QA script pass.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 974ab561ef00e76e7329f61b016b5d6b3103dde7)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d3636aee9fe920106b8b9ea84d058c357e1e2fcc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 26 12:54:15 2013 -0400
Bug 10510 - OPAC's renew selected link has glitchy icon
The "renew selected" link on the list of a user's checkouts looks bad
because the next icon in the sprite shows through. This patch modifies
the sprite to give it proper spacing and corrects the CSS to accommodate
the change.
To test, apply the patch, clear your browser cache, and view the
following pages to confirm that the change works:
- With TagsEnabled and TagsInputOnList enabled, view a search results
page when logged in and when not logged in. Tag links should be
styled correctly.
- With OpacBrowseResults enabled, open the detail page for any record
and click the "browse shelf" link. The "forward" and "back" arrows
should be styled correctly.
- With OpacRenewalAllowed enabled, log in to the OPAC and view your
checked out items. The "renew selected" and "renew all" links should
look correct.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Note: this will fix only the prog theme, but not the ccsr theme.
And it works perfectly.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 1a1658f020e482abdd35fc8afc04cfcbce91e046)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2898cf57e5c3b9c6fd8f4fe8f0d5c180ab28fc06
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jun 28 14:21:03 2013 -0400
Bug 10497 - star ratings not showing right in ccsr detail
Star ratings do not appear correctly in the CCSR theme because it lacks
the image sprite used to display them. This patch adds the required
file.
To test, apply the patch and view a search results set which includes
titles which have an existing rating. Ratings should appear correctly.
View a detail page for an title which has a rating, and add a rating to
a title which has no rating. Ratings should look correct and work
correctly.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
All tests pass - including leaving a rating on the newly visible stars
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
In order to test this, make sure you have set OpacStarRatings set
to 'results and details'.
The star images show up in OPAC results with the correct amount
of stars after applying the patch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2fccb14a806e9aad18cc9f75df39e09bd64830dd)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 45c883c3e509eacf2a1e3737db6bb6e7c4a9d2d8
Author: Liz Rea <liz at catalyst.net.nz>
Date: Fri May 10 09:32:17 2013 +1200
Bug 6553 - Parentheses in Corporate author break tracings
To test:
If an author's name includes parentheses or other escape-characters, the tracing links
produced in the OPAC fail in XSLT mode. This patch wraps the author names
in double-quotes, providing the necessary escapement.
Test plan:
- Create a new framework, delete Thesaurus from 100 and other fields
- Create a new record in this framework (or change an existing record to this framework)
- Add 100$a - use parentheses
- Check the search links in OPAC detail pages
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
XSLT change adding quotes. Search now matches search in the intranet.
Passes all tests.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 41409f500edf495db114b2277f4916e5a737a0aa)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth_with_cas.pm | 4 +---
C4/Auth_with_ldap.pm | 5 +++++
cataloguing/additem.pl | 2 +-
.../prog/en/js/background-job-progressbar.js | 4 ++--
.../prog/en/modules/cataloguing/additem.tt | 6 +++---
.../prog/en/modules/tools/batchMod.tt | 14 ++++++++++++++
.../{prog => ccsr}/images/star-ratings-sprite.png | Bin 2000 -> 2000 bytes
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 13 ++++++-------
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 6 +++---
koha-tmpl/opac-tmpl/prog/images/sprite.png | Bin 8381 -> 3348 bytes
opac/opac-addbybiblionumber.pl | 4 ++++
tools/batchMod.pl | 7 +++----
12 files changed, 42 insertions(+), 23 deletions(-)
copy koha-tmpl/opac-tmpl/{prog => ccsr}/images/star-ratings-sprite.png (100%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list