Commit Graph

14369 Commits

Author SHA1 Message Date
Marcel de Rooy 7aeccb7ec2 6290: Fix warning on XSLT.pm
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 04e97b57ff)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:51:03 -04:00
Colin Campbell 06a38274ca Bug 6280 : Don't generate invalid SQL in GetPendingIssues
Change to parameter list in GetPendingIssues made it
callable by an empty list resulting in invalid sql being
sent to server. As this was occuring on most issues error log
was filling up. Put safeguard in the routine
Also don't bother calling when you have no need

Some of the processing was needlessly obscure

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>
(cherry picked from commit c435c8c7d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:50:45 -04:00
Owen Leonard a94bf07f5e Fix for Bug 6260 - Missing space in availability information of OPAC XSLT results
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6a1b7a3321)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:50:04 -04:00
Frédérick Capovilla 4058142f3e Bug 6235 : Corrects the behaviour of the humanmsg box on IE8 and IE7.
Without this fix, the black box that appears when you save system
preferences doesn't disappear on IE.

Fix from http://code.google.com/p/humanmsg/issues/detail?id=1
(Thanks Owen Leonard)

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>
(cherry picked from commit 661bcfadbd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:49:40 -04:00
Juan Romay Sieira 7cb450bef9 Bug 6144 - Cant hide constraints when showed at subfield edition
Reformatted for Template::Toolkit

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 75ce3b73fa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:49:07 -04:00
Sophie Meynieux 9e03bb0edc Bug 6078: Request to find borrowers without issues overload the server
Optimization of the SQL request using NOT EXISTS instead of NOT IN

BibLibre MT5946

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>
(cherry picked from commit e1370001c6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:48:49 -04:00
Jane Wagner 36523ea36a Bug 6034 - Shelving cart feature can wipe permanent shelving location in certain circumstances
Bugfix for problems when shelving cart used without In Processing settings

To test, with InProcessingToShelvingCart off, NewItemsDefaultLocation blank,
and ReturnToShelvingCart on, create a new item.  Check the contents of the
location and permanent_location fields in its item record -- the same value
should be in both.  Then run the item through checkin, and look at those fields
again.  The location field should now be set to CART while permanent_location
should still have the original value.  After the cart_to_shelf cron job runs
with the proper timing, check the item record again.  Both location and
permanent_location should again be identical.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2bb9904ab3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:48:28 -04:00
Owen Leonard ff12161982 Fix for Bug 6534 - Duplicate opac renew buttons at the top of the checkouts list
This patch uses JS to add two links to the top of the checkouts
table: renew selected and renew all. Clicking each one submits
the respective form.

Also added is a small validation routine to warn the user if
they try to "renew selected" without having checked any boxes.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7093f075a7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:43:31 -04:00
Marcel de Rooy 608e17fb96 5660 Webinstaller should check if KohaOpacLanguage exists in staff
Rebased on April 27 for master (3.05.00.001).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Signing off on the whitespace changes made by Paul

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 240edb6c0d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:43:01 -04:00
Liz Rea 627d5683a7 Bug 6527 - Table striping not working on cataloguing search
Resolves TT issue causing the results list in cataloguing search (addbooks.pl) to not be
striped.

To test:
More -> Cataloging
do a search

Without patch:
results will not alternate striping as originally intended.

With patch:
Results will be alternating white/grey.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 68a3b6cd90)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:42:46 -04:00
Jean-André Santoni 8a6278251e Bug 5639 (MT #3605) Fix escaping in ILSDI
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2c88e1e0f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:37:48 -04:00
Robin Sheat cb0862db67 Bug 5072 - prevent creating new orders if there are no valid budgets
On the basket editing screen, the links to add orders to a basket are
hidden unless a valid fund is available.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4833fd8399)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 22:44:06 -04:00
Chris Cormack 1410123f6d Bug 5072 : Template changes
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5b05ab8bf1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 22:43:49 -04:00
MJ Ray 270384df32 Bug 5468: removin apt-get-debian-lenny and updating INSTALL.debian
install_misc/apt-get-debian-lenny.sh: obsolete, causing problems and a questionable practice, so deleted INSTALL.debian: updated to use debian.packages instead and cite more related docs

Amended following feedback comment #6 from Robin Sheat <robin@catalyst.net.nz>

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a9d24af470)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 22:43:25 -04:00
Frère Sébastien Marie 16eb069c92 Bug 5131 :restrict use of sort_by value to allowed values
The user input for sort_by value was used without care, resulting the possibility for user to set any Template Variable to 1.

