When adding a duplicate stocknumber the duplicate was not saved to the database.
This happened, because the field stocknumber in table items was declared to be unique.
Discussion on bug suggests to lift this restriction.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name.
Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a8ffb2273b63c398492a7cbd08394adedb2aeadb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 4 Apr 2011 10:25:55 +0000 (12:25 +0200)]
Fix for Bug 5989 - Funds filter does not remember library choice
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f22b8bcd458df8d8fad29070a7b95a63b6d356a2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Some conditions added AND items.biblionumber=biblio/biblionumber
where JOIN USING (biblionumber) already added that.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 63f1ea0c2dcd442ce0cb3b29d40f5015dceb5bab)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul POULAIN [Fri, 1 Apr 2011 15:04:47 +0000 (17:04 +0200)]
Bug 5625 : adding missing title (needed for lateorders.pl)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 624ebb6e03bbf0f4c9f99298c0faed14bf4ed29b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 3727: Corrects the behaviour of the itemtype selectbox in addbiblio.pl
If the subfield is set as mandatory with an empty default value, an
empty value is added in the selectbox and this value is selected by
default. Before, the first element was automatically selected, so it was
easy to forget to set this mandatory value.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7d9ebbff3ab9b620b0c0b80b3dc28c51753ec13)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 30 Mar 2011 10:24:19 +0000 (12:24 +0200)]
Bug 5965 : Normalizing opac-detail.pl
NFC on opac-detail
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 480ca80dd0b38022b106a7b1339bc7c56ca272f7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fd1b757233a6db66a82bbc3ff4d2f40291b96832)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
If an item is returned at other than its' home library, and there is a hold for
it--at any library other than the return library--two prompts come up: one
telling the user to send the item home, and the other, to confirm and transfer
for the hold. Only the latter should be displayed.
Bug 3270:
Cancelling a hold request after transfer initiated orphans item.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a64cfba5e10be80a220f6c8164905788ba5a78b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
If you did a CCL query, then attempted resort, you would get the advanced-search page,
because of wonky URL escaping of the q= clause. This patch fixes that.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8548b804f49a5e84a64b7caf2457daf1a83f834b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul POULAIN [Sat, 26 Mar 2011 22:24:19 +0000 (18:24 -0400)]
Bug 3629 : search limit by group is not OK
MT4491 : limitation by library group
- the group list was not displayed in OPAC (even if everything else was here
- the group limit was not working due to a missing ()
author=jean et group=droit" resulted in:
author=jean and branch=b1 or branch=b2 or branch=b3
that is wrong (executed from left to right)
the fix add () to have :
author=jean and (branch=b1 or branch=b2 or branch=b3)
that is OK
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 091d3100169a12e9498f6d58c8b61ac01a5a5db6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This makes sending reports via e-mail with runreport.pl work properly. It also
adds a --format option to allow the user to select between text, html, csv, and
tsv. At the moment text is not implemented, and falls back to tsv, but that is
still more readable than the HTML that used to be produced.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 412966eff0016c69e5763197f1542e88c74580a1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Sat, 26 Mar 2011 15:08:43 +0000 (11:08 -0400)]
Fix for Bug 5833, opacstylesheet not loading on all pages
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b5a050d759b08027b210106e90d5714eb02b9032)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Mon, 28 Mar 2011 15:42:57 +0000 (11:42 -0400)]
Bug 4265: Fix padding of short callnumbers and Bib-1 attribute for sorting
1. The current C4::ClassSortRoutine::Dewey turns "306 Les" into "306_Les" for items.cn_sort and MARC-field 952$6, which results in "306.46 Les" being sorted before "306 Les" in the OPAC. With this patch, "306 Les" is turned into "306_000000000000000_Les".
2. Currently, call_number_asc and call_number_desc are set up to sort by 1=20, but this is mapped to Local-classification in ccl.properties, which is mapped to 952$o in record.abs.
This patch changes these sorts to use 1=8007, which is mapped to cn-sort and 952$6.
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aef8358cf2ce8db9803d94c14f6728cdf9ebd0d4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch begins the process of improving the COinS support in Koha to take
advantage of all the metadata available in the MARC format. COinS still doesn't
work quite right, but at least it seems to be following the standard now. The
COinS exported by C4::Biblio::GetCOinSBiblio now correctly identifies articles
from journals and books as such.
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>
(cherry picked from commit 8958f152e7273d3b1fc45a6f7494ab6066aab55e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
In certain circumstances, ampersands would not be displayed properly in the
Staff client search results. This patch fixes that by ensuring that all the
doubled ampersands that Zebra inserts in XML indexing mode are replaced by the
correct single ampersand entity.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fa7ca5c8b8b5fdf27fae63fd0ada7fe539651bc2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5817: Follow-up fixing callnum: on staff results
This patch changes the call number links on the staff results page so that
searching will work. The underlying problem described by bug 5274 remains an
issue, but this fixes some of the more problematic symptoms.
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>
(cherry picked from commit b853b79001ceefc897eac781a6ebf28e7cc29c85)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Sun, 27 Mar 2011 17:05:48 +0000 (13:05 -0400)]
Bug 3203: ACCTDETAIL notices don't parse branches or borrowers tokens
This patch enables the ACCTDETAIL notices (and any branch-specific derivatives) to use
<<branches.*>> and <<borrowers.*>> tokens
This patch also attempts to send the email from the branch email first, falling back to
KohaAdminEmailAddress if no branch email exists.
To test:
1. Enable AutoEmailOpacUser system preference
2. Add <<branches.*>> tokens to the ACCTDETAIL notice
3. Create a new patron, including:
a. test email address in the field matching your AutoEmailPrimaryAddress syspref value
b. username and password (required to send a notice)
c. any other required fields to save the record
4. Check you inbox. Notice should send instantly (no need to run process_message_queue.pl)
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1d6f791541686dfa409843f8f5b1624f1be6e8cb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Thu, 24 Mar 2011 20:27:03 +0000 (16:27 -0400)]
Bug 5940: Update Patron Help Files
This patch updates the help files in the patron area of Koha.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b8f3120bf5f5e7f2da73c213ed74bb003cf5da25)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch cleans up the formatting of the 856 display code in
MARC21slim2OPACDetail.xsl. Tabstops are correct, and the OPACURLOpenInNewWindow
syspref check is moved to control the use of a 'target="_blank"' attribute,
rather than having two blocks of almost-identical code.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 009036b53722881f607ed01b5701bd300abd6735)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5883 : Prevent re-encoding the items if they are already in UTF-8 in ModBiblio.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cce98a2914c85ce1e1c5563b64a986c880024079)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5902: additem.pl should default to set library
This patch makes the additem screen default to selecting the currently set
library. If the library is unset, it will default to the first branch
alphabetically.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d8e239c23e23eb34eb2552cc036b364c869ceec2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This prompts NFC normalization on adding record
Therefore, any saved record will be NFC normalized
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6b4512d5c40b552a45fced0f48635af355d55efa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5907 : MT 2538 : Using default authtypecode for authority display
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2498992447ba36f4af2aea5df2c2b2130cbe95f0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch ensures that the OPAC library selection masthead will always default
to the branch that is currently being searched. This only applies to systems
with multiple branches and OpacAddMastheadLibraryPulldown turned on.
To test: do a search in the OPAC, limiting by branch. The search results will
still have that branch selected in the masthead dropdown.
This patch also fixes bug 5852 and bug 3778.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a1f05a5a2cbe0bb5665c824c0cbcf1a0851a6fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Sat, 19 Mar 2011 21:14:33 +0000 (17:14 -0400)]
Bug 5834: Holds link missing when 942$c is not for loan
Adds a check for item-level_itypes system preference. Note that this only
applies to the search results screens.
To test:
1) Set item-level_itypes to 'specific item'
2) Create record and set 942$c to an itype that is marked not for loan
3) Create item with itype not marked 'not for loan'
Current behaviour: Holds link is not shown, sys pref setting doesn't matter
After patch: Holds link is shown
- when item-level_itype is 'specific item'
- when item-level_itype is 'biblio record' and 942$c itype is for loan
Holds link is not shown
- when item-level_itype is 'biblio record' and 942$c is not for loan
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1654e1aa148303fde0d30360f533be26b3029d3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jesse Weaver [Fri, 18 Mar 2011 15:10:19 +0000 (16:10 +0100)]
Bug 4878 - Command-line tool for getting and setting sysprefs
New script misc/admin/koha-preferences - Allows getting and setting of
sysprefs one-at-a-time or in bulk. More info:
misc/admin/koha-preferences help
or:
misc/admin/koha-preferences manual
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ba6b2e148667d7fc1bd382d8f65c06e28768631)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer
It has been detected an incompatibility with Internet Explorer in the ajax.js
file that cause a javascript error for this browser that prevents proper
operation.
The error occurs because the "localName" is not supported by Internet Explorer
and returns "undefined".
Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer
Fix error on comma for IE
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0499633a6b27d44bf002bc4d99b82ee63237a001)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 18 Mar 2011 14:30:05 +0000 (15:30 +0100)]
Bug 5892 : opac-user: minor spelling/html changes
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 01b6e7a6ddfbaaca59215f7a88d8aa1010053217)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Julian Maurice [Fri, 18 Mar 2011 10:15:08 +0000 (10:15 +0000)]
Bug 5864: link biblio => serials subscription is wrong
The GetSubscription function can be called with 3 parameters : title,
issn, biblionumber.
In biblio view (both opac & staff interface), the link to jump from the
biblio to the subscription(s) was done using title.
The result was that for a title like "Science", all subscriptions
containing "science" in the title were linked.
That's too much and that's false.
This commit fixes this problem by calling GetSubscription with
biblionumber only where applicable.
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 632277e453fa80797e1cfc9dc32f1d1d8cc089af)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Tue, 4 Jan 2011 20:28:10 +0000 (21:28 +0100)]
Bug 4330 : Fixing copyright and removing unconditional warn chris c mail 2010-12-16 on patches ML
(cherry picked from commit 528cfd918c2f8f57a392302897977804c5f7e7c8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Thu, 17 Mar 2011 14:37:59 +0000 (10:37 -0400)]
Bug 3735: Wrong search results for a few fields in ccl.properties
This patch corrects a syntax error in the definition of bath attributes in
ccl.properties. In particular, it adds the search prefixes 'isbn', 'issn',
'name', and 'notes'. In order to make use of this patch, ccl.properties must be
updated.
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 975aea1372de1def413ad02330916942e4160533)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 16 Mar 2011 15:40:41 +0000 (10:40 -0500)]
Follow-up fix for Bug 4218 - Staff client detail page doesn't show hold status
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4b1fe1c9c33a4ac0924c96fd1aacf076c4f2fa23)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- the systempreference is isbd, not ISBD
- when preparing the ItemRecord (for acq or serials recieving), there was no default value calculated for location. Fixing that
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 620ae78f847ba3c42bcbfd0e0f9a530daa79e65b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Tue, 15 Mar 2011 14:03:30 +0000 (15:03 +0100)]
Bug 5646: Translated sql files break messaging
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1411a929360d1ad667b2178b3d42b82996642bfc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit de4619b849e4cc6f7bdc821bd52581876a02b7d2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit e18ddca9d4a6c741a918be28bb3e2cc3e2b30030)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit 784b9df4f240302d3946089862ca6bf6f33c08a9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 3326: Work around Zebra's handling of & entities
When using XSLT mode, the OPAC results display will show "&" instead of "&"
when Zebra is indexing in XML mode. This patch works around this by replacing
"&" 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>
(cherry picked from commit d52f3680f482a42cc98ad9810c011c8775d9b3ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit 5a924cc530658f3ab11cf1a219fd9ba4e602f1e5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 14 Mar 2011 20:55:06 +0000 (16:55 -0400)]
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>
(cherry picked from commit 9b5e18c4ee05941eab435d83c510d931dde34370)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Fri, 11 Mar 2011 10:14:49 +0000 (11:14 +0100)]
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>
(cherry picked from commit 07b9125861c2d57f787f3bd3d598dcbd652b030b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Janusz Kaczmarek [Mon, 14 Mar 2011 06:21:47 +0000 (07:21 +0100)]
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>
(cherry picked from commit d6e580439be3382af88aed5e3ba9f7e3e8876f0b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit 3e297c6cb8e7b6b73b9df2e2ae1ba3dd0bc014e7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Sun, 13 Mar 2011 07:30:13 +0000 (20:30 +1300)]
Bug 5595 : Fixing a security glitch (please always use placeholders or
dbh->quote and fixing the tests
(cherry picked from commit 8215cc8bad33ff1dd327ac17fbfecd59e6f06989)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Janusz Kaczmarek [Thu, 10 Mar 2011 15:45:40 +0000 (16:45 +0100)]
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>
(cherry picked from commit 728b3725df5b48d47693b7b37454c7b6ab4c6110)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Thu, 10 Mar 2011 17:29:11 +0000 (11:29 -0600)]
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>
(cherry picked from commit 326222e3f109d816a8fa3118c068df7a3f706f52)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit 0ee0cc18b314d0123d8436a798bb02c5c1448494)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Tue, 8 Mar 2011 02:41:13 +0000 (21:41 -0500)]
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>
(cherry picked from commit 0fd3b7f112c419629c3999d830ee04218dc55730)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit 002baadaf4cde6a397ca93cda35fadd012b40629)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 7 Mar 2011 18:50:48 +0000 (13:50 -0500)]
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>
(cherry picked from commit f2cf6c2db3e126541b10d9c1d9d7458c6766a071)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit b39466c965dc216680d6ff12d3044e9e5174ea4a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Mon, 7 Mar 2011 18:12:44 +0000 (13:12 -0500)]
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>
(cherry picked from commit 306871578edc592b2b1ff20c19b33d801e2573fc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Galen Charlton [Thu, 3 Mar 2011 19:52:46 +0000 (14:52 -0500)]
bug 2975: fix calculation of due dates by offline circ
Offline circ no longer tries to calculate the due date
directly, instead relying on the AddIssue and AddRenewal
APIs to do so. This corrects a bug where the due date
would be calculated incorrectly if the item-level_itypes
system preference is turned on.
This change also has the effect of causing the issue date
for loans uploaded via offline circulation to be set
to the time stamp recorded by the offline circulation client.
Test plan:
* Turn on item-level_itypes
* Create an example item whose loan policy per
the item's item type would be different from
the default policy based on the bib-level type.
* Create a test KOC file with a loan of the test
item and the checkout date artificially set
to yesterday.
* Upload the file:
- Before the fix, the due date would be set
to the default due date. Also, the issue date
will be set to the date of the upload.
- After the fix, the due date would be calculated
correctly based on the item's item type. Also,
the issue date will be set to the date recorded
by the offline circulation client.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 935635aba5dc0ab62f9476986cc418ae8c980b57)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 4 Mar 2011 20:08:22 +0000 (15:08 -0500)]
Bug 5831: rebuild_zebra.pl doesn't respect -r
Reimplements support for -r, as well for -reset
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8dc56a0d2c5f33f6d14e2039c7cad9fa9598f14f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d6718e14e7637289db57e80f27dc46be51b0e38f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Reed Wade [Fri, 4 Mar 2011 04:13:00 +0000 (23:13 -0500)]
bug 5693 - mc-ccode parens fix
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c84dad3b187770160a845d77f146870cc0159c63)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
this fix filters of borrowers top issues that doesn't work really well... perhaps because reports scripts need too much improvment.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6b285cf44d969ccfddf7c208803b1cd679185915)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 1 Mar 2011 20:19:16 +0000 (21:19 +0100)]
Fix for Bug 4853 - Rights needed to renew a document
Correcting check for circulation permission. Also updating
updateitem.pl (for setting lost and damaged statuses) with
circulate permissions.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7a587112f0417f152b2c95f81cb5e0f82df91c73)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 1 Mar 2011 13:01:32 +0000 (14:01 +0100)]
Fix for Bug 4290 - search for author in repository
Reimplementation of Nahuel's patch from 2010-03-02
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ba9aab76bdcc16ff00d8888cbf6a8145a329a07)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 3341: Fines calculation erroneous when a repeatable holiday is added
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dbe3780fc0e54e637fcbac96bb758781f722ddc4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Thu, 3 Mar 2011 23:13:26 +0000 (18:13 -0500)]
Bug 5824: Creating a circ rule for a specific library causes anomalies
The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.
This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4735e296cf99dea4dd5217193460f8585d6cf25d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 3 Mar 2011 22:20:40 +0000 (17:20 -0500)]
Fix for Bug 5818, Date picker broken on label batches
Calendar picker JS can't come before main JS includes
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2dde87679864042fb531c3f580e564a3d6b70f3b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Sun, 27 Feb 2011 08:49:50 +0000 (03:49 -0500)]
Bug 5642: Item field serial enumeration (enumchron) should be longer
Field enumchron in items table is now varchar(80).
We have records that need a much longer field, even up to 400 or 500 chars.
I suggest to change its type to TEXT (variable length with max 64K; tinytext
goes up to 255 chars and is just too short).
Mediumtext or longtext are not needed; as a side note these types are used in
the items table for e.g. booksellerid and more_subfields_xml..
Revised original patch thanks to Ian Walls: update kohatructure.sql. Copied the change in deleteditems as well.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fca88d102b91d3781c10c3d533a0fd942d4bd1f2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 24 Feb 2011 21:33:38 +0000 (16:33 -0500)]
Bug 4852 - rewrite the query to include limits if using ccl=
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 87ec4126484d5c55efd66b359220934d3501ff6c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Wed, 23 Feb 2011 13:46:40 +0000 (08:46 -0500)]
Bug 5792 - Add reference icon to Bridge icon set
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 19adf162ca1cc34189bb5905daa23d9314f1b58a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Wed, 23 Feb 2011 13:46:22 +0000 (08:46 -0500)]
Bug 5799 make language on circ history consistent
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bbd08ffd094e8131aafe12f519eb15b225a4c223)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 21 Feb 2011 02:33:30 +0000 (21:33 -0500)]
Fix for Bug 5814 - Style error message on manage staged records page according to standard
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ded7b9897cf8d4d25781f988ad8bb66dbc5a71e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Sat, 19 Feb 2011 10:38:32 +0000 (05:38 -0500)]
Bug 3319 Followup: Fix compatibility with fix for bug 4945
The fix for 3319 overwrote the @branchloop variable with output from GetBranchesLoop,
which forces a selected branch. Removing the extra call, and just measuring the size of
@branchloop as it was build, plus some dereferencing, fixes the issue.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 21 Feb 2011 02:32:22 +0000 (21:32 -0500)]
Fix for Bug 5812 - Tag Cloud - capitalized words come before lower-case words
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit edafbd941d14977cb98d07d2fd3fbba3b2a995ac)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Sun, 20 Feb 2011 17:28:30 +0000 (12:28 -0500)]
Follow-up fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view
Fix for Bug 5551 overwrote the necessary changes to opac-detail.pl
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit baec90aae9359709abc9c18f8b2de0f446bf194a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Security Bugfix: Bug 1953 Adding Placeholders to SQL To Avoid Potential Injection Attacks
This patch addresses both security issues mentioned in the summary of the report
submitted by Frère Sébastien Marie included below.
---------------------------
The problem is here: 'C4/AuthoritiesMarc.pm' in the function 'DelAuthority':
The argument $authid is included directly (not via statement) in the SQL.
For the exploit of this problem, you can use 'authorities/authorities-home.pl'
with authid on the URL and op=delete (something like
"authorities/authorities-home.pl?op=delete&authid=xxx").
This should successfully call DelAuthority, without authentification...
(DelAuthority is call BEFORE get_template_and_user, so before authentification
[This should be an issue also...]).
Please note that the problem isn't only that anyone can delete an authority of
this choose, it is more general: with "authid=1%20or%1=1" (after inclusion sql
will be like: "delete from auth_header where authid=1 or 1=1") you delete all
authorities ; with "authid=1;delete%20from%xxx" it is "delete from auth_header
where authid=1;delete from xxx" and so delete what you want...
SQL-INJECTION is very permissive: you can redirect the output in a file (with
some MySQL function), so write thea file of you choose in the server, in order
to create a backdoor, and compromise the server.
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b0f60221f41041665c4fecacce35654fc8d45a01)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
projects / koha.git / log