Chris Nighswonger [Wed, 12 May 2010 12:00:50 +0000 (08:00 -0400)]
Bug 4141 Reconcile 3.0.x and HEAD database updates for 3.2.0
This is a partial fix addressing this error:
You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 at /home/koha/koha.prod/installer/data/mysql/updatedatabase.pl line 2916., referer: http://koha-staff.foobar.org/cgi-bin/koha/installer/install.pl
If there are no records in aqbudgets the result is an empty array which causes the sql to attempt to set AUTOINCREMENT to null.
This patch is being submitted on behalf of the Mapua Community Library.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
J. David Bavousett [Tue, 11 May 2010 17:55:09 +0000 (13:55 -0400)]
Correct URL for Baker & Taylor ContentCafe
This patch updates the URL for image links in ContentCafe
Sponsored by Plano Independent School District, Plano, TX, USA
[RM note: the previous book cover URL was for a varient of Baker
and Taylor's service that has to do with 'bookstore integration',
and if I remember correctly, the main difference is that the
book jacket image had "buy now" text. The version supplied
in this patch should work for normal use of ContentCafe.]
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Paul Poulain [Wed, 12 May 2010 09:17:56 +0000 (11:17 +0200)]
(MT3318) RSS OPAC: Adding CDATA term in title and description tags.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Colin Campbell [Wed, 12 May 2010 11:25:41 +0000 (12:25 +0100)]
Housekeeping in errors scripts
Enable warnings - remove Bug 2505 FIXME messages
Correct FSF address in License statement
To aid code analysis tools:
Call new unambiguously with arrow syntax
use noninterpolating quotes on noninterpolating strings
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Tue, 11 May 2010 14:14:25 +0000 (10:14 -0400)]
Fix for Bug 4485, System preferences page uses non-standard warning style
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Tue, 11 May 2010 14:10:02 +0000 (10:10 -0400)]
A couple of CSS and markup corrections
- moving inline style declaration to the default stylesheet
- correcting markup structure on advanced search screen to allow
consistent custom styling
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Jane Wagner [Thu, 4 Mar 2010 19:32:29 +0000 (14:32 -0500)]
Bug 4300 Display 866z summary holdings public note in OPAC
Added the 866z to the MARC21slim2OPACDetail.xsl file so that it displays
just above the 780 and 785 fields.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Paul Poulain [Fri, 26 Mar 2010 10:25:39 +0000 (11:25 +0100)]
stocknumber not saved properly
if you have a marc field, mapped to items.stocknumber, it's not saved properly in items.stocknumber
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Matthias Meusburger [Wed, 10 Mar 2010 21:26:04 +0000 (22:26 +0100)]
MT2582: Fix user deletion without permission
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Chris Cormack [Thu, 6 May 2010 23:24:23 +0000 (11:24 +1200)]
wr-70205 Rental discount not being respected
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Tue, 11 May 2010 11:45:28 +0000 (07:45 -0400)]
DB rev 134: DisplayMultiPlaceHold syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Chris Cormack [Tue, 11 May 2010 05:13:59 +0000 (17:13 +1200)]
Follow up to bug3093 patch
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Jane Wagner [Tue, 11 May 2010 05:13:58 +0000 (17:13 +1200)]
Bug 3093 add syspref to turn off multiholds button
Having the place multiple holds button at the top of the OPAC and staff search results has caused problems for some sites with tight holds policies; this syspref allows those sites to turn off the button.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Colin Campbell [Tue, 11 May 2010 10:24:41 +0000 (11:24 +0100)]
Bug 3928: Modified date should follow syspref
Changed arriveddate format to follow syspref
Fixed a whitespace error
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
J. David Bavousett [Tue, 11 May 2010 08:10:58 +0000 (20:10 +1200)]
Bug 3928: Modification of date for serials.
When a serial status is changed to "Arrived" or "Claimed", the "Expected on"
date is changed to the current date.
A bit of rewriting to get it to apply on master - chris@bigballowax.co.nz
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Matthew Hunt [Sun, 9 May 2010 21:20:10 +0000 (09:20 +1200)]
Display current selected category when editing lists.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Mon, 10 May 2010 16:21:58 +0000 (12:21 -0400)]
Fix for Bug 4475, AmazonLocale not used consistently
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Mon, 10 May 2010 13:32:44 +0000 (09:32 -0400)]
Markup corrections for validity and to eliminate horizontal scrollbar
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Mon, 10 May 2010 19:24:47 +0000 (15:24 -0400)]
Fix for Bug 4400, BIBTEX export from OPAC results in empty file
opac-export.pl tries to get two variables from marc2bibtex(),
but it only returns one.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Frédéric Demians [Sat, 8 May 2010 06:27:51 +0000 (08:27 +0200)]
Bug 4470 Patron search result pagination bar
Obviously, Koha global pagination function could be improved. This patch
do something which belongs to this function. A CPAN module like
Data::Page could help or be an inspiration... 3.4?
There is also room for improvement in they way resultset are
constructed. The whole set is retrieved and just a subset is displayed.
It impacts performances for libraries with a great number of patrons.
The right solution would be:
- to find the resultset size with SELECT COUNT(*)
- to retrieved the exact subset with LIMIT and OFFSET SQL arguments
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Colin Campbell [Sun, 9 May 2010 14:58:52 +0000 (15:58 +0100)]
Do not declare variables within (bogus) conditionals
if $index is unnecessary as we have made this true 5 lines above
variables should not be declared in conditionals if used outside of them
set $struct_attr to a sensible default to avoid generating warnings
in this assigment and elsewhere
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Chris Cormack [Mon, 10 May 2010 04:23:17 +0000 (16:23 +1200)]
Reserve and onloan were reporting the same cardnumber, due to a little bug in detail.pl fixed by this patch
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Fri, 7 May 2010 17:31:37 +0000 (13:31 -0400)]
Fix for Bug 3666, Overriding renewal limit means negative count in OPAC
Setting "renewalsleft" variable to zero if it comes out negative.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Fri, 7 May 2010 19:14:57 +0000 (15:14 -0400)]
Fix template errors introduced in my last patch for Bug 4208
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Jane Wagner [Wed, 7 Oct 2009 13:52:02 +0000 (09:52 -0400)]
Bug 3671 Workaround for font display problem
If there is no 007 field, parts of the OPAC results data display in a
much smaller font than normal. Adding a blank space in the span section
fixes it.
(cherry picked from commit
2ff55ef2a2443933881186323f5dec3fe40842dd)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 8 May 2010 22:59:41 +0000 (18:59 -0400)]
bug 4403: look in appropriate theme/lang for bib display XSL
Note: approach used can be described as a hack at best; the current
language should probably become a session attribute.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 8 May 2010 22:58:36 +0000 (18:58 -0400)]
fix disappearance of language chooser introduced in recent patch
Note that xt/author/valid-templates.t did *not* catch the
missing /TMPL_IF
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 8 May 2010 22:57:41 +0000 (18:57 -0400)]
quell 'non-initialized variable defaulttab' warning
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 8 May 2010 22:05:23 +0000 (18:05 -0400)]
fix malformed call of XSLTParse4Display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Wed, 5 May 2010 19:38:27 +0000 (15:38 -0400)]
Further corrections for Bug 4244, Use "checkouts" instead of "issues"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Tue, 4 May 2010 15:24:28 +0000 (11:24 -0400)]
Style changes to cart popup window more compact display: - compact holdings list - adds list bullet image from the staff client
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Nahuel ANGELINETTI [Wed, 10 Mar 2010 21:26:30 +0000 (22:26 +0100)]
(MT #2966) fix opac-user.pl function problem
This uncomment a uselessly commented function that is needed by opac-user. And fix this function that doesn't work properly.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Colin Campbell [Thu, 6 May 2010 17:13:36 +0000 (13:13 -0400)]
Bug 4450 Use more consistent error returns in C4/Creators/*
A lot of routines were defaulting to return -1 in error conditions
but calling code was expecting a ref or object
use return with explicit undef (or emptyness in array context)
for these cases. Extended this to cases where return was not tested
( -1 might in some cases be legit data).
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit
5cf2b78b6ffa401bc82b3f913c89828c38b8e4ed)
[RM note: ... thereby undoing the revert]
Frédéric Demians [Fri, 7 May 2010 05:37:17 +0000 (07:37 +0200)]
Bug 4465 Fixes translated boolean syspref inversion
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Fri, 7 May 2010 00:31:04 +0000 (20:31 -0400)]
another FSF address fix
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Fri, 7 May 2010 00:28:29 +0000 (20:28 -0400)]
fix two more instances of old FSF address
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Chris Cormack [Thu, 6 May 2010 22:03:10 +0000 (10:03 +1200)]
Adding new developers to the about page, need to do libraries next
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Chris Cormack [Thu, 6 May 2010 22:03:09 +0000 (10:03 +1200)]
Adding a new developer plus 2 new meetings to the history doc
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Thu, 6 May 2010 23:55:44 +0000 (19:55 -0400)]
exclude TinyMCE from non-UTF8 file checks
Since Koha otherwise had made no modifications to the TinyMCE,
we'll leave it alone.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Thu, 6 May 2010 23:46:51 +0000 (19:46 -0400)]
move misc source file test and fix scripts to xt/
The license and non-UTF8 file checks are closer to
author tests and don't really belong at the top level of the
Koha source tree. Follow-up might be to converted them
to test cases in xt/author that can be run by prove(1).
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Lars Wirzenius [Thu, 25 Mar 2010 22:11:05 +0000 (11:11 +1300)]
Add script to find source files that are not in UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Lars Wirzenius [Thu, 25 Mar 2010 22:11:11 +0000 (11:11 +1300)]
Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Lars Wirzenius [Thu, 25 Mar 2010 22:11:06 +0000 (11:11 +1300)]
Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Lars Wirzenius [Thu, 25 Mar 2010 22:11:07 +0000 (11:11 +1300)]
Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Lars Wirzenius [Thu, 25 Mar 2010 22:11:12 +0000 (11:11 +1300)]
Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Lars Wirzenius [Thu, 25 Mar 2010 22:11:08 +0000 (11:11 +1300)]
Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Thu, 6 May 2010 18:41:45 +0000 (14:41 -0400)]
Revert "Bug 4450 Use more consistent error returns in C4/Creators/*"
[Reverted per request of Chris Nighswonger - callers of the affected
methods need to be updated.]
This reverts commit
5cf2b78b6ffa401bc82b3f913c89828c38b8e4ed.
Colin Campbell [Thu, 6 May 2010 17:13:36 +0000 (13:13 -0400)]
Bug 4450 Use more consistent error returns in C4/Creators/*
A lot of routines were defaulting to return -1 in error conditions
but calling code was expecting a ref or object
use return with explicit undef (or emptyness in array context)
for these cases. Extended this to cases where return was not tested
( -1 might in some cases be legit data).
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Wed, 5 May 2010 18:25:58 +0000 (14:25 -0400)]
Further fixes for Bug 4208, Many submit buttons are not translatable in 3.2
Again, not a fix for a submit button problem, but for a problem with
TMPL_IFs nested inside tags, a practice which will break the
translation script.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Wed, 5 May 2010 16:11:30 +0000 (12:11 -0400)]
fixed Syndetics breakage
Reverts part of commit
7b12e07 that removed references
to the Syndetics sysprefs in C4::Auth for no apparent reason.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Ian Walls [Wed, 5 May 2010 15:14:54 +0000 (15:14 +0000)]
Fixes bug 4448: &'s in itemcallnumber
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Wed, 5 May 2010 14:50:38 +0000 (10:50 -0400)]
Fix for Bug 4416, renew all and return all buttons too close together
This patch removes the "return all" button altogether. Returning all items
is a step which one wouldn't take lightly or even regularly. Since the
interface has a means of selecting all checkboxes in the "Check in" column,
removing the "Return all" button wouldn't eliminate the means of doing so, it
would just require more deliberation.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Wed, 5 May 2010 14:09:40 +0000 (10:09 -0400)]
Fix for Bug 4453, Improve formatting of batch item operations
- includes fix for Bug 4443
- includes some string changes, could resubmit without if these
changes block inclusion in 3.2
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Wed, 5 May 2010 14:15:49 +0000 (10:15 -0400)]
Fix for Bug 2375, Serials holdings data does not display in opac-detail
- Removing markup to display serial data in the holdings table
This functionality (if it worked) would seem to duplicate
the data displayed under the 'Subscriptions' tab
- Revised again to merge item status display changes
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Ian Walls [Wed, 5 May 2010 14:04:17 +0000 (14:04 +0000)]
Fixes bug 4452: CircControl syspref listed as ItemHomeBranch rather than ItemHomeLibrayr
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Koustubha Kale [Fri, 19 Mar 2010 07:26:06 +0000 (12:56 +0530)]
Changes to kohastructure.sql to add some missing drop if exists + change in install.pl mysql show tables
[RM note: bug 4323]
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Koustubha Kale [Thu, 18 Mar 2010 16:16:02 +0000 (21:46 +0530)]
Web Installer -> Step 3 --> ERROR 1050 (42S01) at line 301: Table 'branch_item_rules' already exists
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Wed, 5 May 2010 13:27:20 +0000 (09:27 -0400)]
fix template translation issues
Alternative to Henri-Damien's patch that does not
require putting CSS style information in the Perl code.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Kyle M Hall [Tue, 4 May 2010 16:33:46 +0000 (16:33 +0000)]
Fixed Patron Search Results
By default, the patron search was pulling results in *Descending* order,
then reordering the results on the page using javascript in *Ascending* order.
This was causing screwy results where the entire list of results of multiple
pages was not in complete alphabetical order.
Fixed by changing the SQL to pull in Ascending order.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Thu, 25 Feb 2010 14:43:15 +0000 (09:43 -0500)]
Use CSS3 box-shadow property for Cart tooltip
The OPAC Cart tooltip ("Your cart is empty," "1 item(s) added to your
Cart") currently uses a jQuery plugin to generate a drop shadow.
This works cross-browser, but has a high failure rate with regard
to hiding the shadow consistently, resulting in an orphan shadow
after the tooltip has been hidden. I propose to instead use the
new CSS3 property "box-shadow" (-moz-box-shadow and -webkit-box-
shadow for FireFox and Safari/Chrome). Currently Internet Explorer
does not support this property. I think this is an
acceptable tradeoff for more stable functionality.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Tue, 4 May 2010 15:13:22 +0000 (11:13 -0400)]
release notes updates suggested by Nicole Engard
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Tue, 4 May 2010 13:29:08 +0000 (09:29 -0400)]
start of release notes for 3.2
NOTE: this is not exhaustive; please send me additions for
features you have written.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Tue, 4 May 2010 12:36:21 +0000 (08:36 -0400)]
fix various errors reported by xt/author/translatable-templates.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Tue, 4 May 2010 11:57:51 +0000 (07:57 -0400)]
copy new NPL icons from OPAC to staff
Fixes problem found by xt/author/icondirectories.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Tue, 4 May 2010 11:50:34 +0000 (07:50 -0400)]
fix template structure error found by xt/author/valid-templates.t
Also fixed XHTML validity error
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Nicole Engard [Sat, 1 May 2010 20:38:48 +0000 (16:38 -0400)]
bug 4442 rename batch edit tools
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Colin Campbell [Mon, 3 May 2010 16:33:37 +0000 (17:33 +0100)]
Bug 4151 - Add DateTime to Perl dependencies
Used in Sip.pm
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Owen Leonard [Mon, 3 May 2010 13:58:20 +0000 (09:58 -0400)]
Fix for Bug 4436, reserve should say 'hold'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Garry Collum [Tue, 13 Oct 2009 00:29:53 +0000 (20:29 -0400)]
Bug 2889: Added zebra striping to the table in dictionary.tmpl.
Also fixed a couple of minor XHTML errors.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Colin Campbell [Fri, 26 Mar 2010 16:41:28 +0000 (16:41 +0000)]
Bug 2889 Remove toggle in boraccount display
Also remove the reverse column if no contents to be displayed
( otherwise looks like a markup error )
Rationalize the main loop now toggle not required
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Mon, 3 May 2010 13:18:58 +0000 (09:18 -0400)]
followup - update SCO to recognize ITEMNOTSAMEBRANCH
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Michael Hafen [Tue, 30 Mar 2010 20:58:50 +0000 (14:58 -0600)]
on checkout ask for confirmation if borrower from different branch
With IndependantBranches on check that the borrower is from the same branch as
the librarian. If not then ask for confirmation. This check is skipped for
SuperLibrarians.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Ian Walls [Mon, 5 Apr 2010 17:00:02 +0000 (17:00 +0000)]
Fixes bug 4369: Local use does not update datelastseen
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Mon, 3 May 2010 11:46:33 +0000 (07:46 -0400)]
Merge branch 'bug4036' of git://git.librarypolice.com/git/koha-galen into to-push
Galen Charlton [Sat, 1 May 2010 16:43:07 +0000 (12:43 -0400)]
bug 4036, 4405: overdue and fine day block improvements
* Adopted wording suggested by Kyle Hall for the
USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE circulation blocks
* Updated IsMemberBlocked so that if a patron has accrued
fine days, that will be tested for first before testing
to see if the patron has current overdue items; this solves
a problem introduced in the patch series for bug 4505 where
accrued fine days would be ignored if (a) the patron has
current overdue items but (b) the library has chosen to
set the OverduesBlockCirc syspref to noblock.
* Now correctly assigns the USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE
blocks; prior to this patch, they had been swapped.
FIXME: IsMemberBlock ought to be split into two functions
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 16:08:17 +0000 (12:08 -0400)]
bug 4429: do not include items due today in overdue count
Use curdate() instead of now() in GetMemberIssuesAndFines.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 15:58:23 +0000 (11:58 -0400)]
bug 4036: do not count item overdue if it is due today
* use curdate() instead of now() to test whether item is overdue
* enhanced POD of IsMemberBlocked
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 18:32:44 +0000 (14:32 -0400)]
bug 4396: remove reerences to bi_notforloan
These were causing the OPAC details place hold button to disappear
in circumstances where a bib-level item type was set to a non-loanable
item type even when item-level_itypes was on.
This change does mean that if item-level_itypes is not turned on,
the hold button will now appear for bibs whose bib-level item type
has its not-for-loan flag set; however, if this is a problem, a
better long-term fix would be to use CanBookBeReserved() instead.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 18:15:42 +0000 (14:15 -0400)]
simplify logic for displaying item status
Flatten the tmpl_if tree for determining the item status
to display and tweaked the order in which statuses are checked to
1. (circ reality) item on loan
2. (circ reality) item in transit
3. (circ reality) item wating at hold shelf
4. (item status that makes circ impossible) item withdrawn
5. (item status that makes circ impossible) item lost
6. (policy that implies no circ but in-house use possible) item not-for-loan per item
7. (policy that implies no circ but in-house use possible) item not-for-loan per item type
8 (item status that *might* affect circ) damaged
8. (fallback) item available
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 18:02:32 +0000 (14:02 -0400)]
bug 4396: clarify return of itemtype-level notforloan flag
* GetItemsInfo now includes a notforloan_per_itemtype key
with the value of the item type's notforloan setting, correctly
set based on the value of the item-level_itypes syspref
* Adjusted OPAC details item status display to use that
notforloan_per_itemtype key
NOTE: one of the assumptions of item-level_itypes is that
you can have either bib-level item types or item-level
item types, but not both in the same database. In particular,
it does not establish a hierarchy where Koha checks the
item-level itemtype first, then the bib-level.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 17:40:20 +0000 (13:40 -0400)]
bug 4396: create new OPAC template include for item status
As part of preparing to work on bug 4396 (item level item types not
working correctly when biblioitem-level item type is not for loan),
moving the item status template logic to a separate include to make
it easier to work with.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Chris Cormack [Sun, 2 May 2010 21:54:54 +0000 (09:54 +1200)]
Adding another developer to the history
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Garry Collum [Sun, 2 May 2010 01:25:02 +0000 (21:25 -0400)]
Bug 4432: Fixes XHTML in serials-edit.tmpl.
Replaces a reference to an undefined variable, num, with a defined variable to create unique ids.
Also adds zebra striping to the table.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Garry Collum [Sun, 2 May 2010 00:25:31 +0000 (20:25 -0400)]
Bug 4200: Fixes adding a member to a routing list after filtering results.
Adds a hidden field for subscriptionid to the filter form.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Garry Collum [Sat, 1 May 2010 23:37:06 +0000 (19:37 -0400)]
Bug 3883: Fixes blank line in routing list.
The blank line was being caused by the SELECT statement in the getroutinglist fuction of C4::Serials. The LEFT join in the select statement was creating a single row result of NULL. Changed the LEFT join to an INNER join.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 14:48:25 +0000 (10:48 -0400)]
bug 4505 followup - template changes
* fix syntax error
* adjust wording - "patron" instead of "borrower"
* handle case where overdue items should require
confirmation of loan by operator
* fix typo in system preference template
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 14:42:39 +0000 (10:42 -0400)]
bug 4505 followup: fixes to database update
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 14:36:39 +0000 (10:36 -0400)]
bug 4405 followup - fix typo
As much as circ staff may want to block circulation to
over-rude patrons, Koha probably shouldn't be trying to make
that determination on its own. :)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Chris Cormack [Sun, 25 Apr 2010 22:30:55 +0000 (10:30 +1200)]
Bug 4405 - Overdues block check out
[Documentation note by RM:
This patch adds a new system preference, OverduesBlockCirc,
that can take one of three values:
- noblock: checkouts permitted even if patrons
have overdue items (default)
- confirmation: circ operator asked to confirm checkout
- block: checkouts to patrons who have overdue
items are forbidden
]
Squashed commit of the following:
commit
6a1f66e0686a14d8a89abfc3fe5978dabd0b7af7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date: Mon Apr 26 10:27:39 2010 +1200
Tidy up ready to send patch
commit
4d1398df18dcce4fd888cf17a0e2955fdf6ee1e4
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date: Mon Apr 26 10:26:15 2010 +1200
Bug 4405 - tidy up
commit
3daeb71bc6b690e18dda96aa3c767c2bb0521038
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date: Mon Apr 26 10:02:04 2010 +1200
Bug 4405 - Overdues block checkout
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Henri-Damien LAURENT [Fri, 30 Apr 2010 22:19:53 +0000 (00:19 +0200)]
(bug #4319) allow reserves on waiting items
This add a function to check the reserve status, and add a check in IsAvailableForItemLevelRequest() to allow request on items that are waiting
Conflicts solved:
C4/Reserves.pm
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 13:44:29 +0000 (09:44 -0400)]
fix DBrev 132
* renamed index; there was already an index named 'lang' on language_description
* removed reference to ersataz DB rev number
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Henri-Damien LAURENT [Fri, 30 Apr 2010 22:19:51 +0000 (00:19 +0200)]
Performance enhancing DBRev:132
Adding an index on language_descriptions table in order to boost searches
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Paul Poulain [Fri, 30 Apr 2010 22:19:49 +0000 (00:19 +0200)]
MT3228 : trailing space block search
Removing trailing searchs befor operands which block searches
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Galen Charlton [Sat, 1 May 2010 13:16:22 +0000 (09:16 -0400)]
fix description of DB rev 131
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Henri-Damien LAURENT [Fri, 30 Apr 2010 22:19:48 +0000 (00:19 +0200)]
Transport_type print missing
This type is quite important for all the print notices
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Henri-Damien LAURENT [Fri, 30 Apr 2010 22:19:47 +0000 (00:19 +0200)]
MT3346 : overdue_notices
-csv was not working as advertised.
This feature is now working as it is forecast
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Henri-Damien LAURENT [Fri, 30 Apr 2010 22:19:46 +0000 (00:19 +0200)]
MT3438 : faulty subscription-add branch selection
branch selection could lead to two branches selected
this patch removes the faulty line
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Henri-Damien LAURENT [Fri, 30 Apr 2010 22:19:45 +0000 (00:19 +0200)]
MT3499 : cataloguing authid not reported
authid would not be correctly updated in bibliorecord.
Biblio record would not receive the correct authid in subfield 9
but some erroneous data
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Paul Poulain [Fri, 30 Apr 2010 22:19:44 +0000 (00:19 +0200)]
MT3448 : searchauthorities problems
Problems with searching authorities :
The same index was always used
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Matthias Meusburger [Fri, 30 Apr 2010 22:19:43 +0000 (00:19 +0200)]
MT3440: Display only borrower's messages in borrower's profile
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>