This patch restrict the values to sort field.
The list of allowd_sortby was taken from 'includes/resort_form.inc'.

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>
(cherry picked from commit 649573ad24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 22:42:59 -04:00
Srdjan Jankovic 087c658d19 bug_4415: Copy parent contact details to child when adding Let child details be managed separately
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 33a9aec802)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 18:30:11 -04:00
Frédérick Capovilla 18160fa5e2 Bug 5737: Modified the merge subroutine in AuthoritiesMarc.pm so it won't destroy the connection to the biblioserver.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 94700d65c0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 18:29:55 -04:00
Owen Leonard 90df8fef9a Fix for Bug 6635, Can't page through results in label batch
- Fixing T:T scope issue
- Correcting footer include for pop-up windows.
- Markup correction for validity.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dd208da05a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 18:29:30 -04:00
Robin Sheat 54abc8e5f3 Bug 6540 - [SIGNED-OFF] fix some command-line args issues
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e7cf2223e0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:02 -04:00
Magnus Enger e871a3faf3 Bug 6540 - Add config file as command line option for koha-create
Order of precedence for config options, from lowest to highest:

1. The defaults set in koha-create itself
2. /etc/koha/koha-sites.conf
3. Config file specified with --configfile
4. Individual options set with --marcflavor, --zebralang, --defaultsql

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b66c860d5d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:02 -04:00
Magnus Enger 7d99f048a4 Bug 6540 - Add defaultsql command line option
This will override the setting in /etc/koha/koha-sites.conf.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bddca6fbcf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:01 -04:00
Magnus Enger 565ed0c6a4 Bug 6540 - Followup patch adding command line options
This adds the --marcflavor and --zebralang commandline options, as
well as short versions of all options.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c7bde29718)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:01 -04:00
Magnus Enger c50c0a6718 Bug 6540 - Make ZEBRA_MARC_FORMAT and ZEBRA_LANGUAGE configurable for koha-create
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b7b36796f5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:01 -04:00
Liz Rea 0e69ac52cf Bug 6643 -- Able to download patron card batches as an unauthorized user
Making sure permissions are checked on label creator

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 09da79616e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:40:04 -04:00
Liz Rea 509dd80ef0 Bug 6641 -- Specially crafted URL can allow unauthorized download of MARC files from staff client
Making sure permissions are checked on download of MARC files from staff client

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7ad49e0cae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:39:47 -04:00
Chris Cormack a11287a6a4 Bug 6642 : Making sure permissions are checked on label creator
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9d5d1f8f96)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:39:33 -04:00
Stéphane Delaune d5a8cb1b42 Bug 6135: insert fields ordered in C4::biblio:ModBiblioMarc
Fixing order subfields for biblionumber and biblioitemnumber

BibLibre MT5951

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 97964bc3e9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:39:18 -04:00
Colin Campbell d17fc11874 Bug 6311 check_inst_id was being passed non-existent value
Due to a typo in the hash key check_inst_id in the
handle_end_patron_session was always logging an error
as the actual field contents were not being checked
unlike in other messages

Signed-off-by: Frederic Demains <frederic@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e793b0dda6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:39:06 -04:00
Marcel de Rooy b456fe301b 5662: Show control number without organization code in OPAC URLs
OPAC detail xsl adjusted at four places: 773 when leader19=c, 775, 780, 785.

