do some validation of the KohaOpacRecentSearches cookie
Add validation of the value of the KohaOpacRecentSearches. In
particular, this patch avoids the generation of an internal server
error when the OPAC is presented with an old cookie that uses the
old Storable-based serialization.
This patch also moves parsing of the cookie value into a
new routine in C4::Auth, ParseSearchHistoryCookie, and adds
a test case.
To test (in conjunction with the previous patch):
Exercise the OPAC search history functionality, after
turning on the EnableOpacSearchHistory syspref:
- As an anonymous user, conduct a variety of searches,
including ones that include non-ASCII characters
- Check the search history and verify that all searches
are listed
- Apply this patch and the previous one.
- Do *not* clear the KohaOpacRecentSearches cookie
- Check the search history and verify that no searches
are listed any more
- As an anonymous user, conduct a variety of searches,
including ones that include non-ASCII characters
- Check the search history and verify that all searches
are listed
- Log into the OPAC
- Verify that current and past searches are listed in
search history.
use JSON rather than Storable for the OPAC search history cookie
To test:
Exercise the OPAC search history functionality, after
turning on the EnableOpacSearchHistory syspref:
- Clear the KohaOpacRecentSearches cookie
- As an anonymous user, conduct a variety of searches,
including ones that include non-ASCII characters
- Check the search history and verified that all searches
are listed
- Log into the OPAC
- Verify that current and past searches are listed in
search history.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Corrects a problem with the wrong date being updated in serials-edit.pl
If multiple issues are in the list, changing the status of any issue in
the table would always change the "Expected on" date of the first issue.
Modified the javascript so the date is modified on the correct row.
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jeremy Crabtree [Fri, 17 Jun 2011 03:02:50 +0000 (15:02 +1200)]
Bug 5094 auth_by_bind authentication can fail even if given a correct password and userid
When using
<replicate>0</replicate> <!-- add new users from LDAP to Koha database -->
<update>0</update> <!-- update existing users in Koha database ->
<auth_by_bind>1</auth_by_bind> <!-- set to 1 to authenticate by
binding instead of password comparison, e.g., to use Active Directory -->
Auth_with_ldap attempts to lookup the userid in the LDAP directory to
fill $userldapentry despite it being unneeded in this case. The information
retrieved will be thrown away, thus there is no need to retrieve it.
This can cause authentication to fail overall even if the initial bind with the
user's credentials succeeded
Signed-off-by: Joe Atzberger <ohiocore@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7bb178e30be74abda82eb4fcaaa873be3dfcc5ef)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
When using auth_by_bind, search was always done as anonymous user.
This is a problem if we want to fetch LDAP values which have ACL
permissions only for users.
This change moves bind from search_method back into checkpw_ldap,
making code cleaner and easier to understand
Galen Charlton [Mon, 24 Jan 2011 21:55:01 +0000 (16:55 -0500)]
bug 5653: use itemcallnumber in bib label layouts
The sample bib label layouts and the hard-coded default
format_string for new layouts used 'callnumber' when they
should have used 'itemcallnumber', preventing call numbers
from being printed on spine labels that use the system-supplied
layouts. Besides correcting the sample data, this patch
now also enshrines 'callnumber' as an alias for 'itemcallnumber'. Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
After applying patch it works for new and old layouts (itemcallnumber and callnumber).
Bug 2246 - (Partial) Label printing doesn't work with Unicode characters
This patch provides a very partial fix for this bug in that it reduces
the number of pdf generation failures due to a "wide character" error.
It does not ensure that all unicode characters will print correctly as
this is dependent upon many other issues mentioned in this bug and
various posts to the developer list.
What this code does is test to see if the pdf stream is utf8 encoded
and if it is, explicitly declares it to be so. Unicode chars will still
print incorrectly, but the pdf will be created and should open properly
in whatever pdf reader.
You may test this by adding any character with a diacritical to the
title of a bib and then attempting to generate a label pdf with the
title of that bib. Before the patch is applied the resulting pdf
should contain an error mentioning a wide character issue. After the
patch is applied, the pdf should be valid.
No documentation changes are necessary as a result of this patch.
This patch should be backported to 3.2.x.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 939d0ab63939ad5cd2d6946bc203208d533089d2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 3013 - Value builder for 006 and 008 need choices for all format types
Modification of the intranet cataloguing plugin for 006/008 fields to allow
select a type of material and change the positions available to enter the data.
Data are hard stored in xml files to allow easy translation and processing through
Javascript and JQuery-AJAX.
Bug 3013 - Fix selection of combo and trailing whitespace
Bug 3013 - Fix selection of combo
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 519cb622dbcd3c6fefa528b877b7ef1d8ff86c6f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The Heading-Main and Any indexes were not defined in the MARC21 authority DOM
rules, but was enabled by the fix for bug 5924. This patch adds the Heading-Main
and Any indexes to the MARC21 DOM authority configuration.
This is a revised patch, with the authority-zebra-indexdefs.xsl automatically
generated from authority-koha-indexdefs.xml. Note that Any is added by
koha-indexdefs-to-zebra.xsl rather than in the authority-koha-indexdefs.xml
file.
NOTE: This patch modifies the following files, which you will need to manually
update if you are using a dev install:
etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl
You will also need to reindex your authorities for the changes in this patch to
take effect.
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 79deeddc2ad6f09fddd7e200830b1a74a03374bc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Sun, 13 Feb 2011 01:55:09 +0000 (20:55 -0500)]
Follow-up fix for Bug 5760 - Add the jquery table sorter to reading record
- Removing option to show 50 items/show all from script and template
- Adding parser to exclude articles in title sort (en only, see Bug 5766)
- Setting default sort to 'date due descending' as it was previously
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2f2d8de286d6b234949df80da37636c4b6a97073)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a8f5bf93f962ae21c2bddf32832a511d9e778e12)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
I added a comment on the file so the user uncomments the appropriate koha-conf.xml sections.
To+
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b4b445818f46e59cf62f968f219963c132832c2b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch adds Ian Walls' name to the history file, so he can be found.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 59e9137d8339de68f2cc4c7dcc60f4e2d7fbea43)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Tue, 17 May 2011 03:36:01 +0000 (15:36 +1200)]
Bug 6350 : Updating history docs
http://bugs.koha-community.org/show_bug.cgi?id=6350 Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37cf503fdf1006e0c0c935e795dfc8cb4af80c9a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Fri, 6 May 2011 11:50:39 +0000 (12:50 +0100)]
Bug 6315: Fix depreciated constructions in C4::Serials
Perl 5.14 will issue warnings in cases where it is assumed that
() will magically appear around qw() as the interpreter
will stop fooling itself that they are there
Added the missing () in the couple of cases they were required
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 968a6af37dd3472b7417bfa694bf6cf3b75e1713)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Add a note so developers know not to edit authority-zebra-indexdefs.xsl directly
but to instead edit authority-koha-indexdefs.xml and use the
koha-indexdefs-to-zebra.xsl stylesheet to generate the former from the latter.
Signed-off-by: Frederic Demians <frederic@tamil.fr> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 190a4234f7e4a869498c6cc67453bbe8a256467c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Wed, 18 May 2011 05:23:21 +0000 (07:23 +0200)]
Improve error message when translation installation fails
For Translator Manager (myself...). A translation installation may fail because
translator hasn't enter properly string parameters (%s). With this patch, the
message ID is displayed not only the parameter.
Bug 5995 : MT2892: Fix security issue in CAS intranet login
Users could log in intranet using their cardnumber, with superlibrarian
rights.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 417c9084b4c5a3637ffc2a29d4f3db929285fead)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6001 : batchRebuildBiblioTables.pl doesn't crash anymore when GetMarcBiblio fails. Unprocessed biblionumbers are displayed at the end of the execution instead.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a9cb5fa1ee0a773164e962ff9616685042a8dff5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Split NLM call numbers using the same rules as those used for Library of
Congress call numbers.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 139f7343f42c32e4bc1981bc072cf6ba05b20c0b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Wed, 20 Apr 2011 02:16:13 +0000 (22:16 -0400)]
Bug 6211: Set default correctly for SubscriptionHistory syspref
Was being set to an invalid value ';'
resulting in weird behaviour where it looked set but was not
in practice
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d9be1d6ba9d5dc7cff65e0037ec8ecbe63c2a333)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Lower dependency on Storable to 2.20 in PerlDependencies.pm
This patch lowers the dependency on the "Storable" Perl package
(also known as module/distribution) from version 2.21 to 2.20
This patch created today (14-Apr-2011) does, in PerlDependencies.pm,
the same as a previous patch dated 30-Mar-2010 from Lars Wirzenius
did, in Makefile.PL :
[Koha-patches] [PATCH] Lower dependency on Storable to 2.20.
http://lists.koha-community.org/pipermail/koha-patches/2010-March/011560.html
The reason for this patch is the same that Lars gave for his:
" The Debian squeeze system has only 2.20, and the 2.21 does not seem
to be required for all tests to pass. Also, checked with
Galen Charlton and Henri-Damien LAURENT (who added the 2.21 dependency)
on IRC that 2.21 did not have anything that was required, compared
to 2.20. "
I believe this patch should be applied to the "master" branch
and should also be "cherry-picked" for the "3.2.x" branch.
Paul Poulain [Thu, 7 Apr 2011 09:42:59 +0000 (11:42 +0200)]
Bug 6104: Modify item looses branch
If the $value is provided by the item, use it, don't use the librarian branch !
Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b0374db5ffe1ef15a331eea3fd24b50fe8396b3b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
If you have the default sorting set to title ascending or title descending,
your search results will not automatically be sorted because the syspref uses
title_asc and title_dsc, whereas Search.pm wants title_az and title_za. The same
issue is present when the default sort is on author.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 499c694daf408571cc8370b4c20568336ba35cde)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Tue, 12 Apr 2011 20:43:41 +0000 (22:43 +0200)]
Bug 6170: Do not prematurely group results
If OPACGroupResults preference was set it was
shortcircuiting the template selection logic and
we didn't go to the advanced options field
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8b309c66242dcc460191360c9523e0bcb8d2a829)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6169: Inventory tool fails when ignoreissued set
Due to incorrect parameters passed to C4::Items::GetItemsForInventory, checking
the "Skip copies on loan" box resulted in the inventory failing to run.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f08f67d3f1fb1b7ca9406fbb395c0c68312d0d49)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 11 Apr 2011 11:36:17 +0000 (11:36 +0000)]
Bug 6155 : Fixing bug with lists not showing
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 88f0c4cb45dde91f1e140294f18aa94112482ae8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 8 Apr 2011 08:04:44 +0000 (10:04 +0200)]
BZ6087: remove duplicate budget link
this feature doesn't exist yet, so the link is useless
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5b16634c0c692a40899d67c7946e68f3fa303910)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 8 Apr 2011 10:16:08 +0000 (12:16 +0200)]
Fix for Bug 5950 - changing frameworks doesn't change anymore
Selecting a framework from the dropdown menu has never (AFAICT)
auto-submitted the form to change the framework. This patch
reformats the form in order to make it clearer that this menu
is part of the search function.
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b29e6e860957393e05888fb01c3dd53cc67b3e6f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 8 Apr 2011 07:25:16 +0000 (09:25 +0200)]
Bug 6118 - Title-host missing in Search.pm
in Search.pm, in the list of available indexes, Title-host is missing
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 074bcc1970f0417d2e39ed59cb99501c32ef21e5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 7 Apr 2011 13:34:07 +0000 (15:34 +0200)]
Fix for Bug 5234 - Remove unused CSS files
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8464104fb299d1b1d707c0a083a04dce7c108953)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6017 : MT3157 : editing an attribute lead to Error500
Editing an extended attribute in the extended attribute tab would lead to an Error500
This patch adds some checks for values before UPDATE in SQLHelper.pm
And Adds some checks also befaore calling ModMember in members/memberentry
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e2fd348f7f53d4a9a69bc26062c466aa6b79c370)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6024 : add "Run report" link on the new report creation success page
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b390c657b83961f999baa2be66fb1766056ac8a4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Fri, 18 Mar 2011 20:21:54 +0000 (21:21 +0100)]
Bug 5895: Translation error in German fast add framework
Fixes description of 952$1.
Signed-off-by: Mark Gavillet <mark.gavillet@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 44fe3559bbe462c3f29c2ef6cdfe73bcc26017bc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Alex Arnaud [Thu, 7 Apr 2011 09:12:40 +0000 (11:12 +0200)]
Bug 6095: Add UTF8 encoding in template
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0b96414ce36e4c6baf7bac89f454ae04067a8d7b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Thu, 7 Apr 2011 10:56:12 +0000 (10:56 +0000)]
Bug 5949: Hide 'Edit record' link when creating new order
The 'Edit record' link only makes sense, when you want to modify
an order after creating it. Before there is no biblionumber the link
can link to. Patch adds check for existing biblionumber so link is
only shown when there is an existing record to be edited.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 760babcf4c7573620cf3e03c0e0899282b6634b1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 4189 : Searching z39.50 without selecting any servers results in error message
This patch makes z3950_search.pl handle the situation properly, and z3950_search.tmpl
show a proper message instead of a program error. All this, in case the javascript
checks that alert the user (that at least one target has to be chosen) are by-passed.
Regards
To+
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small translation problem in javascript alert message. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4747f5adb25dce337fe295e3442e19bcacadeffa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Thu, 7 Apr 2011 11:09:27 +0000 (11:09 +0000)]
Bug 6088: remove Perl warning
caused by use warnings;
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 65c21fa52f9a44920e341f39b23bd877f5c87c84)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
In large libraries, some librarian may have permission only
to recieve shipments This patch fixes some permission :
* booksellers page = accessible to anyone that has at least 1 acq permission
* parcels = accessible to anyone with order_recieve
* supplier detail = accessible to anyone that has at least 1 acq permission,
but modifying accessible only if vendor_manage
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c0ecd7df4fdfa9e2520b1acc498a820f6abebaf1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 7 Apr 2011 13:44:28 +0000 (15:44 +0200)]
Fix for Bug 6109, Hey!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd4bf5485c88314e3d0e9794f520e88dced6d790)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 7 Apr 2011 08:04:23 +0000 (10:04 +0200)]
Bug 4912: Follow-up fix for Bug 4912, redirect user to correct lists
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d269389839415ce4d14f7bc01635978807374631)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jonathan Druart [Thu, 7 Apr 2011 14:14:29 +0000 (16:14 +0200)]
Bug 6099: error in report pagination when GROUP BY
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6de105084e8ed08846545848e0d5cd3e3ba9d178)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Thu, 7 Apr 2011 14:15:54 +0000 (16:15 +0200)]
Bug 5275: enable switching back to default biblio framework
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f0de62e4cc26b21f18005e25d32431c70ef78b61)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Includes Heading-Main in authorities bib1 attribute set.
Also includes Any in authorities bib1 (was still missing).
Also removes temporary fix in AuthoritiesMarc.pm.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Rebased after pushed fix for #5924. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6e58529bdd78f0593c9ad8b767715ff2d32e8ba8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Thu, 7 Apr 2011 15:30:17 +0000 (17:30 +0200)]
Bug 6096 Correctly return arrayref from GetAllShelves
Follow on from bug 5529 GetAllShelves was also vaguely stuffing
an arrayref into an array
Some signs of cut and paste (unnecessary @params variable)
Calling code now does not have to shuffle the return about
to get the reference. Also removed a debug warn
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c0655aabe47cfe21e7846b7a8956db92c1e5b5d2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Thu, 7 Apr 2011 14:25:27 +0000 (16:25 +0200)]
Bug 5529 Absence or Presence of lists not being reliably returned
C4::VirtualShelves::GetRecentShelves contained some rather confused
code The contents of the requested list are returned in an arrayref
which was in its turn being wrapped needlessly in an array
As a result the returned array always consisted of a single element
irrespective of the number of lists.
Made the routine return the arrayref, which can now be tested directly
Unfortunately rather than fixing this we had previously coded around it
assuming it to be a "design" decision. Have amended other calls of
the subroutine resulting in some hopefully less obscure code
Fixed logic error in the results template which displayed new list
within a test for the presence of lists
Removed the offset parameter from the sql in the routine as it was hardcoded
to 0 i.e. the default value
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0cf2eccfe926f77753a2b948e2babf077e2975d3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Alex Arnaud [Thu, 7 Apr 2011 09:59:22 +0000 (11:59 +0200)]
Bug #6082 - On aqbudgets.pl bug on the Statistic's combobox
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 22dc04e24c9af810672ee8f6e313316f3bcc9a59)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Thu, 7 Apr 2011 15:15:53 +0000 (17:15 +0200)]
Bug 6106: add item not respecting framework in acq The PrepareItemrecordDisplay sub builds an item framework for later use in ACQ Some cases were missing : item subfield connected to a plugin, hidden subfield, long size subfield.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e5ff05857e5b99ab19210bc272086f253ea9404b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Alex Arnaud [Thu, 7 Apr 2011 12:59:53 +0000 (14:59 +0200)]
Bug #6110 - fix Callnumber index mistake
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2950fc5596542ff181f05f766f32855089f96528)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
bug 4903: enable OAI-DC output when install done in standard mode
Based on patch by Tomás Cohen Arazi <tomascohen@gmail.com>,
revised to work regardless of the installation mode.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 46041a8fdc51c9c1173cd8cc343e6ac1f7bd46f6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Tue, 5 Apr 2011 12:43:23 +0000 (14:43 +0200)]
Bug 6062: ordering basketgroups
When you have many basketgroups, you get the oldest one on top. Usually, you
have something to do on recent ones, so it's better to have basket groups
ordered DESC
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 311e81810ab894b2b7f2dc186cbf3a8c6a337a1f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aaa6ecf2b6bad86b51ec21299407c92840d2417c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Tue, 5 Apr 2011 09:04:42 +0000 (11:04 +0200)]
Bug 5915 : C4::AuthoritiesMarc AddAuthority
Fixing 100$a simple error: Sometimes, language is encoded fre50 and not
frey50.
This patch adds check for that problem
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c9def9328613401f751f038653273b35b3e9d84e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
5936: Remove some obsolete db columns from aqbooksellers and aqbudgets if needed
Removes obsolete columns from aqbooksellers and aqbudgets if needed.
aqbooksellers: deliverydays followupdays followupscancel invoicedisc nocalc
specialty
aqbudgets: budget_description
These columns should not exist in a fresh install from kohastructure.sql, but
originate from older 3.0 versions.
One line in acqui/updatesupplier.pl referring to one of these columns is
removed too.
This patch therefore does not change functionality, but only keeps your db in
shape.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Rebased April 6. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>