Commit graph

12091 commits

Author SHA1 Message Date
Lars Wirzenius
3e7e386148 Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 17:58:24 -04:00
84c2db9f6d 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 5cf2b78b6f.
2010-05-06 14:41:45 -04:00
Colin Campbell
5cf2b78b6f 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>
2010-05-06 14:25:43 -04:00
5f7946e4d8 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>
2010-05-06 11:50:52 -04:00
46737a702c 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>
2010-05-05 12:11:30 -04:00
Ian Walls
b86e4e5700 Fixes bug 4448: &'s in itemcallnumber
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:35:34 -04:00
37e9cbc042 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>
2010-05-05 11:17:21 -04:00
7b11d2a281 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>
2010-05-05 11:14:07 -04:00
5d921cf51d 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>
2010-05-05 11:14:03 -04:00
Ian Walls
74afd1ca8e 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>
2010-05-05 10:14:48 -04:00
Koustubha Kale
1edd99e6fa 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>
2010-05-05 10:11:00 -04:00
Koustubha Kale
e33e05c460 Web Installer -> Step 3 --> ERROR 1050 (42S01) at line 301: Table 'branch_item_rules' already exists
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 10:06:49 -04:00
9329c40b6b 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>
2010-05-05 09:28:08 -04:00
Kyle M Hall
3a5b075c90 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>
2010-05-05 08:57:04 -04:00
6969fefe4c 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>
2010-05-04 11:19:03 -04:00
67be4bd118 release notes updates suggested by Nicole Engard
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 11:13:22 -04:00
a2e6c16ecc 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>
2010-05-04 09:29:08 -04:00
38b16e34fd fix various errors reported by xt/author/translatable-templates.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 08:36:21 -04:00
9cb86aec3b copy new NPL icons from OPAC to staff
Fixes problem found by xt/author/icondirectories.t

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 07:57:51 -04:00
717223a236 fix template structure error found by xt/author/valid-templates.t
Also fixed XHTML validity error

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 07:50:34 -04:00
Nicole Engard
bf380b8964 bug 4442 rename batch edit tools
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 14:00:17 -04:00
Colin Campbell
1823eb0bbf Bug 4151 - Add DateTime to Perl dependencies
Used in Sip.pm

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 13:14:14 -04:00
4bfeac67ed Fix for Bug 4436, reserve should say 'hold'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 10:09:29 -04:00
Garry Collum
84dada43d3 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>
2010-05-03 09:24:03 -04:00
Colin Campbell
cb031bace9 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>
2010-05-03 09:20:50 -04:00
49eb7b7a68 followup - update SCO to recognize ITEMNOTSAMEBRANCH
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:18:58 -04:00
Michael Hafen
ea0c76af7f 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>
2010-05-03 09:17:19 -04:00
Ian Walls
2d3722b5a3 Fixes bug 4369: Local use does not update datelastseen
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:04:23 -04:00
d08cd6bfc0 Merge branch 'bug4036' of git://git.librarypolice.com/git/koha-galen into to-push 2010-05-03 07:46:33 -04:00
d575278cba 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>
2010-05-03 07:46:26 -04:00
a445e956eb 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>
2010-05-03 07:46:25 -04:00
2568e165e6 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>
2010-05-03 07:46:25 -04:00
7bfd0461d4 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>
2010-05-03 07:45:19 -04:00
0c39f1ac9b 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>
2010-05-03 07:45:19 -04:00
96a70655aa 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>
2010-05-03 07:45:19 -04:00
eb0196cda3 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>
2010-05-03 07:45:19 -04:00
Chris Cormack
f90995bb96 Adding another developer to the history
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:43 -04:00
Garry Collum
caec9fae40 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>
2010-05-03 07:35:41 -04:00
Garry Collum
d2d2acd4a6 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>
2010-05-03 07:35:40 -04:00
Garry Collum
fbd04fab63 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>
2010-05-03 07:35:38 -04:00
b7a5bbefe8 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>
2010-05-01 10:59:05 -04:00
b06c59e6ca bug 4505 followup: fixes to database update
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:42:39 -04:00
50dc9e5cf8 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>
2010-05-01 10:39:11 -04:00
Chris Cormack
86fbe2ec21 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>
2010-05-01 10:39:11 -04:00
Henri-Damien LAURENT
2a0c82652b (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>
2010-05-01 10:27:27 -04:00
39c4304d96 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>
2010-05-01 09:50:35 -04:00
Henri-Damien LAURENT
1ee67a5d19 Performance enhancing DBRev:132
Adding an index on language_descriptions table in order to boost searches

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:50:35 -04:00
Paul Poulain
4cc7b7e59d 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>
2010-05-01 09:50:34 -04:00
5bf4d52364 fix description of DB rev 131
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:16:50 -04:00
Henri-Damien LAURENT
2aca9f26e3 Transport_type print missing
This type is quite important for all the print notices

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:11:56 -04:00