Commit Graph

3632 Commits

Author SHA1 Message Date
Julian Maurice e13db856d4 Bug 6838: Add pagination and filtering on subscriptions table
Use dataTables plugin

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2916ddae4a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:21 -05:00
Maxime Pelletier 4b643488f7 Bug 6634 manager_id and itemnumber not populated when paying fines
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 89893e8d43)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:20 -05:00
Jared Camins-Esakov 2bb717247a Bug 7345: Enable exporting records sans private fields
Add an option for marcstd to the opac-export.pl and catalogue/export.pl
scripts. This new format removes all 9XX, X9X, XX9 fields and subfield $9
(with the exception of 490 in flavours of MARC other than UNIMARC). The work is
done in C4::Record::marc2marc.

This patch adds the new export option 'marcstd' for exporting MARC
records without 9xx, x9x and xx9 fields and subfields to the staff
detail page.

Testing plan:
1. Export a record in "MARC (Unicode/UTF-8)" format as a control
2. In the OPAC, run the following jQuery to add the marcstd option to the UI:
> $("#export #format").append("<option value='marcstd'>MARC (no 9xx)</option>");
3. Export the same record in "MARC (no 9xx)" format
4. Compare the two, noticing that any subfield $9 or fields including 9 (other
   than 490 in flavours of MARC other than UNIMARC) have been removed

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised now.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This patch squashes both the original patch and Katrin's follow-up adding
marcstd as an export option on the staff client.

Feb 13, 2012 (marcel): Amended this patch to resolved two definitions of $error in catalogue/export script.
(cherry picked from commit 6378436089)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:19 -05:00
Paul Poulain 99583fe461 Bug 7511 [ENH] Template caching (T::T feature)
Just add to your Koha configuration file
<template_cache_dir>/path/writable/by/apache/user</template_cache_dir>
in the <config> block, and Koha will use template caching, for about
10% CPU time saving.

on linux servers, /tmp is usually OK

(also fixes an indenting with a TAB)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The results of using this are very striking. Based on an insufficient
sample size, it would seem that the time spent in T::T is reduced by a
factor of at least 5.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1161079e1f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:19 -05:00
Kyle M Hall 4ca8de0dd2 Bug 6490 - Lost and paid not updated when book is checked out.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>

Tested:

item checked out and marked lost - item is removed from borrower's checkouts and charged to patron
Checking out the item (without checking it in first) removed the fines and issued the item normally.

Passed prove t xt t/db_dependent (results congruent with current master failures)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 58c62f69c1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:15 -05:00
Chris Cormack 36cf50e27d Bug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
The scripts run with the caveat that you must specify the path to SIPconfig.xml. The followup previously attached should take care of that issue.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 43b3fb9701)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:13 -05:00
Liz Rea d76424a17c Bug 7238 Followup - fix sip_run to require path to SIPconfig.xml
This requires Chris C's patch to move the scripts to the new location outside of C4.

To test:
run sip_run.sh with no arguments - it should fail with a message to add the path and try again.

