Mark Tompsett [Thu, 30 Aug 2012 07:06:07 +0000 (15:06 +0800)]
Bug 8350: warning in logs when searching for nonexistent ISBN
Searching for a 10 or 13 digit numeric string that does not exist in
one's catalog will fail to affect SQL statement correctly
in C4::Breeding. Moved string substitution, which was triggering error
when search was undefined, and fixed if statements accordingly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8581: don't display parentheses when we don't have a type
Prior to this patch, see also references in certain authority records
(most notably GND records) were being followed by empty parentheses in
the search results display. This patch resolves that problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Fri, 28 Sep 2012 23:34:32 +0000 (11:34 +1200)]
Bug 7642 - [3.8.x] fix the lost display of tag sizes
This fixes the display of different sized words for differently popular
tags. It is a bit of a refactor of that part of the system, moving
logic to more sensible places (and removing an unused method on the
way.)
Note that it isn't an attempt to reproduce what was there previously,
just to do something similar, and in an easier to change fashion.
Sponsored-By: New Zealand Educational Institute Signed-off-by: Marc Veron <veron@veron.ch>
Works as expected.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Maxime Pelletier [Tue, 21 Aug 2012 22:02:31 +0000 (18:02 -0400)]
Bug 8659 Remove and readd the inactive funds in javascript to make it work in all browsers
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 16 Aug 2012 19:19:04 +0000 (15:19 -0400)]
Bug 8617 - Problem with display of comments waiting for moderation in OPAC
This patch addresses on aspect of Bug 8617: The behavior where
live previews of edited comments are displaying on opac-detail
as a duplicate comment. We must pass the review id back to the
script when submitting so that the check for it will evaluate
as true when it should.
This patch also corrects some JavaScript for translatability.
To test, submit a comment on a title and approve it. Return to
the title and edit the comment. When you submit your revised
comment the comment pop-up window should close and your revised
comment should appear on opac-detail as "pending approval."
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
David Cook [Wed, 12 Sep 2012 20:31:41 +0000 (06:31 +1000)]
Bug 8764 - Template change "Authors" to "Additional authors" in OPAC
This patch simply changes "Authors" to "Additional authors" in the OPAC. This label describes authors that are added via the MARC 700 fields, which are added or additional authors.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, and seems to make sense. Only affects the display
when XSLT is not enabled.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Kyle M Hall [Thu, 12 Jul 2012 14:48:12 +0000 (10:48 -0400)]
Bug 4173 - Statuses not appearing in the OPAC
For the authorised values LOST and DAMAGED, if an OPAC description
is defined for the given value, display that description in the OPAC
rather than the generic description.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Testing the first indicator value=2 should be used for labeling 'Partial content'.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
David Cook [Tue, 4 Sep 2012 02:19:41 +0000 (12:19 +1000)]
Bug 8717 - Wrong subscription notes are showing in catalogue detail view of serials in staff client
Changes the subscription note from the opac "notes" to the proper staff client "internalnotes" field.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 22 Aug 2012 20:33:26 +0000 (22:33 +0200)]
Bug 3782: Remove broken z39.50 targets from sample files
Removes NYPL and NYU from the list of sample z39.50 servers, because
they don't work or only work inconsistently.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8275: xml parsing error when the webservice GetPatronInfo/show_loans is called
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Fri, 29 Jun 2012 17:43:28 +0000 (18:43 +0100)]
Bug 8336 Support Sip Renewal Transaction
Renewals were being rejected for incorrect reasons
Checking was being done against the wrong object
Add more informative messages on failure
Correctly set due_date for renewal response
Avoid crashing the SIPServer because it handles RenewAll
incorrectly
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
David Cook [Wed, 12 Sep 2012 21:00:13 +0000 (07:00 +1000)]
Bug 8765 - Add series title to intranet search results
Patch adds series title to intranet search results, so that the
series volume is no longer displayed on its own.
It also removes the comma that comes before the series volume as
this is unnecessary punctuation that creates duplicate punctuation
in search results.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Mon, 3 Sep 2012 03:00:32 +0000 (11:00 +0800)]
Bug 8713 - Warning message triggered by clicking Keywords to MARC mapping
In the Koha Administration screen, clicking
Keywords to MARC mapping triggered an uninitialized $op warning
in the koha error logs. Added a "|| q{}" to ensure it is set.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Wed, 5 Sep 2012 13:03:13 +0000 (14:03 +0100)]
Bug 8727 Minor stylistic change to help text
indexing not indexation
some minor grammatical changes
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Thu, 9 Aug 2012 10:43:20 +0000 (12:43 +0200)]
Bug 7690: hidelostitems not working in Normal Display
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested by toggling both the hidelostitems preference and the
OpacHiddenItems preference. Both work as expected in the normal
search results display.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Mon, 3 Sep 2012 04:27:58 +0000 (12:27 +0800)]
Bug 8714 - Poorly ordered and triggers warning in marctagstructure.pl
An array boundary check was after a comparison using the array.
By changing the logic which had " and ( $j < $cnt)" to be at the
beginning "( $j < $cnt ) and ", the warning is no longer shown
in the error log.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Thu, 30 Aug 2012 16:42:26 +0000 (18:42 +0200)]
Bug 8705: Software error on help of main page
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8520 - Authorities summary incorrect on posible duplicate notice
We didn't notice this one with jcamins when we fixed this bug.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
The superfluous whitespace after the definition of subject
tag $9s is causing an error when carried over into dom config
files so that the authority links fail to index
Also removed the (harmless) trailing space in the equivalent
Unimarc files
A good editor and git can help in not creating excess whitespace
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8743: ZOOM error when merging authority change to biblios
The merge fails and the following errors appear in the log:
[Sun Sep 02 23:38:10 2012] [error] [client 75.149.175.233] ZOOM error 25
"Specified element set name not valid for specified database" (addinfo:
"F") from diag-set 'Bib-1', referer:
http://****/cgi-bin/koha/authorities/authorities.pl?authid=3010
[Sun Sep 02 23:38:11 2012] [error] [client 75.149.175.233] Premature end of
script headers: authorities.pl, referer:
http://****/cgi-bin/koha/authorities/authorities.pl?authid=3010
Test plan:
1) Set dontmerge to "Do"
2) Find an authority that is linked to a bib record.
3) Edit the main entry of the authority.
4) Save the authority record.
5) Notice that you got a nasty error and the bib record was not updated.
6) Apply patch.
7) Edit the main entry of the authority again (you can just set it back
to what it was to start with).
8) Save authority record.
9) Notice that there was no error, and the bib record was updated.
10) Sign off.
Signed-off-by: Doug Kingston <dpk@randomnotes.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Tue, 28 Aug 2012 13:34:55 +0000 (14:34 +0100)]
Bug 6976 Close loophole allowing borrowers extra holds via opac
The check that the max number of reserves has
not been reached needs to take account of the fact
that we may have added enouch reserves to
reach the limit while this script is running.
Add a check against the incrementing count
The variable canreserve was only used when looping
through multiple holds but was not being
reinitialized on every iteration
make variable local to loop it is used in and
initialize to zero
Have used perltidy to correct the indention of
the while loop as it was misleading to the reader
Some numeric comparisons were using a string operator
fix them before strange bugs manifest themselves
The loophole manifests thus:
borrowers are only allowed Y holds.
If holds are done individually, it is
obeying that law i.e. X has held Y separate books –
when I tried to do a 6th
book it told me that I could not place a hold.
However, if a borrower checks the catalogue,
gets the intial list up and clicks items on the “results”
box and then clicks “place hold” they can hold more than Y
items Please enter the commit message for your changes. Lines starting
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8447: Make sure we have enough subfields for broader_headings
Thanks to wajasu for providing the debugging information, as I cannot
seem to duplicate the problem, even seeing where it could come from.
Fix corrects cases where upon save, a software error complaing about
indicators being wrong as a side effect of a poorly autogenerated
biblio/authority record.
Behvior with this fix causes existing bilio data to to be preserved
while linking to the authority via subtag 9.
Signed-off-by: wajasu <matted-34813@mypacks.net> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Tue, 14 Aug 2012 14:38:05 +0000 (15:38 +0100)]
Bug 8418: load repeating holidays hash correctly
The repeating holidays structure was being loaded in
a different order to how it was tested
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Mon, 20 Aug 2012 14:24:58 +0000 (15:24 +0100)]
Bug 8656 Calendar needs to load both exception and nonexception dates
single_holidays and exception_holidays were both being selected
with the same parameter with the result that single holidays were not
being loaded.
Have removed the retrieval of the unused parameters title and
description.
In effect the distinction is not meaningful for these routines and
the two structures could become one. This patch just fixes the
current bug
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8071: link between bib and authorities with the authid
Do not automatically populate $9 in bibliographic headings when the
$9 is set in the authorized heading field of the authority record.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 6 Sep 2012 19:02:29 +0000 (15:02 -0400)]
Bug 8730 - browse overlaying powered by
This patch adds a "z-index" property to the CSS for
the browse results menu so that it will appear
on top of the "Powered by Koha" link.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Fri, 27 Apr 2012 17:20:08 +0000 (18:20 +0100)]
Bug 8017 reduce manipulation of GetAllIssues return
GetAllIssues can produce large lists
For performance purposes:
Dont loop over the list without cause
Dont do expensive processing in the loop
Dont needlessly copy the array
Do display formatting in the template
Dont extract the barcode list unless we are producing it
Reduce db calls by using the data to hand
Make the table in the template a bit more readable
where everything was stuffed into one line
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Tue, 11 Sep 2012 16:57:43 +0000 (00:57 +0800)]
Bug 8339 - div id="login" should be id="login_controls" in header.inc
After experiencing what I believe was stale CSS, I have
implemented oleonard's suggested fix which does work. That is:
header.inc change login to login_controls, and in
staff-global.css change the #login to #login_controls.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 7 Sep 2012 15:23:08 +0000 (11:23 -0400)]
Bug 8677 - table overlapping to the right on holds waiting
Converting layout to 100% flexible width to allow
table to expand as needed.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Tue, 4 Sep 2012 14:53:36 +0000 (16:53 +0200)]
Bug 8716 - make the routing list reordering function work
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
The t/Barcodes_ValueBuilder.t test had the wrong number of tests
declared, and rather than checking that a variable was undefined I was
checking that it had a length of zero. Fixed both issues.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
In addition to adding a new barcode plugin, this commit begins
refactoring the barcode generation code using a new module,
C4::Barcodes::ValueBuilder. From the POD:
This module is intended as a shim to ease the eventual transition
from having all barcode-related code in the value builder plugin
barcode.pl file to using C4::Barcodes. Since the shift will require
a rather significant amount of refactoring, this module will return
value builder-formatted results, at first by merely running the
code that was formerly in the barcodes.pl value builder, but later
by using C4::Barcodes.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Wed, 5 Sep 2012 10:58:54 +0000 (11:58 +0100)]
Bug 8251 Do not try to debar patrons if returns are not overdue
If a period of suspension is configured in the issuing rules
a calculation to debar the patron was called on all returns
It should be limited to overdue returns
Renamed _FixFineDaysOnReturn subroutine to _debar_user_on_return
which is more descriptive of its purpose
Removed some unnecessary or duplicated processing
Changed visibility of $today so it didnt need
calculating twice
Removed declaration of a datedue variable that is
never used
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 31 Aug 2012 13:04:13 +0000 (09:04 -0400)]
Bug 8708 [Revised] RSS feed for new comments is broken
Removing white space from the beginning of the file
so that XML processing will work correctly.
Before the patch, viewing the page
(/cgi-bin/koha/opac-showreviews.pl?format=rss) in a browser
which supports RSS handling (ex: Firefox) will show you
unformatted and broken-looking text. After the patch the
page will trigger the browser's built-in RSS-handling format.
Revision: Template now includes comment pointing out that the <xml>
declaration must not have any white space before it.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8678: XSLT stylesheets output XML, but HTML is needed
Because we are embedding the results of XSLT stylesheets in HTML, we
need to output HTML instead of XML. Outputting XML results in
non-standard-compliant (or at least non-Firefox-compliant) markup.
To test:
View a variety of XSLT-rendered pages on the OPAC and intranet, and
confirm that all look as expected.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8204 follow-up: don't display OpacNav on auth details
Based on the way we handle the bib details page, it seems we should
not be displaying OpacNav on the authority details pages on the OPAC.
This patch removes them.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Sometime in 2009 or so, the ISSN field was removed from the Z39.50 search
page, and the ISBN field replaced with a combined ISBN/ISSN field. Since
this breaks ISBN search for most Z39.50 targets (due to the
differing treatment of ISBN vs. ISSN), this is a bug not a feature.
A future enhancement would be to use Business::ISBN to search for both
ISBN10 and ISBN13.
To test:
1) Apply patch.
2) Do a search for an ISBN using the ISBN field.
3) Do a search for an ISSN using the ISSN field.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Tue, 28 Aug 2012 15:00:04 +0000 (11:00 -0400)]
Bug 8696: Update Export bibs on Tool Menu
The tool for exporting bibs is now 'Export data'
this patch changes the label on the menu to reflect
that.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Fri, 31 Aug 2012 09:48:51 +0000 (11:48 +0200)]
Bug 8706 - Private lists can be accessed by anyone
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Confirmed private lists can be accessed directly before patch is
applied. After applying patch, I can no longer access the list
via the same url.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Thu, 30 Aug 2012 12:59:32 +0000 (14:59 +0200)]
Bug 8704 - Typo in etc/koha-conf.xml
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
D Ruth Bavousett [Mon, 11 Jun 2012 19:13:01 +0000 (12:13 -0700)]
Bug 7613: OCLC Connexion web service and desktop client, followup patch
Prior patches to this bug had lots of comments like "I don't have a way to test this, so..."
In the OCLC Connexion web, when you choose the option to export to MARC, it'll *send* it, and
say, "Record Exported," but the web client does nothing whatever to confirm that the record
actually landed in Koha. That's a flaw in their software, but can be easily checked by
looking in Koha to see if an import batch got created. The desktop client is a little
smarter about this, but needed much more testing, also.
With this patch, both the client and web will actually work. With a config file and set up as
previously described, The record will be staged and/or imported, and the desktop client returns
a useful message about what happened, *and* the staff client URL to the record.
Oodles of gobs of bunches of thanks to Virginia Military Institute, for loaning me their OCLC
authorization credentials so this could be tested, as well as for great suggestions of cosmetic
improvements to the mechanism and output.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Mon, 30 Jul 2012 16:09:43 +0000 (00:09 +0800)]
Bug 8478 - Update Ubuntu related files (3.8.x)
Updated allation instructions, cleaned up ubuntu-pkg-check.sh,
renamed ubuntu*.packages files more consistently, updated files
to include missing libraries, corrected incorrect libraries
(yaz3->yaz4, mysqlclient v16 to v18, dropped the dev version of the client).
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sun, 5 Aug 2012 21:59:54 +0000 (09:59 +1200)]
Bug 6886 Follow up for NORMARC
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Wed, 8 Aug 2012 16:02:13 +0000 (18:02 +0200)]
Bug 8594 - prevent the report system from breaking some subqueries
If you had a report query that had a subquery in the fields list, and
that subquery had a LIMIT specifier, then it would be removed which
could break your query. This patch prevents this case from breaking by
ensuring that only a LIMIT that follows the last WHERE in the query is
removed.
If you don't have a WHERE, then it will behave like it always
did, removing all the cases of LIMIT (which would still break a subquery
but this is a) more rare, and b) would require more intelligent parsing
to deal with.
Also adds test cases and function documentation.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested with this report:
select biblionumber, (select itemnumber from items where items.biblionumber=biblio.biblionumber LIMIT 1) from biblio where biblionumber<1000;
and it worked like a charm
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Rebase of a patch originally submitted by gcollum@gmail.com
Original commit message:
Improvement on the previous patch through the use of GetBranchesLoop.
Added code so that the logged in location will be the location that
is selected by default.
Fixed a couple of minor xhtml errors.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Thu, 23 Aug 2012 13:04:31 +0000 (14:04 +0100)]
Bug 8675 Add hours and mins to renewal due date
If user supplies renewal with a new due date it should add
a time using the same logic as dateduespec in circulation.pl
rather than defaulting to 00:00
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:
Julian Maurice [Wed, 22 Aug 2012 13:26:58 +0000 (15:26 +0200)]
Bug 8666: Hide 'New basket' link if supplier is inactive
Signed-off-by: Koha Team Lyon 3 <koha@univ-lyon3.fr> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Tue, 4 Sep 2012 00:15:19 +0000 (08:15 +0800)]
Bug 4064 - Uninitialized variable errors in opac-search.pl
In 3.6.3 the error was triggered. It was already fixed with some
particularly ugly logic: if (($params->{'offset'}||'') eq '') {
Having read through the code, $offset is a better choice and
produces prettier, clearer code: if (!$offset) {
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
D Ruth Bavousett [Fri, 17 Aug 2012 12:42:12 +0000 (08:42 -0400)]
Bug 8012: default values for defaultSortField/defaultSortOrder NULL on install
...which *looks* like "relevance/ascending" in the staff client, which doesn't make sense.
This patch initializes the values at "relevance/descending", which is a functional
combination.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jorgia Kelsey [Wed, 8 Aug 2012 07:55:29 +0000 (20:40 +1245)]
Bug 8593 - Add unique IDs to pending approval markup on staff client home page
edited the intranet main-tt file. updated "suggestions pending". (w box)
http://bugs.koha-community.org/show_bug.cgi?id=8593 Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Thu, 16 Aug 2012 14:57:29 +0000 (16:57 +0200)]
Bug 8646 - prevent the highlighter from going infinite loop
On certain search queries, for example
http://koha-intra/cgi-bin/koha/catalogue/search.pl?kw=idx&q=ti:book%20
the highlighter starts going into an infinite loop until the browser
decides to kill it.
This patch prevents the bad input going to the highlighter.
It also includes the fix on the OPAC, even though the issue doesn't come
up there. Better to be safe...
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8413 Space in barcodes breaks GET request in benchmark_staff.pl
GET requests in benchmark_staff.pl test 6 do not work if a space character is part of the barcode. That seems highly unlikely to happen in barcodes, but is possible if no real barcodes are used but a substitute, like a copy of the call number. Space character needs to be changed to %20 for the request to work.
Also fixes a typo.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Wed, 8 Aug 2012 14:34:32 +0000 (16:34 +0200)]
Bug 8293: Software error when clicking on first or last result of each page on OPAC
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8637: Lack of control on mandatory in orderreveive.tt
Just add a check in Jscript when the form is submited, the same as in additem.tt
On Owen's suggestion I have added the red color and 'Required', the same as in additem.
On Jonathan's suggestion I have used the CSS class for red and italic and I have changed a variable's name (alertString2). Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Mandatory fields are now correctly checked on saving.
On other Jonathan's suggestion I have created a new class "missing" and I have added the background to staff-global.css.
The same for additem.tt.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Retested because of minor CSS change. Works nicely.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 12 Aug 2012 20:33:24 +0000 (22:33 +0200)]
Bug 8621: Alternative template for cart email
- uses less list elements, in favour of paragraphs and line breaks
- reimplements a link to the opac for each record
Note: In order for the URLs to be correct this needs to be tested
together with the patch for bug 8626.
To test:
- Add several records to the cart, add items with and without items
- Send yourself the cart as email and check formatting
- Update po files for any language, translate the po file for OPAC
and install language
- Send yourself the cart email again from the translated templates,
check formatting
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Maxime Pelletier [Wed, 30 May 2012 17:49:34 +0000 (13:49 -0400)]
Bug 8663 Fix the use of hardcoded date format for the calendar widget of hard due date
Sponsored by the CCSR
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Created circulation rules with different dateformat settings and hardduedate settings.
After applying the patch the calendar produces the correct fomats and rules are saved correctly.
Checking out an item to the hardduedate set works too.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 14 Aug 2012 14:02:38 +0000 (10:02 -0400)]
Bug 8596 - Reports interface date picker doesn't force ISO formatted dates
Datepickers follow Koha's preference for date format, but the
guided reports system doesn't intelligently handle different date
formats. ISO is required. This patch adds some additional
configuration to override the date format.
To test, create a guided or SQL report which takes a date
parameter. The datepicker fields should return an ISO-formatted
date.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works as advertised.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Tue, 14 Aug 2012 06:02:59 +0000 (08:02 +0200)]
Bug 8626: Fix encoding in cart emails for use of quoted-printable
When using quoted-printable data needs to be encoded accordingly.
Content-Transfer-Encoding: quoted-printable
Without the patch = in URLs or data will be interpreted as the beginning
of a special character resulting in broken URLs.
To test:
- Check diacritics in records display correctly
- Check various URLs with = to make sure they all work correctly
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This is only a partial fix, as the subject line is not encoded,
but it is a huge improvement over what it was before.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Kyle M Hall [Tue, 14 Aug 2012 17:17:38 +0000 (13:17 -0400)]
Bug 8640 - GetHardDueDate functions incorrectly
GetHardDueDate works just like GetIssuingRule, but it not only tests for having
found an row of results before returning, but checks for the existence of a
hard due date as well. That means that even if it finds a matching rule, unless
that rule has a hardduedate set it will toss it and keep looking!
So, for example, even though there is a matching rule for say "STAFF / VIDEO / *",
but it has no hardduedate. So it gets tossed and the subroutine keeps looking.
If the next match, "STAFF / * / *" *has* a hardduedate, it is the one returned.
This means that if a more specific rule has no hard due date,
it is overridden by a less specific rule that does have a hard due date.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8648: searchResults uses SQL query rather than GetMarcFromKohaField
Around line 1470-something:
my $sth =
$dbh->prepare(
"SELECT tagfield FROM marc_subfield_structure WHERE kohafield LIKE
'items.itemnumber'"
);
$sth->execute;
This patch replaces that with a call to GetMarcFromKohaField.
To test:
1) Apply patch.
2) Do a search that returns both available and unavailable items.
You'll know if the patch isn't working.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
projects / koha.git / log