[koha-commits] main Koha release repository branch 3.6.x-maint/testing updated. v3.06.04-297-gd7efb55
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 14 03:05:59 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-maint/testing has been updated
via d7efb559618d5ec23878daee695e3f483cd93a89 (commit)
via 4d2e756feefaad24a8211c459a484bf261054b33 (commit)
via e2a49492d4784107506387d9183bc84463743ecd (commit)
via 394966711d0aed34d3a4c84862f4e7d7d102be93 (commit)
via 971c6e09c9165cf1b90aca18598db852efce209e (commit)
via 09f53d16a5677f9c778b76be6c55102f2d5fba48 (commit)
via 6608c2949df2436fcc36814d9285eb032adbde17 (commit)
via b2dd74a45c751b629b6f110262dc0904e9560852 (commit)
via 56e07e5e9d3446bd9195c5cd3072296f3dfca6c1 (commit)
via d07df17bd5358a8eee4de92f5917fe51e8f8e973 (commit)
via d25ced28fb57c90410e8a2fab183c54a5b20cb2e (commit)
via 64bff70cd953408b02b1320efc52161a9b4af507 (commit)
via 89a3cbff926d343407eb313895d85acec2fe4b10 (commit)
via b376d976614eeed484671117aeca1bbbd1e9b1e5 (commit)
via 01846a1f1db1cf224b5435a0ee9cf9ffa6200c28 (commit)
via 2096ee1a2c98f8c5e99ff0038bfe73494d390990 (commit)
via 01d5e7092633a6f602c96562c943fe75d4826d79 (commit)
via 6cb8841a8568c60d2249362186a012bbf776a047 (commit)
via 90eff90c4fe8011236d1499c76c9c4ff288a34f9 (commit)
via 24e685c1b443fe6975bfa470eebd15b364c0a01c (commit)
via 04c1f1db7e5c2ff6c13d0ab443b570f7141c5a35 (commit)
via 92b0f148493f25eccf89e7736e16cb15cf59fd05 (commit)
via 060b78e68f7c36e64dd7cd7f70b134d36b5dc5af (commit)
via 5bfd002c3f1957746e2b59bc6288d47bfafeab4d (commit)
via 8175b9d46e2d9380194805e69af6bd45c9eeca18 (commit)
via a3f2b42743d8680ad931a51012f84d533181c1dd (commit)
via 3c4eecfb71c3d0c4dac30b9d3ca1d2fe8769ba8c (commit)
via f91750cc1d2c01032b62fc93b28aa8f7b4338bdc (commit)
via 63ed0d1a9c8b6993d7a524d25198f4db43f31741 (commit)
via c50857ab163326297ef468632b078371bd1693a5 (commit)
via 3a5969f1529402891a79ff116c8627be59adf063 (commit)
via 5ea0dc1fecc1706c7f13acdf0729b1f890f919b4 (commit)
via 002594e8f9dfa41f7a7e603d6b81abc351d4c907 (commit)
via 602083057be83e3350c0d981d7facebb82f9c2a0 (commit)
via c8651654464ce2e095a7a95887a49aa64080925d (commit)
via ebec24f9cfbfb5e54a7a0f2c53425d9502fa3de6 (commit)
via 2f13698f3f895e44eca480b47ad248005fa4abfc (commit)
via 746ea848b623eb6405885aa7f94976169d668df1 (commit)
via d2d119b0d96b5cd418545120559430a98832017b (commit)
via 2625b8521cf0494178d78f75d75f2182e73c3163 (commit)
via 90a827841fd6cbec09124acb7266fbd5353e662e (commit)
via bb208e9852f2e1f6549898f860d224356adf0823 (commit)
via 845a48898b361f78cdc533f43b591b9b6243ccf1 (commit)
via 01a20612769d34e581272909d11a243314013e4d (commit)
via 652a8018f0fc91e2badc2ff90ed8afdd10fdbc92 (commit)
via a9433b4b8d034d031471dea906e47aca5f3e945b (commit)
via ec46db8009d0667cdd3566d7a8da3f525aa4e6b5 (commit)
via 3c958ab16fafe553aa21460c123112c3fc4ae1ef (commit)
via 4d35106b44940a75d2b1b3343ca3747d7bbd3537 (commit)
via aab7cafbcb6466b90d484ce14f47178c6de822b2 (commit)
via ebcede353db35f838d95af20a3c033e6dc5e2619 (commit)
via 2eb76ec0477d59edbd0de8f31140aaba3b0dc9a9 (commit)
via d43e8c42d4253b15cf7e4d9fefc1c8bcdd184bcf (commit)
via e1f804a4a71a325688a87329ab9a4298cf8d38d6 (commit)
via 8a2d3c9c6655c05cc153541738a675a5820d033d (commit)
via 975c5c898024d605628575648d19a5e06fc1c332 (commit)
via 634f83acebfdd8d344325d141af8e546d39a5bee (commit)
via a30aeeaa53f42664bc8ba935948aa481f9e50662 (commit)
via 87ca800708198ac54fa755c262ab2af7ac475fc4 (commit)
via 69c3f794a9356e32b16cb5b7936918c678038120 (commit)
via 6b9680b21210ff23c9e0460a34445361ec5c9cb5 (commit)
via 7656f3dc7d431fbf55930309f66b46432d677338 (commit)
via 6b1ca78dd373a192b6c660eba7c5df8944971fb2 (commit)
via 645783c253cc31d308802847a79b8811c4022236 (commit)
via bda0612fcc71c39b9512bcbb10188cfd9ad64a28 (commit)
via 18c047f4e4e84579e88c2b849eb8a05fa51a5658 (commit)
via 8bde392a5660fd07cdaf2d85a4d8e2ecbfcf7763 (commit)
via 13cc8c20a1688d351e15a67e07fed7411b60895e (commit)
via 7715c3e97f83b831cafc23115c8fdb45c1fd7b4f (commit)
via 29c50ccbf00ca8013e62286b3547a039039bd536 (commit)
via b79a3e1b3f2e2d27dc175b9618b1954ab27ea9e8 (commit)
via 64dce5ac621b006361c68b15a386fb3eca27a2aa (commit)
via 97c0183f1e38d63864cda6472762f2b4482e32d0 (commit)
via 282097dec00f52690a896ec8170fa57c83b8da3a (commit)
via f449571a28fa7e9fa65aedc15e896633c5aa7d59 (commit)
via e7b43c6ff9dbf2ee2db89507c06f2f8b716da430 (commit)
via f5b75e4a85e888add73d8c45fdc317e739881da9 (commit)
via f74fa05eced7e74e35932c9e3009c7ce9b5f6255 (commit)
via 89fe898ffeb60c6a903ad2eeccd8b6e7baea7257 (commit)
via 9afc11a9ebb94bd303c8c3205516b5a3b08b6e6e (commit)
via 556eb39c497f1abc98ed62cffb413d55531767d3 (commit)
via 8a2f03dc92536cdd738388d923c622427cdced22 (commit)
via cbadc3ff963757be6db7dc277e681163eaabd51f (commit)
via e80a0c31531336dd87a7613bf710340d8a9f9b06 (commit)
via ecdb741b2b78ad56a0554a7e78e1b4bb7494635c (commit)
via 80e2b59231cae68632818e11b7ea01fc9d86a560 (commit)
via cdd02693ae37264e8f458b1052c27b5a475cfb53 (commit)
via 18ae223635e07ab3b80c3c504343f95cc945772d (commit)
via bf74135b6e67071bb74adf2a1b7052feb43875d9 (commit)
via e975e6ee73e530d49799bb4de65532945d9a05bb (commit)
via 03b7218a95fe28f9b27007457850fecb46061b0b (commit)
via 5a6fba297d8bceed829ea5bcc19feb77a7bc9a21 (commit)
via ffb1f1ec6d23cb7256a21bc617d8697f3e3d6cdf (commit)
via a02f63d8361a82bb04f5cf667a12dfd52f214afe (commit)
via 00b01876f84b5d03fdf3e89655c7ff1f94b80498 (commit)
via 51c8f852e72cc01fa64bad75888bdadaa68784ee (commit)
via 45d64dcb63eb0a40e274cb39a6db6587b5591471 (commit)
via b98b90bd2a90f598a89856605de58bd2e2fcac95 (commit)
via 1f894a5f99bb10c4062de4f36769f124ff8ca2b7 (commit)
via cc7f5145c6d91e9069008dc5ec43408d79499781 (commit)
via 11ebeb419ac4c7d2b335ebc3b61750b9cc6a43c9 (commit)
via 59b1c2ef403c7645b7064bb9c2d558f485dfd70c (commit)
via 4bc63c0aebc62ecf4f8a660baea868697bc4ea81 (commit)
via 22f8009386eafc04c0e3b3b3f3121b4a2c1d1431 (commit)
via 213f5d7710fa6d75962a9718b3fca0cbda8cf04f (commit)
via 572ca29e63d0928980c36241dae37decfa80de19 (commit)
via 4fb87d4e2fa51cf86eed1a7211b9c924f6213d6b (commit)
via 0eb9464aa1e4a3b4616f6ae4d28916d89b6639ea (commit)
via a76c4b1aad345af1e603c067fb51011bc952fa9a (commit)
from ae49f8805a494b7dee2f8e57b64c85cfc044e242 (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 d7efb559618d5ec23878daee695e3f483cd93a89
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>
commit 4d2e756feefaad24a8211c459a484bf261054b33
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>
commit e2a49492d4784107506387d9183bc84463743ecd
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 394966711d0aed34d3a4c84862f4e7d7d102be93
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 971c6e09c9165cf1b90aca18598db852efce209e
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 09f53d16a5677f9c778b76be6c55102f2d5fba48
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 6608c2949df2436fcc36814d9285eb032adbde17
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 b2dd74a45c751b629b6f110262dc0904e9560852
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 14 10:02:38 2012 -0400
Bug 8596 - Reports interface date picker doesn't force ISO formatted dates
Datepickers follow Koha's preference for date format, but the
guided reports system doesn't intelligently handle different date
formats. ISO is required. This patch adds some additional
configuration to override the date format.
To test, create a guided or SQL report which takes a date
parameter. The datepicker fields should return an ISO-formatted
date.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Works as advertised.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 3b82db781f8f779be0c29dc5b4d526a83cb2d0bf)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 56e07e5e9d3446bd9195c5cd3072296f3dfca6c1
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Wed Aug 15 15:48:05 2012 -0400
Bug 8648: searchResults uses SQL query rather than GetMarcFromKohaField
Around line 1470-something:
my $sth =
$dbh->prepare(
"SELECT tagfield FROM marc_subfield_structure WHERE kohafield LIKE
'items.itemnumber'"
);
$sth->execute;
This patch replaces that with a call to GetMarcFromKohaField.
To test:
1) Apply patch.
2) Do a search that returns both available and unavailable items.
You'll know if the patch isn't working.
Signed-off-by: Julian Maurice <julian.maurice 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 b6724f8544cfb7c3952cc8c981dafc88693c4cf3)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit d07df17bd5358a8eee4de92f5917fe51e8f8e973
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 20 10:59:26 2012 -0400
Bug 8657 - Default sort by call number does not work
If you choose to sort search results in the OPAC or staff
client by call number by default, the wrong value will
be saved by the system preferences editor. It should be
"call_number" instead of "callnumber." This patch
corrects the pref file and updates the database in cases
where defaultSortField or OPACdefaultSortField are
set to the incorrect value for call number sort.
To test: Set defaultSortField and/or OPACdefaultSortField
to "call number" and perform a search. Results will be
sorted by relevance. Apply the patch, update the database,
and search again. Results should now be sorted by call number.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
with the caveat that this will not fix the issue unless the sort order is first set to descending and back to ascending per bug 8012.
However, with the sort order set to a proper sort value, this patch does fix the issue.
Conflicts:
installer/data/mysql/updatedatabase.pl
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d7d39aaebe324599e11093a78acfde84cebee744)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit d25ced28fb57c90410e8a2fab183c54a5b20cb2e
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Jul 27 11:27:40 2012 +0200
Bug 8357: UNIMARCslim2OPACDetail.xsl, title without class and too links to views
Signed-off-by: Zeno Tajoli <tajoli at cilea.it>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit df9c3947097ec7c356be364d4cf38702ae4536d8)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 64bff70cd953408b02b1320efc52161a9b4af507
Author: Marc Veron <veron at veron.ch>
Date: Fri Aug 10 06:20:55 2012 +0200
Bug 8573 - Translation difficult in picture-upload.tt due to nested sentence in if/foreach/if/elsif - construction
Text could not be correctly translated due to poor parsing of nested sentences in Pootle.
*Sentences de-nested to have whole sentence in each if /elsif branch
*Cleaned up <li></li> handling: moved closing </li> outside the for each loop to prevent orphaned closing </li>s.
*Changed indentation for better readibility
*Changed WARNING to ERROR because it is an *Error* during upload.
*Wording simplified (for translation).
*In one case added hint to refer to online help (size).
This way text should be easier to be translated in Pootle.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c77e60ed79ee89eae989d4c147c68f1294db6bdb)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 89a3cbff926d343407eb313895d85acec2fe4b10
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 b376d976614eeed484671117aeca1bbbd1e9b1e5
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 01846a1f1db1cf224b5435a0ee9cf9ffa6200c28
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 2096ee1a2c98f8c5e99ff0038bfe73494d390990
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 01d5e7092633a6f602c96562c943fe75d4826d79
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 6cb8841a8568c60d2249362186a012bbf776a047
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 90eff90c4fe8011236d1499c76c9c4ff288a34f9
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 24e685c1b443fe6975bfa470eebd15b364c0a01c
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/Accounts.pm | 24 +-
C4/Acquisition.pm | 2 +-
C4/AuthoritiesMarc.pm | 4 +-
C4/Creators.pm | 4 +-
C4/Creators/PDF.pm | 15 +-
C4/Creators/Profile.pm | 2 +-
C4/Creators/Template.pm | 4 +-
C4/ILSDI/Services.pm | 8 +-
C4/ImportBatch.pm | 22 +-
C4/Installer.pm | 2 +-
C4/Installer/PerlDependencies.pm | 19 +-
C4/Labels.pm | 10 +-
C4/Members.pm | 10 +-
C4/Patroncards.pm | 12 +-
C4/Patroncards/Patroncard.pm | 6 +-
C4/Reports/Guided.pm | 43 +-
C4/Ris.pm | 36 +-
C4/SIP/ILS/Item.pm | 25 +-
C4/SIP/ILS/Patron.pm | 9 +-
C4/SIP/ILS/Transaction/Checkout.pm | 3 +-
C4/SIP/ILS/Transaction/Hold.pm | 3 +-
C4/SIP/ILS/Transaction/Renew.pm | 5 +-
C4/SIP/ILS/Transaction/RenewAll.pm | 3 +-
C4/SIP/SIPServer.pm | 2 +-
C4/SIP/Sip/Checksum.pm | 6 -
C4/SIP/Sip/Configuration.pm | 9 -
C4/SIP/Sip/MsgType.pm | 10 +-
C4/SIP/t/SIPtest.pm | 20 +-
C4/Search.pm | 9 +-
C4/Serials.pm | 2 +-
C4/VirtualShelves/Page.pm | 2 +-
about.pl | 10 +
acqui/basketgroup.pl | 2 +-
acqui/pdfformat/layout2pages.pm | 2 +-
acqui/pdfformat/layout3pages.pm | 2 +-
admin/smart-rules.pl | 4 +-
authorities/detail.pl | 3 +-
cataloguing/addbooks.pl | 2 +-
cataloguing/additem.pl | 17 +-
circ/returns.pl | 5 +-
debian/control | 1 +
debian/list-deps | 14 +-
debian/scripts/koha-create | 7 +-
debian/scripts/koha-remove | 10 +-
docs/history.txt | 58 +-
etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +-
install_misc/ubuntu-pkg-check.sh | 24 +-
.../{ubuntu.packages => ubuntu.10.04.packages} | 0
...ntu_maverick.packages => ubuntu.10.10.packages} | 0
install_misc/ubuntu.12.04.packages | 142 +++
install_misc/ubuntu.packages | 16 +-
installer/data/mysql/sysprefs.sql | 12 +-
installer/data/mysql/update22to30.pl | 2 +-
installer/data/mysql/updatedatabase.pl | 16 +
.../intranet-tmpl/prog/en/css/staff-global.css | 5 +
.../prog/en/includes/acquisitions-search.inc | 4 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 39 +-
.../prog/en/modules/admin/categorie.tt | 22 +-
.../prog/en/modules/admin/currency.tt | 2 +-
.../en/modules/admin/preferences/acquisitions.pref | 70 +-
.../en/modules/admin/preferences/circulation.pref | 4 +-
.../en/modules/admin/preferences/searching.pref | 6 +-
.../modules/authorities/searchresultlist-auth.tt | 8 +-
.../prog/en/modules/catalogue/results.tt | 5 +
.../prog/en/modules/cataloguing/linkitem.tt | 2 +-
.../prog/en/modules/cataloguing/moveitem.tt | 2 +-
.../cataloguing/value_builder/unimarc_field_100.tt | 6 +
.../prog/en/modules/cataloguing/z3950_search.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 2 +-
.../en/modules/reports/guided_reports_start.tt | 3 +
.../prog/en/modules/serials/subscription-detail.tt | 2 +-
.../prog/en/modules/tools/manage-marc-import.tt | 2 +-
.../prog/en/modules/tools/picture-upload.tt | 33 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 976 ++++++++++++++++++++
.../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 1 -
.../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/NORMARCslim2intranetResults.xsl | 769 +++++++++++++++
.../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 69 ++
.../prog/en/xslt/UNIMARCslimUtils.xsl | 5 +-
.../prog/img/famfamfam/PR.png} | Bin 385 -> 385 bytes
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 6 +-
.../opac-tmpl/prog/en/includes/opac-bottom.inc | 13 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +-
.../prog/en/modules/opac-results-grouped.tt | 5 +
.../opac-tmpl/prog/en/modules/opac-results.tt | 5 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 6 +-
.../opac-tmpl/prog/en/modules/opac-sendbasket.tt | 110 ++-
.../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-topissues.tt | 4 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 3 +-
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 13 +-
.../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 1 -
.../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 2 +-
.../prog/en/xslt/NORMARCslim2OPACResults.xsl | 2 +-
.../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 26 +-
.../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 2 +-
kohaversion.pl | 2 +-
labels/label-create-csv.pl | 4 +-
labels/label-create-pdf.pl | 5 +-
labels/label-create-xml.pl | 4 +-
labels/label-edit-batch.pl | 4 +-
labels/label-edit-layout.pl | 4 +-
labels/label-edit-profile.pl | 4 +-
labels/label-edit-template.pl | 4 +-
labels/label-manage.pl | 4 +-
labels/label-print.pl | 4 +-
members/moremember.pl | 2 +-
misc/batchImportMARCWithBiblionumbers.pl | 2 +-
misc/cronjobs/check-url.pl | 2 +-
misc/migration_tools/build6xx.pl | 246 -----
misc/migration_tools/rebuild_zebra.pl | 4 +-
misc/translator/text-extract2.pl | 8 +-
opac/opac-detail.pl | 3 +-
opac/opac-search.pl | 6 +-
opac/opac-sendbasket.pl | 21 +-
opac/opac-showmarc.pl | 2 +-
opac/opac-showreviews.pl | 6 +-
opac/opac-tags.pl | 4 +-
opac/opac-topissues.pl | 9 +-
opac/sco/sco-main.pl | 5 +-
opac/unapi | 2 +-
patroncards/card-print.pl | 4 +-
patroncards/create-pdf.pl | 4 +-
patroncards/edit-batch.pl | 4 +-
patroncards/edit-layout.pl | 4 +-
patroncards/edit-profile.pl | 4 +-
patroncards/edit-template.pl | 4 +-
patroncards/image-manage.pl | 4 +-
patroncards/manage.pl | 6 +-
patroncards/print.pl | 4 +-
reserve/renewscript.pl | 22 +
reserve/request.pl | 2 +-
t/00-testcritic.t | 2 +-
t/Creators.t | 12 +-
t/Items.t | 14 -
t/db_dependent/00-strict.t | 24 +
t/db_dependent/Items.t | 54 ++
t/db_dependent/Reports/Guided.t | 92 ++
tags/review.pl | 4 +-
tools/manage-marc-import.pl | 2 +-
xt/author/test_template.pl | 58 --
xt/tt_valid.t | 7 +-
xt/yaml_valid.pl | 67 ++
xt/yaml_valid.t | 56 ++
148 files changed, 2984 insertions(+), 764 deletions(-)
copy install_misc/{ubuntu.packages => ubuntu.10.04.packages} (100%)
rename install_misc/{ubuntu_maverick.packages => ubuntu.10.10.packages} (100%)
create mode 100644 install_misc/ubuntu.12.04.packages
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
copy koha-tmpl/{opac-tmpl/prog/famfamfam/silk/music.png => intranet-tmpl/prog/img/famfamfam/PR.png} (100%)
delete mode 100755 misc/migration_tools/build6xx.pl
delete mode 100755 t/Items.t
create mode 100644 t/db_dependent/00-strict.t
create mode 100755 t/db_dependent/Items.t
create mode 100644 t/db_dependent/Reports/Guided.t
delete mode 100755 xt/author/test_template.pl
create mode 100755 xt/yaml_valid.pl
create mode 100755 xt/yaml_valid.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list