Run sip_run.sh with a path to a valid SIPconfig.xml - it should start and run.
(cherry picked from commit 866bb561dc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:12 -05:00
MJ Ray b7bc2fce01 Bug 7476 Remove executable bit from files that probably should not be executed
Signed-off-by: Aleksa Vujicic <aleksa@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended to replace some copy-and-paste comments only with consent of MJR.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d4b132136c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:11 -05:00
Paul Poulain 88536c2ac0 Bug 6210 follow-up, removing warn
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c27
and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c28
(cherry picked from commit 1637af349e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:06 -05:00
Paul Poulain 29beeced80 Bug 6488 adding a 2nd \n to silence logs
YAML don't like when you try to open a YAML file with just a \n. This patch add a 2nd \n to silence logs.
(cherry picked from commit 1f66e9fa69)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:06 -05:00
Srdjan Jankovic ba526960f7 bug_7190: Do not reverse writeoffs when item is returned
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6b092f0e27)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:06 -05:00
Henri-Damien LAURENT c2b6b82336 Bug 6842 FU : library transfer limits edits not stored
Followup :
Changes the DeleteBranchTransferLimits signature :
one now needs to delete only the limits for ONE branch
(cherry picked from commit 54e6b44da9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:03 -05:00
Paul Poulain aa2d2fd7cc Bug 6539 follow-up, fixing wrong indentation
(cherry picked from commit 64da5af31d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 21:00:00 -05:00
Peter Lorimer aaf019a020 Bug 6539 - When searching the catalogue, if I get no results then hit the Z39.50 search the title field in the pop up window is populated with what I searched for.
If I search for a valid ISBN number and hit the Z39.50 search, the title field
is populated with the ISBN number I searched for. This number should populate
the ISBN field and not the title field.

http://bugs.koha-community.org/show_bug.cgi?id=6539
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

To test:
- Search new ISBN using ISBN search from advanced search page
- 0 results - click on Z39.50 search
- Z30.50 form will have your ISBN in ISBN search option

I am signing off on this, because it's an improvement over the current
behaviour.

I see some  problems though that should perhaps be addressed in a separate
bug or as a follow-up:

If you use th catalog search field and search for an ISBN or
a keyword the right fields of the Z39.50 search form will be populated, but
the search index will be put in front:

ISBN: kw,wrdl: 9783492251495
or
Title: kw,wrdl: koha testing

If you search for ISBN as keyword on the advanced search page, it will
still populate the Title search.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22aed769a6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 20:59:59 -05:00
Srdjan Jankovic 9f99173ac4 bug_6210: Select framework if merging two records with different frameworks
ModBiblio() - set framework to "" if "Default"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

All 4 tests passed:

Test 1:  Merge two records with the same framework
    Desired result:  shouldn't get any prompting to pick a framework, and the
same framework should be used

    Test 2:  2 records, different frameworks, into the kept record's framework
    Desired result:  merge with kept records framework used

    Test 3:  2 records, different frameworks, into the discarded record's
framework
    Desired result:  merge with used records framework used

    Test 4:  2 records, different frameworks, into a third framework
    Desired result:  merge with third framework used
(cherry picked from commit 91d870f67a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 20:59:59 -05:00
Srdjan Jankovic 58edcf7ab7 bug_6488: Take in account opachiddenitems when searching in opac
Changed searchResults() interface
Added trailing \n when parsing OpacHiddenItems to make YAML happy
XSLTParse4Display() and buildKohaItemsNamespace() take hidden
items as input param
Removed numbering from the search results, looks wrong with
hidden items

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 706712dd1e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 20:59:58 -05:00
Paul Poulain 03e1c36dce Bug 6836 follow-up fixing POD
this should please jenkins
(cherry picked from commit 19e3607c49)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:54:00 -05:00
Marcel de Rooy 4235bb17e8 7367 Removing reintroduced debugging statement from Auth.pm
Commit 07d1eae7cc removed this statement from the module, but some months later commit 7b12e07d3b reintroduced it again while reindenting code ;)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 9c0ce2bf3b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:54:00 -05:00
Julian Maurice 5f36947783 Bug 6836: Add jQuery dataTables plugin
This patch add the javascript library, a CSS (and image files from
datatables.net) and another javascript file which provides some extra
features.
It also add a Perl module C4::Utils::Datatables which provides helpful
functions for server-side processing

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 8298250c49)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:51:18 -05:00
Chris Cormack 1bba820ca7 Bug 6836: Adding dependency on Modern::Perl
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c1ee7a750f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:48:26 -05:00
Colin Campbell 5bed69ff23 Bug 6790: Remove unnecessary variable from getroutinglist return
getroutinglist returns a count variable to indicate how many elements
are in the array. This is almost always a serious code smell. (We are
programming in a list manipulating language) The routine was executing
am unnecessary loop just to maintain that var.
Removed the variable from the routine and perldoc
refactored calls of the routine removed the c-style loops for
more idiomatic and maintainable for loops
renamed some opaquely named variables
removed a call to the routine where nothing was done with the data
moved some html out of the calling script and into the template

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d2c24f3bbf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:42:35 -05:00
Chris Cormack 5427909359 Bug 7402 : Fixing the date formatting so links to the invoice page work
This depends on bug 929

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Uses the new TT plugin to display the date, while using iso format
to build a correct URL to the invoice page.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b32d2d2165)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:42:35 -05:00
Paul Poulain 5e32902941 Bug 5473 follow-up : removed warn & replace some tabs by 4 spaces
(cherry picked from commit f961638465)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:42:35 -05:00
Srdjan Jankovic deba3f0032 bug_5473: Update items when receiving shipments
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Tested by recieving multiple items with the AcqCreateItem
preference set to 'placing and order' and 'receiving an item'
In both cases the pricing and vendor is brought over to the
item record so I'm signing off.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 92ca5a13e5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:42:34 -05:00
Julian Maurice c4ed20603b Bug 6694: Problem with casAuthentication syspref
A missing test in checkauth caused anonymous session to be destroyed and
re-created at every call when this syspref was set.
Almost the same issue is also fixed in check_api_auth, which caused
C4::Service->init to fail.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8ffbf4e88c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 15:36:55 -05:00
Paul Poulain 01829af25e BZ4376 Minor change in GetMarcAuthor
A minor change in the GetMarcAuthors function of C4/Biblio.pm allow differentiate the type of authors in the templates

This change allow doing things like this in the templates:
<TMPL_IF EXPR="tag == 700" && code eq 'a' >
 <strong>Author:</strong>
<!-- TMPL_ELSE -->
 <TMPL_IF EXPR="tag == 710" && code eq 'a' >
  <strong>Corpotation Author:</strong>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

(html template syntax, but also applicable to template toolkit)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works as claimed and doesn't break existing functionality.
(cherry picked from commit b70e4f3d6d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-02 20:34:41 -05:00
Owen Leonard 88ee85b33a Fix for Bug 7083 - [SIGNED-OFF] Show creator name on list of public lists
Show the name of the patron who created each list on the list
of public lists. Also:

- correcting unescaped ampersand in the template
- making conditional a check on a variable that doesn't always
  exist, causing noisy errors in the log

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
After applying the patch a column for "Created by" is added to the display of
public lists, and the errors in the log are silenced. On the "Your lists"
tab, the link on the list name now has an escaped ampersand.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2951d83e9d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-02 20:34:41 -05:00
Chris Cormack e62a1ab956 Bug 7276 : Follow up, adding a sub to clear the cache
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 94516e7f2a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:11:05 -05:00
Henri-Damien LAURENT 6a86b550cd Bug 7276 : member entry Performance improvement
Before this patch : 9619 borrowers added in 31 Minutes, After : 68 seconds.
This adds Hashref to table structure in C4::SQLHelper to speed up bulk edits.

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6c38cc23d9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:11:05 -05:00
Frédéric Demians 19fb959d6b Bug 6885 Follow up patch, invert tested condition
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Not sure the brackets are nessecary, but I think I remember learning
bitwise operators have a lower priority than other relational
operators so wanted to make sure we notted the result of the bitwise
and, not the flag

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6fd3635a59)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:11:04 -05:00
JAMES Mason c7eda06d91 Bug 6466 - hung socket read causes SIP tests to fail
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b0a4233366)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:11:02 -05:00
Paul Poulain 44f9128266 Bug 6990 follow up PODDOC & unit test updating
This patch removes the TransformKohaToMarcOneField sub, but there was some remaining POD & unit test about it
(cherry picked from commit 6456afea95)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:58 -05:00
Frédéric Demians c540ff1084 TransformKohaToMarc enhancement
TransformKohaToMarc function is called for each biblio and item that has
to be build. This function execute a DB statement for each Koha field
that has to be mapped to a MARC tag/letter. This impact deeply
performances for script like rebuild_zebra, especially since items are
not anymore in bilio records and have to be rebuild on the fly.

