[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.09-17-g1140e9c
Git repo owner
gitmaster at git.koha-community.org
Sat Aug 3 21:53:44 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.10.x has been updated
via 1140e9c46af8522373ec51fc6282bfc7c4936540 (commit)
via fad6ed5b1751486c7a492349b864128bbe81f432 (commit)
via e29a98f8166df4cad0cb6ea12bd06a39e52a4d47 (commit)
via 424a73e889edf5d8e90150ed504fa802953d8194 (commit)
via f7fdd8e36f98ed05ed0eb49c02d414aa8c5cb403 (commit)
via 2db1c2b208c53a59bd896af426455122b7b738e5 (commit)
via 70cc750a5f96ca72c07f359006730ff92f9ff5b5 (commit)
from e94b493fc7f6217a92d91f78ce6849d73fd8c6e8 (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 1140e9c46af8522373ec51fc6282bfc7c4936540
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Sat Aug 3 16:24:18 2013 -0300
Bug 9519: DBRev 3.10.09.001
Update database number
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
commit fad6ed5b1751486c7a492349b864128bbe81f432
Author: Sonia LEMAIRE <sonia.lemaire at biblibre.com>
Date: Wed Jul 3 15:53:49 2013 +0200
Bug 9519: fix code for Italian language search limiter
'ind' rather than 'ita' was set as the ISO639-2 language
code for Italian in the fr-FR, it-IT, pl-PL, ru-RU, and uk-UA
installation SQL.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I checked nb-NO and de-DE - language code there had already
been corrected.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 707733ed2992a5d612d22510174301d65d3d7c05)
Conflicts:
installer/data/mysql/updatedatabase.pl
Trivial merge conflict in the usual suspect, updatedatabase.pl
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 645e80d58783aed46f368e36156ea69e2a34779e)
Conflicts:
installer/data/mysql/updatedatabase.pl
Solved merge conflict
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 645e80d58783aed46f368e36156ea69e2a34779e)
commit e29a98f8166df4cad0cb6ea12bd06a39e52a4d47
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>
(cherry picked from commit 85130dafc515363eba8f44973291a7af893a8b52)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 85130dafc515363eba8f44973291a7af893a8b52)
commit 424a73e889edf5d8e90150ed504fa802953d8194
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 25 09:47:53 2013 +0200
Bug 10088: FIX adding an order from a staged file.
Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay
routine. The existence of $defaulvalue hashref should be tested before
getting to the branchcode key.
Test plan:
Before applying the patch, an error occurred when you try to create an
order from a staged file.
After applying the patch, the error does not appear anymore.
Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit f2e44716f60578b9663862d7b2ba3b16f7067143)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit a8ee942442d42e7ae4f42567eba22f33725188a5)
commit f7fdd8e36f98ed05ed0eb49c02d414aa8c5cb403
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Mar 27 09:18:24 2013 -0400
Bug 9902 - item subfields not populating
Test Plan:
1) Create a new serial with a default location, call number, and library
( the library will need to be any but the one you are logged in as )
2) Click the "Recieve" button for this serial
3) Click "Click to add item"
4) Note those values are not populated
5) Apply the patch
6) Reload the page
7) Click "Click to add item"
8) Note those values are now populated
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
All tests pass!
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
This seems to restore the former behaviour.
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
signing for 3.10.x - restores former behaviour.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely. Before applying the patch callnumber,
location and branches are not carried over correctly.
After applying the patch, this works as expected.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Pushed to 3.10.x
commit 2db1c2b208c53a59bd896af426455122b7b738e5
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>
(cherry picked from commit 3865b14a57c4e0d4547980acf67060eac181161f)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 3865b14a57c4e0d4547980acf67060eac181161f)
commit 70cc750a5f96ca72c07f359006730ff92f9ff5b5
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>
(cherry picked from commit dbd52acf2958bca6b126a35a47d03b6d4d4d541d)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit dbd52acf2958bca6b126a35a47d03b6d4d4d541d)
-----------------------------------------------------------------------
Summary of changes:
C4/Auth_with_ldap.pm | 5 +++++
C4/Items.pm | 15 +++++++++++++++
.../mysql/fr-FR/1-Obligatoire/subtag_registry.sql | 2 +-
.../data/mysql/it-IT/necessari/subtag_registry.sql | 2 +-
.../data/mysql/pl-PL/mandatory/subtag_registry.sql | 2 +-
.../data/mysql/ru-RU/mandatory/subtag_registry.sql | 2 +-
.../data/mysql/uk-UA/mandatory/subtag_registry.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 6 ++++++
.../prog/en/js/background-job-progressbar.js | 4 ++--
.../prog/en/modules/tools/batchMod.tt | 14 ++++++++++++++
kohaversion.pl | 2 +-
tools/batchMod.pl | 7 +++----
12 files changed, 51 insertions(+), 12 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list