Commit graph

13535 commits

Author SHA1 Message Date
Jared Camins-Esakov
de4619b849 Bug 5816: XSLT doesn't display enhanced contents
This patch corrects and standardizes the display of enhanced contents (MARC 505
with ind2='0').

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:32:41 +13:00
6b0a84c26d Bug 5863: Add to Your Cart disappeared if login disabled on opac detail
Resolving an error in ready function by additional conditionals.
Moving a line from ready to html just as in other view templates, correcting the order of menu options at the same time.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:28:05 +13:00
Chris Cormack
6f4e7fc971 Merge remote branch 'kc/new/bug_3326' into kcmaster 2011-03-17 09:22:46 +13:00
Jared Camins-Esakov
e18ddca9d4 Follow up for Bug 3326: previous fix broke searches when
This fix ensures that searches will still work when -x is not used when
reindexing Zebra.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Magnus Enger <magnus@bibkat.no>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 09:21:54 +13:00
Colin Campbell
cf28bf4785 Bug 3810: Ensure all calls to Mail::Sendmail handled consistently
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-16 20:57:12 +13:00
ruth@bywatersolutions.com
784b9df4f2 Bug 3595 (partial): Items seen at checkin are not filling holds well
In Liz's second comment on this bug, she points out that local-only
holds (and also no-holds) items are being used to fill the first hold
in the queue, no matter where located, transitting if necessary.  If
all the items on a biblio are set to no-holds types, this problem
would never arise, as no holds could be *placed*.  But if you have
one or more unlimitedor local-hold items, then holds are getting
filled by the first item to cross a scanner, no matter what.

