Commit graph

14497 commits

Author SHA1 Message Date
Katrin Fischer
3b297b0e44 Bug 6305: Subscriptions can not be edited
This seems to fix the problem with editing existing subscriptions. Please test.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-06 08:32:04 +12:00
Chris Cormack
dcf5333021 Merge remote-tracking branch 'kc/master' into new/bug_6350 2011-07-05 15:16:29 +12:00
Chris Cormack
1209d9774d Bug 6350 Updating history 2011-07-05 15:16:09 +12:00
Chris Cormack
a5c8c2580e Bumping database version 2011-07-05 15:03:34 +12:00
Francois Marier
d50d4568e2 Bug 6298 : Add optional dependency on Gravatar::URL 1.03
This CPAN module is needed for the ShowReviewerPhoto functionality.

Unfortunately the version in Squeeze (1.02) is not sufficient so it
has to be installed from CPAN:

  sudo apt-get install libnet-dns-perl libtest-warn-perl
  sudo cpan Gravatar::URL

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 15:01:14 +12:00
Francois Marier
413f306961 Bug 6298 : Create new ShowReviewerPhoto preference
This new system preference (in OPAC Features) allows libraries to
turn off reviewer photos entirely if they want to. The default is
for these photos to be shown.

Note that this setting is linked to ShowReviewer in that both of
them need to be turned ON for the avatars to be displayed.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 15:01:13 +12:00
Francois Marier
4d90c13eea Bug 6298 : Hide avatars when ShowReviewer is off
As suggested by Nicole, when a library hides the names of the
reviewers, they probably don't want to show their faces.

The OPAC detail page was already hiding these avatars but this
change also prevents Koha from looking for these avatars (which
could incur DNS queries) if they're not going to be displayed.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 15:01:12 +12:00
Francois Marier
f44b674ed5 Bug 6298 : Show avatars on the recent comments page
Add smaller Libravatar-based images to the recent comments page.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 15:01:10 +12:00
Francois Marier
d3990031ed Bug 6298 : Add avatar picture of comment author in OPAC
Use Libravatar::URL to pull the avatar picture for comment authors
if we have an email address for them.

Signed-off-by: Francois Marier <francois@debian.org>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 15:01:09 +12:00
Liz Rea
313ab0dfe9 Bug 6313 -- Adding option to "attach another item" when finished attaching items
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 14:59:12 +12:00
JAMES Mason
2e8fe364cb Bug 6411 add another example to README.robots
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 14:48:05 +12:00
Janusz Kaczmarek
e653e8ce0b Bug 6470 - Unable to filter out log entries for kohaadmin (user 0)
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 11:22:46 +12:00
Jesse Weaver
048c0dc04e Bug 6492 - Deleted biblios cause rebuild_zebra to fail
This both adds a bit of a failsafe to get_raw_biblio, and prevents
records that have been deleted from being updated by the same instance
of rebuild_zebra.

Minor amendment to remove duplication of 6433

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 11:18:28 +12:00
Chris Nighswonger
ae48ebbcaa Bug 5379 - import_borrowers.pl fails with db insert/update errors
Some spreadsheet programs use smart quotes which causes the db to throw
an error when an insert/update is attempted due to improper processing
of the CSV file. This patch adds code to check for smart quotes and change
them to "dumb" quotes.

This patch also adds more logging of errors and a notice to the user to check
the logs for errors when they occur.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-05 11:15:00 +12:00
36c8531394 Fix for Bug 6543 - Column hiding on batch item edit/delete not working
T:T variable name problem.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-03 15:53:31 +12:00
Frère Sébastien Marie
8ad4fa34c1 Bug 6549 : sco-main.pl: Parentheses missing around "my" list
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-03 09:00:16 +12:00
Magnus Enger
610457ea41 Bug 6450 - No check in/check out messages in message_queue
Huge thanks to Katrin Fischer for spotting what was the trouble here!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-03 08:55:49 +12:00
Chris Cormack
3f02084164 Bumping database version number 2011-07-03 08:52:48 +12:00
Chris Cormack
67a560e643 Bug 5199 : Followup patch, fixing a bug with NULL option
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-03 08:48:52 +12:00
Chris Cormack
d6854931c1 Bug 5199 : Adding a syspref to control recording of branch code in OPAC renewals
Syspref allows the user to chose between the
Items home branch
Patrons home branch
Branch the item was checked out from
NULL
or OPACRenew

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-03 08:48:09 +12:00
Magnus Enger
9efdfa1ba2 Bug 6510 - [REVISED] Sort by in intranet search alters search and number of hits
This patch uses .*? instead of .*