Enable the pref UseControlNumber when testing this patch. And set pref OPACXSLTDetailsDisplay to using XSLT stylesheets.
Test by adding a control number ($w) in abovementioned fields.
Go to opac detail and check if the links work.
Add some orgcode between parentheses or brackets in front of the control number.
Test again in opac detail if the links still work.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works with and without orgCode in front of $w now.
No change to current behaviour, but closer to MARC21 standard.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4710fae55b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:38:31 -04:00
Katrin Fischer e0feb1c19e Bug 4433: Small display problem for topical subjects
This removes the subfield codes shown for topical subject authorities only.

To test:
- Add different authority records and at least one for a topical subject.
- Use search in intranet and opac (turn on opacauthorities) to serch for your subjects.
- All headings will show without the subfield codes (at least $a in front), except the
topical subject.

This patch removes the subfield codes for the topical headings.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised in opac and staff. (July 18, 2011)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4d81858ec6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:38:18 -04:00
Colin Campbell 0eeb2e42ab Bug 6598 : ensure OPACFineRenewals can prevent opac renewals
patron_flagged was being passed at global scope to the template
but being checked as an element in other structures
Also although items could not be selected the Renew Selected
button was displayed, it too should check the flag
Amended the preference text which incorrectly suggested the
option could be turned off. (leading to the opposite to what
the user might expect)
In the script have explicitly assigned the value to a inumeric
variable rather than making an implicit conversion as it may be
that readers were missing that sleight of hand

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b84276a3b1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:38:05 -04:00
Katrin Fischer eff89e4b82 Bug 4497: Make tabs for managing suggestions translatable
This patch makes the tabs on the manage suggestion page translatable.

To test:
- Create some suggestions in intranet or opac and manage them to make the
different status tabs appear: accecpted, pending, checked, rejected
- Apply patch, run 'perl translate update <languagecode>'
- Check po file for string '%s %sPending %sAccepted %sChecked %sRejected %sAvailable %sOrdered%s %s%s %sNo name%s (%s)'
- Translate it, save and run 'perl translate install <languagecode>'

Tabs should now appear translated.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4b2ea4cf44)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:37:46 -04:00
Paul Poulain 8bae74a173 BZ6412 : spaces in note
There was an improper T::T <input> construction: the note value contained spaces.

This patch fixes the problem by using a correct [% IF %] construction

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 83f6083f36)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:37:32 -04:00
Owen Leonard 5816bed961 Additional change for bug 5922 - Show waiting items for patron on return
- Adding patron name to dialog
- Styling dialog as a message rather than an alert since it's
  informational rather than a warning