I'm proposing a patch which read Koha field to MARC field mapping just
one time and cache it. My test show a 30% execution time improvement on
rebuild_zebra.pl script. It uses already cached mapping in C4::Context.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

http://bugs.koha-community.org/show_bug.cgi?id=6990
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 02d392a502)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:58 -05:00
Julian Maurice 11652d9854 Bug 6132: Update sysprefs cache in set_preference
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit b867d7d12a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:56 -05:00
Chris Cormack 7d4cc170ed Bug 929 : Follow up adding unit tests, discovered C4::Dates cached the syspref with no way to clear it, fixed also.
(cherry picked from commit 55d0b65522)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:55 -05:00
Ian Walls 0177ed1602 Bug 7396: Debarred message not showing over SIP2
Corrects typo in list of flags; was DEBARRED, but the actual name of the flag is
DBARRED (for some reason)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 000047769f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:54 -05:00
Admin User Koha a2f375284c Bug 7360 Import Default framework into other deletes default Framework
Step to reproduce :
- export default framework as SQL
- create new framework
- Import the exported SQL file into this new framework.
Go to default framework :
It disappeared.

If some libraries want to share default frameworks, then it is a major bug.
This patch fixes the test in order to cope with 0 character framework name.

Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a830f46fc7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:53 -05:00
Marc Balmer 2a10211d90 Bug 7356 - Fix various typos and mis-spellings
Fix typos: the the -> the, wether -> whether, developper -> developer.

http://bugs.koha-community.org/show_bug.cgi?id=7356
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c9c6bbdea8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:53 -05:00
Frédéric Demians d00c44bb2e Bug 6098 Followup -- doesn't replace NSB/NSE by space
On any page, NSB/NSE characters are replaced by space in Output.pm. It isn't a
good thing:

  - It isn't necessary since Zebra indexer handle properly those characters as
    delimiter.
  - It isn't necessary for display since XSL file already do that.
  - It isn't efficient since a regex is done on every whole page sent by Koha,
    not only on biblio record part.
  - It removes an information that librarian want to keep in their biblio
    records: any record edited in Koha loose its NSB/NSE characters.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d785d9d57d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:44 -05:00