This patch will check during C4::Reserves::CheckReserves to make sure
that the hold being handed back to AddReturn is actually fillable by
the item just scanned.  One caveat:  If CircControl is set to "the library
you are logged in at", this will cause items checked in at
other-than-their-home-library to fill local holds at the library where
scanned.  This is, however, an edge case!

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-16 20:53:20 +13:00
Jared Camins-Esakov
d52f3680f4 Bug 3326: Work around Zebra's handling of &amp; entities
When using XSLT mode, the OPAC results display will show "&amp;" instead of "&"
when Zebra is indexing in XML mode. This patch works around this by replacing
"&amp;" with "&" and then extends the previous fix to apply to all occurrences
of "& " instead of just the first.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-16 20:48:50 +13:00
Chris Cormack
74c37aeeb6 Revert "Merge remote branch 'kc/new/bug_5734' into kcmaster"
This reverts commit b18ae6dee6, reversing
changes made to a52d4e8a70.
2011-03-16 16:28:00 +13:00
Stéphane Delaune
7b61eadf50 Bug 5750: (MT #4095) add exact matching filter for categorycode and branchcode fields in search members's result
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

No searching borrowers by categorycode or branchcode will only bring up
exact matches. Before searches for Staff (S) would also bring up
Students and Schools (SC, ST). Same for branchcodes.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 22:07:50 +13:00
Chris Cormack
1e98195b10 Merge remote branch 'kc/new/enh/bug_3495' into kcmaster 2011-03-15 22:01:45 +13:00
Katrin Fischer
9dfc9d4d12 Bug 3495: Fast bib record add at circulation
The link to the Fast add framework was never shown.
Now the link is shown if you have the right permissions (fast cataloging or superlibrarian).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 22:00:23 +13:00
Chris Nighswonger
5a924cc530 Bug 5865 - Labels wrap incorrectly when paper width is greater than height
This is due to the incorrect use of string comparators to compare numeric values.
This patch corrects that.

Note: This should be backported to 3.2.x

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 21:52:32 +13:00
Chris Cormack
76d52d89e4 Merge remote branch 'kc/new/enh/bug_3659' into kcmaster 2011-03-15 15:58:26 +13:00
251e2c4d74 Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Revision fixes some markup and corrects an error that would lead
to the hold being initiated for the remembered patron when this
was not intended.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 15:48:09 +13:00
Chris Cormack
fc2fe083fc Merge remote branch 'kc/new/bug_5693' into kcmaster 2011-03-15 10:04:38 +13:00
Chris Cormack
9b5e18c4ee Bug 5693 : Follow up patch, escaping HTML in limit_cgi so "" dont break hrefs
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 10:02:37 +13:00
Chris Cormack
7051352955 Bumping database version 2011-03-14 21:11:30 +13:00
Nicole Engard
07b9125861 Bug 3670: change 'Item DUE' to 'Item Due' in English dbs
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 21:05:41 +13:00
Janusz Kaczmarek
d6e580439b Bug 5819 : No toolbar in record view when quotes present in title - fix
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Was able to reproduce problem by surrounding 245$a with "".
Patch fixed the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:57:15 +13:00
1ff13b5aa6 Bug 5848: Same position for the tabs of Normal, MARC and ISBD view in opac detail
Adjusts three opac detail templates. Moves few styles to css.
Removes duplicate view info from XSLT file.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:50:03 +13:00
Chris Cormack
2c470899b3 Merge remote branch 'kc/new/bug_4438' into kcmaster 2011-03-14 20:48:50 +13:00
Henri-Damien LAURENT
3e297c6cb8 bug4438/MT5496 budget Exceeds total allocation
This is a followup :
When editing a budget, the check for the total allocation would take into account the budget itself.
Showing an improper error message
The problem was solved when adding a child budget but not when editing the same budget.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:45:58 +13:00
Chris Cormack
f463d241d2 Bumping db version 2011-03-14 16:22:28 +13:00
Chris Cormack
c88f43fc67 Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not
Default is on

Part of bug 5609

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 16:18:08 +13:00
Chris Cormack
c8c62e2fa1 Merge remote branch 'kc/new/bug_5595' into kcmaster 2011-03-13 20:31:38 +13:00
Chris Cormack
8215cc8bad Bug 5595 : Fixing a security glitch (please always use placeholders or
dbh->quote and fixing the tests
2011-03-13 20:30:13 +13:00
Chris Cormack
6e97b98a88 Bumping the database version 2011-03-13 15:19:31 +13:00
Jane Wagner
f087137f9c Bug 5810 revision to fix author search link
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-13 15:03:06 +13:00
Jared Camins-Esakov
4bc293c3aa Bug 5810: Subject tracings search complete subfields
This patch adds the syspref TraceCompleteSubfields. When TraceCompleteSubfields
is set to "force," clicking on links in non-authority controlled subject
tracings will only find other records where the entire subfields match. Leaving
it at "don't force" keeps the current behavior of doing a keyword search of the
subject indexes.

This patch implements complete-subfield subject tracings in MARC21 XSLTs (OPAC
and Staff) and all Normal mode interfaces. UNIMARC XSLTs have not been updated.

This patch also adds the syspref UseAuthoritiesForTracings. When set to "Do not"
tracings in the XSLT detail displays will never generate links using authority
numbers, but rather use the heading strings (NB: the tracings currently use only
subfield 'a' for generating links).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-13 15:02:59 +13:00
Chris Cormack
4b2ccab568 Adding release dates and 2 new developers 2011-03-13 14:13:33 +13:00
Chris Cormack
554c77569d Merge remote branch 'kc/new/bug_3013' into kcmaster 2011-03-13 14:02:06 +13:00
Janusz Kaczmarek
728b3725df Bug 5569: Corrections to addbiblio.tmpl to be able to delete repetable mandatory subfields
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 20:48:54 +13:00
326222e3f1 Bug 4072 Lost items aren't hidden on OPAC result page
When hidelostitems system preference is enabled, lost items are hidden on OPAC
detail page but are shown on result page. This patch modify MARC21/UNIMARC XSL
in order to take into account hidelostitems syspref on OPAC result page.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 12:52:57 +13:00
12cc56a9c7 bug 5846: fix detection of Javascript to compress by mod_gzip
Update to default Apache config; should result in a slight
performance benefit.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 12:49:29 +13:00
Stéphane Delaune
0ee0cc18b3 Bug 5595: (MT #5757)adding additional attributes support on patrons's search
Restores ability to search on extended borrower attributes that are configured to be searchable

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 12:46:05 +13:00
Colin Campbell
0fd3b7f112 bug_5064 Rework data retrieval in booksellers.pl
loops were slightly illogical and db accesss was excessive
and repetitive. caused it not to scale well on large datasets
Routines in Acquisition.pm seem to have inconsistent views
of the data.
rework logic to utilize db and processing better

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 12:43:55 +13:00
002baadaf4 update INSTALL* to acknowledge the use of mod_deflate
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 12:37:26 +13:00
Colin Campbell
0d082204ea Bug5063: C4::Bookseller Changes
Merge unfao changes to C4::Bookseller
Enable warnings in Bookseller.pm
Some cleanups in Bookseller code
Do not export everything by default
Display vendors more rationally
    Was displaying by id make it name as the searchstring is for all
    embedded substrings
Have removed "if mysql" logic as we want to deal with this by
    abstracting the DB interaction and it makes cleaner code until then

Sponsered by UN FAO, Rome

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 08:42:26 +13:00
Katrin Fischer
05052f4081 Bug 1962: Follow-up: Add fine notification during check-in
Don't show message when patron has no fines.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 08:32:34 +13:00
Katrin Fischer
f2cf6c2db3 Bug 5527: Fix some problems in inactive borrowers report
- 'Not checked out since:' date was not added to query
- borrowers with only checkouts and no returns since this date were considered inactive

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 08:30:21 +13:00
Frédérick Capovilla
b39466c965 Bug 5703: Hide the $9 subfield (linked authid) when showing series for a MARC record in normal view.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 08:22:15 +13:00
Chris Cormack
3f8bb003cc Bug 3624 : Follow up patch, to catch any installs that still have the missing columns 2011-03-12 08:15:17 +13:00
Paul Poulain
306871578e BZ3624, proposed patch for kohastructure.sql rewritten
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-08 09:37:32 +13:00
d163e7e578 Bug 5830 Using XSLT on OPAC Lists page
On OPAC Lists page (opac-shelves.pl), biblio records are now displayed
accordingly to OPACXSLTResultsDisplay system preference.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-08 08:53:56 +13:00
Chris Cormack
b06a289173 Merge remote branch 'kc/master' into new/bug_3013 2011-03-08 08:28:42 +13:00
Salvador Zaragoza Rubio
519cb622db 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>
2011-03-08 08:28:32 +13:00
Chris Cormack
22a438aeb4 Bumping database version 2011-03-07 15:13:53 +13:00
Chris Cormack
90f4de97de Merge remote branch 'kc/new/enh/bug_5783' into kcmaster 2011-03-07 15:10:37 +13:00
61adeac859 bug 5783: follow-up system preferences tweaks
* add the AuthoritiesLog system preference to all
  language installer SQL scripts
* options for a 'YesNo' should be '', not '0'
* fix wording glitch on preferences page

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:09:23 +13:00
04f78e57c3 bug 5783: follow-up - fix logging of modifications
Fix so that modifying an authority record is not logged
as both an ADD and a MODIFY.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:04:20 +13:00