(cherry picked from commit 53daf8a2de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:37:15 -04:00
Paul Poulain 30313a5564 BZ5719: unimarc plugin fixes
* 010 now don't care of - or no - in the isbn
* 225a window now higher to have all buttons displayed

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 83e42b0285)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:36:34 -04:00
Sophie Meynieux 70d65c1fd3 Bug 6474 Barcode not incrementing properly in format HBYYMMINCR if HB contains -
Adding - to regexp for matching branch code. Wondering if other characters should not be added too.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ff16446a8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:35:59 -04:00
Alex Arnaud d01c5105de Bug #6057 - Improve finding next stock number
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 00354d93bb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:34:25 -04:00
Ian Walls 57ebea8aaa Bug 6521 Follow up: previous patch breaks autoMemberNum functionality
The previous patch broke the autoMemberNum feature by adding a line to fixup_cardnumber
that returned 'undef' for cardnumber in all usages of the subroutine (limited to members/memberentry.pl
and tools/import_borrowers.pl.  This prevented the automatic number from being calculated in all cases.

This patch removes the offending line.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d119fbd91c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:34:07 -04:00
Katrin Fischer a769e63714 Bug 6080: Add id to total line in funds table
Alternate patch for bug 6080.

Instead of removing the line altogether make it possible to hide it
easily by adding an id.

To test:
- apply patch
- check your funds table for the last line labelled 'Total'
- add to IntranetUserCss: #funds_total {display:none;}
- check again, line should be hidden now

Reason:
The totals is only confusing for multi-level funds, but not wrong.
If you are using only 1 level of funds, it works all ok.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7fd4480167)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:33:49 -04:00
Owen Leonard 7d57d53d4e Fix for Bug 6638, Columns misaligned on serials claims
T:T variable scope error. Also correcting placement of calendar
include in the source to avoid JavaScript error.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 9c339d466e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:33:29 -04:00
Chris Cormack cb7214a286 Bug 6350: History update
(cherry picked from commit 614fdc2f98)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:31:21 -04:00
John Seymour b2d8e81b51 Bug 4873 - Ensure that the required directories exist on init
As systems (Ubuntu already, Debian testing is doing it too) move to
ramdisking /var/run and /var/lock, or otherwise clearing them on boot,
we need to ensure that they're there when we need them. This patch
autocreates any directories that are missing when the init script runs.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fb347c97ac)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 12:31:03 -04:00
Chris Nighswonger 19e4e59659 Updating Version Number to 3.04.03.000 2011-07-28 08:38:24 -04:00
Frère Sébastien Marie a741245a0a Bug 6632 [Signed Off] add html filter to prevent XSS
The filter 'html' have been added on all occurences of shelvename, which come from user input.

http://bugs.koha-community.org/show_bug.cgi?id=6632

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1124bf682f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-07-27 19:31:47 -04:00
Ian Walls d5c1929ed1 Bug 6614: Remove newlines from order notes when exporting to CSV
Newline is not a valid character to Text::CSV's combine() subroutine.  If an order
contained a note with a newline in it, that line would come out as a blank entry in
the exported CSV.  This patch strips such characters, globally.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 68f99cdf98)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-07-26 19:51:49 -04:00
Chris Cormack e8f6412c1f Bug 6611 : With the change to making cardnumber a nullable field, we need to pass it around when we are updating borrowers, to make sure we don't null it
Tested with every small edit link on moremember.pl.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0dae6dca92)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-07-26 19:51:35 -04:00
Owen Leonard 206293d79a Fix for Bug 6622 - Remove closing style tag from staff-global.css
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9db5fa227f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-07-25 22:10:14 -04:00
Owen Leonard 07387bea17 Fix for Bug 6612 - Sort pulldown for messages in alphabetical order
The values in the menu come straight out of GetAuthorisedValues(), which sorts
its results by "category, lib, lib_opac." Rather than trying to re-sort the
data in circulation.pl this patch changes the template to show 'lib,' the
description, instead of the authorised_value. That will make the output
match the column which is being sorted.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0699c8af84)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-07-25 22:09:38 -04:00
Owen Leonard d20900f7f4 Fix for Bug 6484 - due date sorter on 'my summary' missing
Columns on the summary table are shown or hidden based on a
variety of different settings, leading to convoluted if/else
template constructions if we want to define header sorting
in the <script> block. Using the jQuery Metadata plugin
allows us to specify sorting options as classes on the
table header. This adds a dependency but simplifies the
template markup significantly.

I recommend continuing to specify header sort options in the
<script> block in cases where it is relatively simple to do
so and saving inclusion of the additional jQuery plugin for
pages which really need it.

Other changes: Moved common sorter configuration detalis to
default declaration; Moved the date due column so that it
could be set as the default sort without taking into account
multiple disappearing columns (default sort cannot be set
in the markup for a <th>).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 203de2452e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-07-25 22:09:12 -04:00
Owen Leonard 928755dae9 Fix for Bug 6601 - dictionary items not adding to query
T:T variable scope error.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9d21892cec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-07-25 22:07:48 -04:00