Duncan Tyler a220304a8d Bug 6627 [Signed Off] - Update to improve security in specified log files - bug 6627
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified sessionlog file is not written to /tmp when patch is applied. Also verified original bug - logging in did in fact log to /tmp.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 00290e8619)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:42 -05:00
Chris Cormack 0942a21db2 Bug 929 : Followup fixing date formatting
This patch introduces a Filter (KohaDates) for use in templates
[% USE KohaDates %]
[% somevariable | $KohaDates %]

This will format the date in the format specified by the systempreference

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 01875b565d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:41 -05:00
Chris Cormack 5481461e07 Bug 7394 : Fixing scoping issue with XSLT processing. Also bailing out early for 404 inestead of doing unnessecary processing
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I can confirm the bug and the solution.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Second sign-off from me, patch fixes display of detail page
for last record on a result page.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fa1a90fd4f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:39 -05:00
Alex Arnaud 93cb222de2 Bug #6142 - Delete sub CanBookBeReserved and delete function's reference on @EXPORT
Original-Author:    Alex Arnaud <alex.arnaud@biblibre.com>, Stéphane Delaune <stephane.delaune@biblibre.com>
Original-Signed-off-by: MJ Ray <mjr@phonecoop.coop>

Correct use statement bug found by Ian Walls

Backporting to 3.6.x

Author: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:53:30 -05:00
Owen Leonard bad8eea9e1 Bug 1623 - Provide view of approved comments
This patch creates two tabs on the comments administration page:
one for approved comments and one for unapproved comments. Each
display is paginated according to the numSearchResults preference.
The list of approved comments has, instead of a link to approve,
a link to unapprove.

The JavaScript table sorter has been removed since it doesn't make
sense to sort individual pages of a multi-page result set.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bc2a1d18e2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:29 -05:00
Frédérick Capovilla df6f4d0c34 Use MARCAuthorityControlField008 in AddAuthority for empty 008s
The old default value for field 008 didn't have the correct length,
which could potentially cause data corruptions.

Uses the MARCAuthorityControlField008 preference added by BUG4839.

http://bugs.koha-community.org/show_bug.cgi?id=7072
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6408547cc0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:28 -05:00
Tomas Cohen Arazi 9a314c90b1 Bug 6193 - Use memcached cache koha-conf.xml configuration variables
Basically I add some code to Context.pm so it stores koha-conf.xml config vars
in memcached server. It is arguable whether this is an improvement or not,
tests are needed to conclude something about this.

Error handling was an issue with Cache::Memcached, I tried to do it the
simplest I could.

Note: As it was pointless to read the xml file to get the memcached
server info for accessing them for retreiving the info in the koha-conf.xml
file... I passed those values through apache's SetEnv. These variables
are set acordingly through the install scripts and commented out if koha
was setup not to use it.

Bug 6193 - Properly comment the code

Required by slef.

Regards
To+

Signed-off-by: Federico Rinaudo <frinaudo@infocpt.com.ar>
Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22dca58cba)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:27 -05:00
Marcel de Rooy d3e191b9c6 6302 follow up
Updates to_address in message queue when sending an email (when needed).

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2ab11c4892)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:43:09 -05:00
Srdjan Jankovic da99978777 bug_2830: Remove reserve when checking out if the borrower is not the first one in the reserve queue
To test:
Create 4 holds on a bib, for patrons A, B, C, and D,

Check in the item to mark hold as waiting for patron A
Check out the item to patron B -> reserve for patron B should be removed
Check in the item to mark hold as waiting for patron A
Check out the item to Patron A, hold should complete normally
Check in the item to mark hold as waiting for patron C
Check out the item to patron D -> reserve for patron D should be removed.
Check in the item to mark hold as waiting for patron C
Check out the item to patron C, hold should complete normally
Check in the item -> there should be no more reserves.

We also tested:
Created 4 holds on a bib with two items, for patrons A, B, C, and D

All worked as expected.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6e07fd7b00)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:43:07 -05:00
Frère Sébastien Marie c183f0a661 Bug 7282 - invalid language selection
- ensure that without cookie, language selection is based on browser
  preferences
- refactor function to obtain langugage for stem in search (opac + intranet)

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

To reproduce the bug:

- Activate en and fr-FR for OPAC
- Clear your browser cookies
- Select your language preference in your browser: fr, fr-fr, en
- Load OPAC main page
- OPAC is displayed in English, rather than French as asked by browser
  preferences

  Apply the patch and test:

  - Clear your browser cookies
  - Load OPAC main page
  - Pages are displayed in French

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0ad7e76cb7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:43:06 -05:00
Duncan Tyler 7d2b4a835f Bug 7331 - Circulation.pl generates errors in the log
Fixed error in C4::Dates causing unneeded warnings

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c2bba3ffc8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:43:03 -05:00