[koha-commits] main Koha release repository branch 3.4.x updated. v3.04.05-118-g61ea6ad
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 26 01:50:37 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 61ea6ad38827262c378729a25beac83d9ad2cf49 (commit)
via cb787cf84247dc0a8249944b1e154600749cb540 (commit)
via ea602708b602e70380621e2fbcddbb9eb1ebd329 (commit)
via a2c7779b91e14015e44bcc1d1d2758a3b4d3aab7 (commit)
via 608c23e6bd9a43155ac1b2b1158d7476a88ee882 (commit)
via fecb2920c7a2bc2234cb3ae3d200ed19a804741e (commit)
via fa08d3b72840c3d016f1bb5e1aefd4cc64989994 (commit)
via 422a82e0957bdd73af5e4816a6eb7cb54232ce14 (commit)
via 35987009bc95aa89a8947544abbecbe517348db0 (commit)
via a95b6cb963f866c6f2bb0977a9d7fb7532a88624 (commit)
via cca7dd8dc42c3d0749bc25bca0b9cda03cba3952 (commit)
via ddf212bd2928b8e9528093537193bad7691844a3 (commit)
via bc398d5b97e3c426433f716670f44423a0a87199 (commit)
via f5660195a5f0f74a8277fb44cee57ce4e55836b5 (commit)
via 258d980197403a6501409a69d8f54fd34481d60a (commit)
via ecb4cd1782384c98d9bbb931ed3b25ed5133940e (commit)
via ecf41dd5adcf40b664414b2e2045efa387213e22 (commit)
via 72871afb5305358b3842beb621c9c9c535ee6a7a (commit)
via 96a2765047e5b6732d45c89ce0645022bb5ce457 (commit)
via 7768b9b41d3e7a1eba574bb4d14d4d75bc9f6b66 (commit)
via 56ea10433c236cab65ce09d005cd3b0eecef0874 (commit)
via 1d6553710f7865dc14e5ca0a1f2a631570cedcf3 (commit)
via 838df87bec05d2751caff49958e8e418a5fb1e90 (commit)
via a82959ed04aa15bb8bf1c56ed0f384885ba39f90 (commit)
via 1c0334d0fa24caeddfa1342d6c0d7f770ac3880f (commit)
via d4b1669a15f29cfdf28626ec29acf19dc2413f47 (commit)
via 191fb637874d22204bab55ba95c0f94d04dcbeb9 (commit)
via 33b4c9859fd4d8853f59f3de704a34da11b087a1 (commit)
via 2c627d6150b4f56fb7405abeb36bbaf68d623ea4 (commit)
via 0342705cf42f666125d1c9c9cb18a6650819ecb2 (commit)
via cfdcc7abc14255d8e273dda0056d50c90af5c05d (commit)
via 54ce3fde2b73ce110a175a3bcabec52742b3b2d3 (commit)
via f105fddc196ec64726d6256974fe1a2b5001e3d1 (commit)
via c8455a012e07a61051eeb3a9c42301f881d2505b (commit)
via 0bfcc803adaadcb560eada0374a9d7cb2180a7a6 (commit)
via 7ee4dc6e8ca427728844e422c013ac4dcccec9f8 (commit)
from 52bcc2560a71f38f8e4ef840a180603612c14f50 (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 61ea6ad38827262c378729a25beac83d9ad2cf49
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Oct 21 14:41:03 2011 -0400
Bug 7078: Remove HTML::Template::Pro from Koha perl dependencies list
Removes HTML::Template::Pro as a requirement (since we're now on Template::Toolkit).
To test:
On a system without, HTML::Template::Pro installed, run perl koha_perl_deps.pl -m -u
Shouldn't return anything about HTML::Template::Pro
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d52095b48c9ef2a7249d367554da07277dd7bd09)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit cb787cf84247dc0a8249944b1e154600749cb540
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Oct 21 14:16:51 2011 -0400
Bug 7063: add available perl packages for Debian in install_misc/debian.packages
Takes work done by Eduardo Trápani, alphabetizes, and adds two other packages:
libuniversal-require-perl
libgravatar-url-perl
From my testing, only CGI::Session::Driver::memcached remains missing; it is only
packaged for sid and wheezy at this time
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 0953e8ca09d8f6010991523c2713e4546b12d907)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ea602708b602e70380621e2fbcddbb9eb1ebd329
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Oct 18 10:18:14 2011 -0400
Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl
The patronid value (cardnumber) set by checkpw in the case of SelfCheckoutByLogin
was improperly scoped with 'my' inside a conditional. The changes followup to 5995
made this more apparent, causing logins to fail.
Also added "parts copyright" statement to the script, since ByWater Solutions did make some
significant contributions to the operations of the page
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a2c7779b91e14015e44bcc1d1d2758a3b4d3aab7
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Oct 21 10:49:58 2011 -0400
Bug 7060 Followup: AddReturn needs GetMemberDetails
In my haste, I overlooked circ/returns.pl's need for borrower flags. This patch
changes back the call in AddReturn from GetMember to GetMemberDetails
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c5bc35b6945a03e27dd369d368be33d97f76e509)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 608c23e6bd9a43155ac1b2b1158d7476a88ee882
Author: Frédérick Capovilla <frederick.capovilla at sys-tech.net>
Date: Wed Sep 7 14:15:35 2011 -0400
Bug 6854: Correct a double password encryption problem in import_borrowers.pl
When the CSV file has no password column and no default value was set for
the password :
If we try to modify an existing user, the password from the BD is sent
to ModMember, which then encrypts the already-encrypted password a
second time.
http://bugs.koha-community.org/show_bug.cgi?id=6854
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Confirmed bug on current master.
1) Import new patron with password provided
> OPAC login works
2) Overwrite patron record, password provided
> OPAC login works
3) Overwrite patron record, password not provided
Before patch: OPAC login broken, password in database changed
After patch: OPC login works with same password as before
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 906ef4b28c376254743f948808e8ae47bb6f0a01)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fecb2920c7a2bc2234cb3ae3d200ed19a804741e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Oct 17 11:32:50 2011 +0200
7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter
Improving the cleanup_database.pl script in two aspects:
1) In some cases CGI::Session seems to place quotes around the atime and ctime
data in the a_session field. Two regexps now take this into account.
2) If the --sessdays parameter is used, the --sessions parameter is now
implicitly enabled too.
With thanks to Ian Bays and Tom Hanstra.
Signed-off-by: Ian Bays <ian.bays at ptfs-europe.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 a7ee2993f02fb45f704c92ffdc49f840e05f5bd0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fa08d3b72840c3d016f1bb5e1aefd4cc64989994
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Oct 20 09:57:12 2011 +0200
6094 Follow up for cleanup_database
Adds purging completed entries from need_merge_authorities table.
If you set dontmerge to ON, you need to periodically remove records.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c56d12c721684bfd3bac0e9bd9cf17f8f29651a9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 422a82e0957bdd73af5e4816a6eb7cb54232ce14
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Oct 18 19:55:22 2011 -0400
Bug 7060: GetMemberDetails unnecessary in C4::Circulation
Replaces all instances of GetMemberDetails with the more efficient GetMember. Since
no hash values other than the borrowers table's fields are used in this module, the
transition is safe.
To test:
1. Checkout a material; the page should load without error
2. Renew a material: the page should load without error
3. Return a material: the page should load without error
The above test plan invokes all the subroutines affected by this patch; any call to an undefined
value in a hashref should give a warning
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 769acee41ae258ea4efb0114eb7995736496a9cf)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 35987009bc95aa89a8947544abbecbe517348db0
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Oct 18 17:56:18 2011 -0400
Bug 7057: CheckReserves uses GetMemberDetails unnecessarily
Replaces call to GetMemberDetails with a call to GetMember. Much more efficient,
and since only branchcode is used, no required data is lost.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a1e3975067bf484f8d5f621e042e41baeb69d7b7)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a95b6cb963f866c6f2bb0977a9d7fb7532a88624
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Oct 17 22:04:53 2011 +0200
Bug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space
The item form on the order receive page (AcqCreateItem = on receive) contains a
lot of blank space which makes it hard to read and fill out.
To test:
- set AcqCreateItem = on receive
- create basket, order something, receive shipment
- check item form is nicely formatted and doesn't include lots of blank space
Note: It will be easier to test if you have an ACQ framework created to hide some
unnecessary subfields, because the hidden fields create the blank space.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Created an ACQ framework and hid some of the fields (hidden = 5). Before the
patch there were gaps between the fields as shown in the screenshot from
Katrin. After the patch fields line up nicely, with no extra space between
them.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 224140a2b60aa7bbf4aeb352e1c31f80974a05db)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit cca7dd8dc42c3d0749bc25bca0b9cda03cba3952
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Oct 13 23:47:16 2011 +0200
Bug 7027: [SIGNED-OFF] Corrections to German web installer txt files
Rephrasing, correcting typos, removing blank lines
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Does not break the web-installer and I'm assuming
Katrin is doing the right thing when it comes to
the German text, so signing off!
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a46cbc03ee60b8894e5f37f830d2deea4629aa05)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ddf212bd2928b8e9528093537193bad7691844a3
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Tue Oct 25 19:38:33 2011 -0400
Updating Version Number to 3.04.05.002
commit bc398d5b97e3c426433f716670f44423a0a87199
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 25 11:33:23 2011 +0200
6094 Fixing ModAuthority problems
Only contains db revision to insert new table need_merge_authorities.
You can apply the revision by running
cgi-bin/koha/installer/install.pl?step=3&op=updatestructure. (Will not change
your version while testing.)
Oct 19, 2011: Rebased after functionality patch signoff.
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f5660195a5f0f74a8277fb44cee57ce4e55836b5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Apr 7 10:14:08 2011 +0200
6094 Fixing ModAuthority problems
Pref MergeAuthoritiesOnUpdate does not exist; should be dontmerge
(AuthoritiesMarc.pm).
Instead of folder modified_authorities, now introducing a table for this
purpose: need_merge_authorities. This eliminates several permissions and
security issues. This change applies to AuthoritiesMarc.pm and
merge_authority.pl.
POD lines added for ModAuthority. Deprecated parameter $merge removed.
Test this patch by applying the db revision first from the second patch.
August 4, 2011: Rebased.
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Thanks Marcel. It works as advertised. Both modes are functionnal
(back):
- Immediate with dontmerge=0: After modifying an authority record, its
linked biblios are immediately modified. This isn't the case in 3.4.5.
- Delayed with dontmerge=1: After modifying an authority record, its
linked biblios are not modified. But an entry is added to
need_merge_authority new table and 'merge_authorities.pl -b' script
updates biblios.
Comment: need_merge_authority, like zebraqueue, should be cleared
from time to time.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 05d35b0ae0af257b51fbd14a9ec010c957157a8f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 258d980197403a6501409a69d8f54fd34481d60a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Mon Oct 3 11:22:30 2011 -0400
Bug 6553: parentheses in authors break tracings
If an author's name includes parentheses or other escape-characters, the tracing links
produced in the OPAC and staff client fail in XSLT mode. This patch wraps the author names
in double-quotes, providing the necessary escapement.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test plan:
- Create a new framework, delete Thesaurus from 700 and other fields
- Create a new record in this framework
- Add 700$a - use parentheses
- Check the search links in OPAC and staff detail pages
> before patch link was broken, after it works
Note: Links are only broken when no authorities are being used.
When using authorities the link uses the auth number instead of the text
for linking, so the parentheses don't matter for search.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 0ae2c3c4ceab85993ee23360d2c0d5409f465df6)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ecb4cd1782384c98d9bbb931ed3b25ed5133940e
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Wed Oct 19 11:46:21 2011 -0400
Bug 6253 followup: explicitly check ref value for ARRAY before casting
in C4::SQLHelper::_Process_Operands, $operand has been modified to be cast as an array ref
if the incoming $operand is not a ref. However, the incoming $operand could be some other
kind of ref (hashref for example), which would case the dereferencing in line 419 to fail and exit.
Adding an explicit test for whether the ref is ARRAY seems to clear up this issue.
To test, run t/db_dependent/Members.t. Before, it fails after test 3. After, it completes all tests.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d80cf35e9ba39112bfdefc3ce6ba8ddae121347c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ecf41dd5adcf40b664414b2e2045efa387213e22
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Oct 20 01:52:52 2011 +1300
Bug 6972 : Followup fixing bad indentation
(cherry picked from commit d50de1f040be4b6498cc054689f524fd7d13321f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 72871afb5305358b3842beb621c9c9c535ee6a7a
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date: Tue Oct 4 14:32:08 2011 -0400
Bug 6972: Hardcoded template paths to en in showmarc
Couldn't help but reformat the indentation a bit.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Card view works correctly in cataloguing search.
Plain view/labelled show correctly in OPAC.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Fixing merge conflict.
(cherry picked from commit 030fe0570f6ae2d0561756ee2168c1d3528af985)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 96a2765047e5b6732d45c89ce0645022bb5ce457
Author: Magnus Enger <magnus at enger.priv.no>
Date: Fri Oct 7 13:38:15 2011 +0200
Bug 6982 - Don't show MARC tag documentation links for NORMARC
Links to UNIMARC documentation were being shown when marcflavour =
NORMARC. This patch hides the doc link functionality for NORMARC
by hiding:
1. The checkbox for turning doc links on/off
2. The hyperlinked questionmarks
This patch does not hide e.g. the JavaScript functions related to
the doc link functionality, in order to make it easy to add
doc links for NORMARC in the future (hopefully).
The doc link functionality was passing a variable called MARC21
(based on the contents of the marcflavour syspref) to the
template and testing the value of this to decide if MARC21 or
UNIMARC doc links were to be shown. I have replaced this variable
with he standard/full marcflavour syspref, in order to make it
possible to test for more then two MARC dialects.
To test:
- Set the marcflavour syspref to MARC21, NORMARC and UNIMARC, one
after the other.
- Check that correct doc links are shown for MARC21 and UNIMARC
on the cataloguing screen, and that no checkbox and no doc links
are displayed for NORMARC.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described - thx for the great test plan!
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c7a2ef33177f176b8c5a5c12da9586de77569af1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7768b9b41d3e7a1eba574bb4d14d4d75bc9f6b66
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Apr 29 19:31:40 2011 +0200
Bug 6285 strange order in CSV upload
uploading the circ overdues result in a csv with columns in a strange order
and not the order of the screen
This patch reorder the column by putting the usefull ones first
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit f6043fbbe49eba279ee0635c43dd5a46a20eeb52)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 56ea10433c236cab65ce09d005cd3b0eecef0874
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Oct 10 13:04:34 2011 +0200
Bug 5616: UTF-8 problem in Card View / Follow up
Decode data only if needed.
Add instruction to use UTF8 in html header.
Force utf8 on output handle.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Umlauts and other diacritics in card view of z39.50 search are now
correctly displayed.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
removed 2 commented lines
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 980d8fbed45b3d43341347e612b777b54fd12d10)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1d6553710f7865dc14e5ca0a1f2a631570cedcf3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Oct 12 14:43:53 2011 +0200
Bug 6996: Encoding problem in opac-showmarc
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
No more encoding problems spotted.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 838df87bec05d2751caff49958e8e418a5fb1e90
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Sep 28 19:09:01 2011 +1300
Bug 6929 - ensure that koha-stop-zebra will try to stop everything
Currently, if it attempts to stop a zebra process that doesn't exist,
the script will abort, which leaves things running. This patch prevents
it from aborting.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.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 aca414977ac3f16cec353c23c59a298ee828d24c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a82959ed04aa15bb8bf1c56ed0f384885ba39f90
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date: Thu Sep 22 09:43:12 2011 -0500
bug_6253: Unified member Search()
Removed SearchMembers() and replaced with more generic Search()
Amended Search() to try cardnumber first
Replaced SearchMembers() calls with Search()
Replaced SELECT with Search() where appropriate
C4::SQLHelper:
- added support for '' key for search filter.
- when passing an array to filter, join with OR (rather than AND)
- added support for key => [val1, val2] in filter
- did not document - there was no input documentation to start with,
and SQLHelper should be replaced with something better anyway
Signed-off-by: Liz Rea <lrea at nekls.org>
(again - testing merge issue)
The functionality of the patch seems to be maintained with Biblibre's changes.
I tested the following:
Extended attribute searching: works
3 part name searching: works
2 part name searching: works
1 part name searching: works
From:
mainpage.pl
members-home.pl
Patron search limited by branch: Works
Patron search limited by patron category: works
Ordering by cardnumber instead of surname: works
The "Check Out" field in the masthead.
Circ Autocomplete is not reliably functional at this time, but the problem appears to predate this patch.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 18b8991cf1832a0ee79a526e6438b51fdb4f3208)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1c0334d0fa24caeddfa1342d6c0d7f770ac3880f
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Thu Jun 23 21:09:30 2011 +1200
Bug 6526 - make the reserves code use the borrowernumber
Previously it used the cardnumber, which caused numerous issues if your
users don't have card numbers.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 218a35776e0e212567c15db4a486969debd67859)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d4b1669a15f29cfdf28626ec29acf19dc2413f47
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Tue Oct 11 15:21:04 2011 -0400
Bug 7007: 490 series statements should appear when not traced
Although the MARC21 standard requires libraries to set the first indicator to
'0' when a 490 field is untraced, many libraries leave it blank. Previously,
this resulted in a blank line with the label "Series:" but no actual series
information. This patch fixes that by showing untraced series headings for
490s whenever the first indicator is not set to '1'
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Checked that series shows correctly when first indicator is 0, 1 or not set.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fb3272febd08e2e570931f1a0eba4c3dbacc89b2)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 191fb637874d22204bab55ba95c0f94d04dcbeb9
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Mon Oct 17 08:03:29 2011 +0200
Bug 7026 Web installer does not switch language
Language installer should switch to template files of language selected in
first step. It used to do that, but the feature seems to be broken now. Web
installer remains English after selecting a different language.
To reproduce:
- make sure your database is empty
- run 'perl translate install <some language>
- access web installer
- select language other then en on the first page
=> templates should change to translated templates
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test plan provided works, correct language and sample files are selected.
In a second test I deleted the staff templates for de-DE and repeated
the steps. de-DE is not offered in the language selection of the web installer
now, but does appear in the opaclanguages list after running the web installer.
(Bug 5660)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1bf7550a82e7fc8b1c608fde3ff236af65b83dfc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 33b4c9859fd4d8853f59f3de704a34da11b087a1
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Sat Sep 17 00:32:54 2011 +0200
Bug 7051 de-nesting C4::Reserve, 1st step
C4::Search is not used, so removing it from C4::Reserves
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 7631bae2b2e5f6f2f71ddc4fe841816cd4688047)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2c627d6150b4f56fb7405abeb36bbaf68d623ea4
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Sat Sep 17 00:31:10 2011 +0200
Bug 7037 de-nesting C4/Print.pm
removing use C4::Circulation, that is useless
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 86e9c29f54e16a276889b10c1245ad1588147e35)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0342705cf42f666125d1c9c9cb18a6650819ecb2
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Sat Sep 17 00:30:44 2011 +0200
Bug 7036 de-nesting C4::Circulation
Just removing use C4::Koha, as other packages are widely used.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 56b9412562599d1decabb27e7d4f562ec63c005a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit cfdcc7abc14255d8e273dda0056d50c90af5c05d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Sep 16 19:29:47 2011 +0200
Bug 7035 de-nesting C4::ClassSource & ClassSortRoutine
just removing use C4::Koha, that are useless
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 94b067b53c566c320478eb074e4250ed9c86b51d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 54ce3fde2b73ce110a175a3bcabec52742b3b2d3
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Sep 16 18:09:57 2011 +0200
Bug 7034: de-nesting C4/Branch.pm
use C4::Koha was loaded only to call C4::Koha::get_infos_of in get_branchinfos_of
the sub get_branchinfos_of was used nowhere
(checked with "grep -R get_branchinfos_of *")
only one reference was made to get_branchinfos_of, in reserve/request.pl, but the sub was not used in fact (maybe removed previously & silently)
This patch removes sub get_branchinfos_of and use C4::Koha in C4::Branch, as well as the reference in request.pl and the t test
The patch doesn't remove use C4::Branch in reserve/request.pl, as it's still used for other subroutines.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 69732f5c62337a97269d8b0b09343805a970c6fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f105fddc196ec64726d6256974fe1a2b5001e3d1
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Thu Oct 13 10:11:46 2011 -0400
Bug 6949: cannot remove owner from fund
The Javascript to remove an owner from a budget cleared the name from the screen, but did not remove
the actual value in the form, so when saving, the original owner was retained.
This patch adds the command to set the value to ''.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I could reproduce the bug on current master. Patch fixes the problem, fund
owners can now be added and removed without any problems.
Thx for providing a test plan!
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 9c84f38b3496f32037a97b441aab21e8c2647250)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c8455a012e07a61051eeb3a9c42301f881d2505b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Oct 19 02:57:18 2011 +1300
Updating perl version required to match reality
(cherry picked from commit 5faaa7f13a17d29197b1bced3bd86731d61ee0d7)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0bfcc803adaadcb560eada0374a9d7cb2180a7a6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Oct 17 11:51:16 2011 -0400
Fix for Bug 7043 - masthead_search id used twice in template
Changing ID of library selector, and moving inline styles to
the CSS as requested by kf in the bug comments.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 72f826963c20dfdc6c5934693089e3d3e83ec1ec)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7ee4dc6e8ca427728844e422c013ac4dcccec9f8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 6 15:13:30 2011 -0400
Fix for Bug 6983 - Item type filter on overdues report does not respect item-level_itypes
This patch adds a check for the item-level_itypes preference
when building the SQL for the overdues report.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 15e846d74aa30d3bfa5222d009171313594590d7)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 35 ++--
C4/Branch.pm | 29 ---
C4/Circulation.pm | 13 +-
C4/ClassSortRoutine.pm | 1 -
C4/ClassSource.pm | 1 -
C4/Installer/PerlDependencies.pm | 5 -
C4/Members.pm | 256 ++++++++-----------
C4/Members/Attributes.pm | 13 +-
C4/Print.pm | 1 -
C4/Reserves.pm | 3 +-
C4/SQLHelper.pm | 77 +++++--
INSTALL | 2 +-
Makefile.PL | 2 +-
admin/aqbudget_owner_search.pl | 2 +-
catalogue/showmarc.pl | 51 ++--
cataloguing/addbiblio.pl | 8 +-
circ/circulation.pl | 2 +-
circ/overdue.pl | 11 +-
circ/ysearch.pl | 29 +--
debian/scripts/koha-stop-zebra | 2 +-
install_misc/debian.packages | 28 +++
installer/InstallAuth.pm | 8 +-
.../de-DE/mandatory/message_transport_types.txt | 3 +-
.../data/mysql/de-DE/mandatory/subtag_registry.txt | 7 +-
installer/data/mysql/de-DE/mandatory/userflags.txt | 2 +-
.../marc21/mandatory/authorities_normal_marc21.txt | 9 +-
.../optional/marc21_default_matching_rules.txt | 4 +-
.../marc21/optional/marc21_fastadd_framework.txt | 2 +-
.../optional/marc21_simple_bib_frameworks.txt | 3 +-
installer/data/mysql/de-DE/optional/auth_val.txt | 2 +-
.../mysql/de-DE/optional/patron_categories.txt | 12 +-
.../mysql/de-DE/optional/sample_creator_data.txt | 2 +-
.../data/mysql/de-DE/optional/sample_news.txt | 2 +-
.../mysql/de-DE/optional/sample_z3950_servers.txt | 1 +
installer/data/mysql/kohastructure.sql | 11 +
installer/data/mysql/updatedatabase.pl | 7 +
.../prog/en/modules/acqui/orderreceive.tt | 4 +-
.../prog/en/modules/admin/aqbudgets.tt | 1 +
.../prog/en/modules/cataloguing/addbiblio.tt | 13 +-
.../prog/en/modules/reserve/request.tt | 16 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 4 +-
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 6 +
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 4 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 8 +-
kohaversion.pl | 2 +-
members/guarantor_search.pl | 11 +-
members/member.pl | 19 +-
misc/cronjobs/cleanup_database.pl | 25 ++-
misc/migration_tools/merge_authority.pl | 18 +-
opac/opac-showmarc.pl | 16 +-
opac/sco/sco-main.pl | 4 +-
patroncards/members-search.pl | 14 +-
reserve/placerequest.pl | 22 +-
reserve/request.pl | 93 ++++----
t/db_dependent/Koha.t | 14 +-
t/db_dependent/Members.t | 181 ++++++++++----
t/db_dependent/lib/KohaTest/Branch.pm | 1 -
t/db_dependent/lib/KohaTest/Members.pm | 2 +-
tools/import_borrowers.pl | 4 +
59 files changed, 615 insertions(+), 513 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list