To test:
- In advanced search in the intranet choose Author as the search index
- Do a search for an author, check the number of hits
- Choose another value than the default from Sort by
- Check that the number of hits is the same as for the original search, once
  the hits have been re-ordered

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-26 08:23:21 +12:00
Robin Sheat
218a35776e Bug 6526 - make the reserves code use the borrowernumber
Previously it used the cardnumber, which caused numerous issues if your
users don't have card numbers.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-26 06:44:14 +12:00
Jared Camins-Esakov
77462a7e2d Bug 6103: MARC21 fields missing index for CCL
Due to misconfigurations in record.abs, author fields other than 100 and most
title fields cannot be searched using CCL field prefixes. This patch adds the
appropriate indexes on 110, 111, 130, 210, 211, 212, 214, 222, 700, 710, 711,
730, 740, 780, and 785. It also adds a missing Title-later bib1 attribute.

NOTE: The files etc/zebradb/marc_defs/marc21/biblios/record.abs and
etc/zebradb/biblios/etc/bib1.att were both modified, and will have to be updated
on dev installations. The database will need to be reindexed to take advantage
of the updated indexes.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-26 06:12:45 +12:00
MJ Ray
20bd7f851f Added LSB information and copyright headers to two scripts in misc/bin. Thanks to Mahesh T Pai <paivakil@gmail.com> for the mailing list post Message-ID: <87y60x10de.fsf@gmail.com> containing them.
http://bugs.koha-community.org/show_bug.cgi?id=4406

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-26 02:39:08 +12:00
Robin Sheat
785af7310d Bug 6521 - allow blank cardnumbers to not trigger "already in use"
Now a blank cardnumber will get stored as a null in the database, which
is a value that allows duplicates. As such, if cardnumbers aren't
mandatory, then you can actually save a user with it being blank.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-26 02:26:11 +12:00
daf2190a55 Alternate fix for Bug 6522 - search result list broken
- Adding back the colspan removed in a previous commit
- Correcting the scope of two template variables.

Before applying this patch, the search results page in the
staff client will have misaligned headers if AmazonCoverImages
is turned off. After applying this patch headers should
appear correctly with AmazonCoverImages on or off.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-26 02:17:40 +12:00
Ian Walls
26965cf1df Bug 6525: hold filled emails not going out
When the message name was updated from "Hold Filled" to "Hold_Filled" for T::T compatibility,
the line in _koha_notify_reserve that looked up the letter code by the message name no longer
matched, so none of the messages were sent.  This patch just replaces the space with an underscore
to get the names aligned properly.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-25 01:53:39 +12:00
Frédérick Capovilla
59c42cd7f3 Bug 6453 Corrects the barcode comparisons in inventory.pl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-20 11:59:50 +12:00
65d4d3c9b0 Fix for Bug 6501 - missing scroll bar when updating child
- Adding "scrollbars=yes" to window.open javascript.
- Adding javascript tablesorter to categories table

To test, open a child patron record and choose more ->
Update Child to Adult Patron from the toolbar menu. The
resulting pop-up should have scrollbars. The table
of categories should be sortable with a default sort
on the description.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-20 11:51:22 +12:00
Chris Cormack
c78608483e Merge remote-tracking branch 'kc/new/bug_6497' into kcmaster 2011-06-19 22:14:15 +12:00
Ian Walls
59ac64db97 Bug 6497: MARC URLs not showing up in details pages under normal view
Part one:  followup to the original patch.  The variable name for the URL itself was wrong, so despite
getting the link to show up, the href was the catalog page itself, NOT the 856$u.  Updating "MARCurl.MARCurl"
to "MARCurl.MARCURL" fixes this issue.

To test:  go to the OPAC, and see that the URL in the link is the same as the URL in the MARC

Part two:  this problem is present on the staff side, as well.  This patch implements both parts of the fix
(renaming "MARCurlS" to "MARCURLS" and "MARCurl.MARCurl" to "MARCurl.MARCURL")

To test:  go to the staff client, and check that a)URLs show up and b)they link to the URL in the MARC record

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-19 22:13:40 +12:00
Chris Cormack
126d6247b2 Bug 6518 : Fixing XSS issues on opac
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-19 22:07:30 +12:00
Chris Cormack
99a7916b11 Bug 6350 : Updating history 2011-06-17 15:15:08 +12:00
Chris Cormack
c6ac616793 Merge remote-tracking branch 'kc/new/bug_5094' into kcmaster 2011-06-17 15:07:18 +12:00
Jeremy Crabtree
7bb178e30b Bug 5094 auth_by_bind authentication can fail even if given a correct password and userid
When using

<replicate>0</replicate> <!-- add new users from LDAP to Koha database -->
<update>0</update> <!-- update existing users in Koha database ->
<auth_by_bind>1</auth_by_bind> <!-- set to 1 to authenticate by
binding instead of password comparison, e.g., to use Active Directory -->

Auth_with_ldap attempts to lookup the userid in the LDAP directory to
fill $userldapentry despite it being unneeded in this case.  The information
retrieved will be thrown away, thus there is no need to retrieve it.
This can cause authentication to fail overall even if the initial bind with the
user's credentials succeeded

Signed-off-by: Joe Atzberger <ohiocore@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-17 15:05:59 +12:00
Ian Walls
8996faae15 Bug 6512: time missing from item circulation history
Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but
the value was never actually called into the template.

This patch also moves the time to the right side of the date, and removes the ??:?? default,
because otherwise, it's just silly

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-17 14:42:29 +12:00
Ian Walls
fbfb68a444 Bug 6512: time missing from item circulation history
Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but
the value was never actually called into the template.

This patch also moves the time to the right side of the date, and removes the ??:?? default,
because otherwise, it's just silly

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-17 14:36:07 +12:00
Dobrica Pavlinusic
322a5ef481 Bug 4993 checkpw_ldap - do bind just once
When using auth_by_bind, search was always done as anonymous user.
This is a problem if we want to fetch LDAP values which have ACL
permissions only for users.

This change moves bind from search_method back into checkpw_ldap,
making code cleaner and easier to understand

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-17 14:32:47 +12:00
Chris Cormack
abdd5e8ced Bug 5714 follow up removing the debugging message 2011-06-15 12:10:20 +12:00
Jonathan Druart
a11bf74df9 Bug 6061: clearing up system preference on update
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-14 14:16:48 +12:00
3b8f1318e0 Bug 6050 Followup, edit a last function call
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-14 14:12:05 +12:00
Colin Campbell
2ab00242d0 Bug 6050 Make calls to GetItemsInfo consistent
Do not misleadingly document or pass an unused second parameter
makes all calls use the single parameter call as the C4
routines already did

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-14 14:12:02 +12:00
Ian Walls
b5dcd096bf Bug 6497: MARC URLs not showing up in OPAC detail page with XSLT off
Renames T:T variable to match what's exported from opac-detail.pl.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-14 09:36:12 +12:00
Chris Cormack
2e1c8ec139 Bumping database number 2011-06-13 11:47:10 +12:00
Chris Cormack
21c8a87b78 Merge remote-tracking branch 'kc/new/bug_5860' into kcmaster 2011-06-13 11:46:12 +12:00
a3717c1fe9 5860 Fixing stocknumber index
Fixing code for 3.3.0.42 update.
Adding code at end of update script if install past that point already.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-13 11:36:33 +12:00
Frédérick Capovilla
f6486e6390 Bug 5684 : Remove all items fields from a Z39.50 record imported for acquisition.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-13 11:21:13 +12:00
Katrin Fischer
ab60ba41ce Bug 5653: Follow-up, correction to nb-NO sample creator data
Corrects callnumber to itemcallnumber in Norwegian sample data.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-13 11:16:12 +12:00
d2f49e1976 bug 5653: use itemcallnumber in bib label layouts
The sample bib label layouts and the hard-coded default
format_string for new layouts used 'callnumber' when they
should have used 'itemcallnumber', preventing call numbers
from being printed on spine labels that use the system-supplied
layouts.  Besides correcting the sample data, this patch
now also enshrines 'callnumber' as an alias for 'itemcallnumber'.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
After applying patch it works for new and old layouts (itemcallnumber and callnumber).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-13 11:15:34 +12:00
Fridolyn SOMERS
98f2780227 BUG4319 waiting items cannot be reserved
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-13 11:08:47 +12:00