Owen Leonard [Thu, 16 Dec 2010 02:30:38 +0000 (21:30 -0500)]
Fix for Bug 4946 - hold warning needs rewording
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:
- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out
I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 324991fefd1c6f336308b0f7aec8e8f0047e6e1a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Wed, 15 Dec 2010 14:23:14 +0000 (09:23 -0500)]
bug 4826 change 'add basket' to 'new basket'
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 07834371f25ab207688e1534c39654049b890951)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Tue, 21 Dec 2010 20:42:41 +0000 (21:42 +0100)]
Bug 5506 Shorten .po file comment lines
In opac/staff templates .po files, we have comment lines contextualizing
extracted text in templates. Path to template are absolute. For example, we can
have:
The first part of the pathname is useless. With this patch, we just keep
relative path to tempalte from Koha template main directory. The above example
becomes:
Nicole Engard [Mon, 20 Dec 2010 13:22:42 +0000 (13:22 +0000)]
bug 5035 remove default opaccolorstylesheet value for new installs
Per the bug, the color.css file is blank and so this preference
should have no value by default. This patch only fixes this for
new installs. There is no way to know if people have added values
to the color.css file in existing installs, so removing that value
in those cases might break things.
This patch does not remove the blank color.css file, it only
edits the default system preference.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a45eb8fb7864ed2c41abb449b1671cf715cab3a7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jesse Weaver [Sun, 19 Dec 2010 02:12:04 +0000 (19:12 -0700)]
Add .packages file for Ubuntu 10.10
Ubuntu 10.10 has all of Koha's Perl dependencies packaged (aside from a
couple small version issues); add a dpkg --set-selections compatible
file to reflect that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 88d3d09897aa8624b20ad5762b0c06699caa766e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Tue, 14 Dec 2010 19:20:42 +0000 (14:20 -0500)]
Fix for 5143, now with IE debug removed
Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work
adds:
- the subtitles into the title link (originally Chris Cormack)
- barcodes for every listed hold
- denoted which items were only item and which could be filled by any item on that bib.
- added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)
[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit be8f1f33430f35257c0ed5e93fc52ddfc65b7d84)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jane Wagner [Tue, 14 Dec 2010 16:39:12 +0000 (11:39 -0500)]
Bug 3789 Set off shelving location in staff and OPAC title display
Koha puts the shelving location immediately after the library name in the
"Location" column of the title display. If the library name and/or shelving
location is wordy, the two can run together and a user can overlook the
shelving location. I've added a new span class to the staff and OPAC .css
files and applied it to shelving location in both templates. This puts the
shelving location on a separate line and in italics, to make it stand out from
the library name.
[Edit] Re-implemented some changes which wouldn't merge after so long
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f05bd5984c94fbbf1603317fd9fdd8909959dbb5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Garry Collum [Tue, 14 Dec 2010 14:38:19 +0000 (09:38 -0500)]
Bug 4937: Fixes XHTML in the pagination links of a saved report.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0fc7e5bfdc30ba03ff342f35b27c61f0bd3938d8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Tue, 14 Dec 2010 13:57:46 +0000 (08:57 -0500)]
bug 4977 add missing order links to 'no results found' page
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5c8ca5129cef8b8d1042e9b774114463bb4e75bb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 10 Sep 2010 16:43:18 +0000 (12:43 -0400)]
Fixes bug 5125: Default focus on circulation-home page
Fix created by Owen Leonard, related over IRC chat (rather than a patch file).
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 34155975fc805059635f520c6cedfe927b9fd7fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 14 Dec 2010 06:24:16 +0000 (07:24 +0100)]
Possible fix for Bug 2307, Calendar widget cannot be translated
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21c516601cf1bba2ae22a3448898a2efed159b8a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Srdjan Jankovic [Mon, 13 Dec 2010 21:34:07 +0000 (22:34 +0100)]
Bug 2965: Allow due date in the past
Raise warning rather than disallowing
Remove due date js validation when checking out
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4d1762f5ec451729d74e3fa6282e1726a0a74969)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 13 Dec 2010 21:14:11 +0000 (22:14 +0100)]
Fix for Bug 5000, Uncertain prices misses option to choose display language
- Adding missing footer include for language chooser
- Correcting markup and structure errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21cdd2feb45406728faa395cd457670c4aef2bb3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Mon, 13 Dec 2010 16:13:58 +0000 (11:13 -0500)]
bug 5255 change 'document type' to 'item type'
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 40e2b5421a478ec2e9251798b34858eefa2ef114)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Mon, 13 Dec 2010 15:27:47 +0000 (10:27 -0500)]
bug 4252 add authorites permission to menus
Added to more menu and to the main intranet page
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a6799f95fb0315aa413c56f7d75817bb9d1a481e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 13 Dec 2010 15:30:07 +0000 (15:30 +0000)]
Updated fix for Bug 2170, Adding 'edititems' user-permission
This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.
The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.
Revised for current HEAD
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd7cca935b9c77ad0514038cfee6c84d02bd8e7d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 13 Dec 2010 11:44:35 +0000 (11:44 +0000)]
Bug 5484 - Handling bad borrower categories in serial routing lists more gracefully
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 96330a7b07dc78e627d44c5347fd07e42415ca36)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 10 Sep 2010 12:37:55 +0000 (14:37 +0200)]
Fix for Bug 5208, Language chooser missing on Batch item deletion/modification
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2b53b14bacfdd276c3188de2f76ed03201a0cab0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 16 Sep 2010 07:08:57 +0000 (19:08 +1200)]
Bug 5228 - make rebuild_zebra handle fixing the zebra dirs
If the zebra server directories don't exist, zebra will spit the dummy.
This makes rebuild_zebra.pl smart enough to create them if they're not
there. If that fails, it'll scream loudly so you know zebra isn't
reindexing.
Owen Leonard [Wed, 24 Nov 2010 14:48:24 +0000 (09:48 -0500)]
Fix for Bug 5416, Template syntax error in moredetails.tmpl
Credit for finding this bug and patching it goes to Fridolyn Somers,
but the patch in Bugzilla didn't apply for me so I duplicated the
changes and reformatted.
--
Owen
Owen Leonard [Tue, 21 Sep 2010 14:45:03 +0000 (10:45 -0400)]
Fix for Bug 4218 - Staff client detail page does not show item hold status
Showing "on hold" in the holdings list (as we used to do) is misleading
if it is a bibilo-level hold. However seeing that a title has holds
is important information for this view. This patch adds a line to the
biblio-level information display with a count of the title's outstanding
holds.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6466ac847fadd23ab7941bbca49424c87d382e6e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Sun, 12 Dec 2010 22:20:03 +0000 (11:20 +1300)]
Update Debian changelog for 3.2.1 release
This adds the required changelog changes to keep it current for the
3.2.1 release. It is intended to go straight into 3.2.x, and probably
should go into master also.
Owen Leonard [Fri, 10 Dec 2010 15:32:20 +0000 (15:32 +0000)]
Fix for Bug 5443, Inaccurate highlighting of fields in patron update email
- email was incorrectly named emailaddress
- string processing was being done to address and B_address
which didn't seem to be serving a purpose
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4095d45eaf374f99b1962b8e41c0c10f1c23f76c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 10 Dec 2010 14:33:36 +0000 (14:33 +0000)]
Fix for Bug 4173 - Statuses not appearing in the OPAC
This adds display of "Use restrictions" authorized values
to the OPAC and the staff client for available and
not-for-loan items.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bdf4dd13afc6c709ca682f41618c99d4d4b1ec23)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This was due to the use of an OR which seems to have caused the
param method to be called in a scalar context thus returning only
the first of multiple repeated cgi params.
This patch retains the intent of the OR by replacing it with a
conditional.
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 6 Dec 2010 07:28:38 +0000 (08:28 +0100)]
Bug 5423: Deleted Patrons are no longer saved in table deletedborrowers
Tested with HEAD
> Should also apply to 3.2.x
( Not tested with 3.2.x)
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Thu, 9 Dec 2010 12:36:07 +0000 (12:36 +0000)]
bug5455 (Fix uninitialized-warnings on authorities.pl)
Fix warnings for uninitialized authtypecode on lines 646, 653.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 434c1d648325cbae1750a6052bab845a1f450694)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Wed, 8 Dec 2010 20:15:10 +0000 (15:15 -0500)]
Bug 4935: fix for allowing authorized values to be "unset"
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 61957d07ce718ff3a24bf507828f7d313522f9c3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5475 Wrong messages date formating on Check Out page
On the Check Out page, messages related to the borrower are displayed on the
right side. Message text is preceded by a date and library code. The date is
displayed in US format (mm/dd/YYY). Is should be displayed formated depending
on 'dateformat' syspref.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37a17d8fadf745aa9a236f96a1fb5c9665651f04)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Added a jQuery table filter, usefull when you have a lot of rows. This filter works on the entire row and allows you for exemple to type "Adul Perio 5".
Indentation cleaning.
Added tabs to filter colums on 4 axes: All, Issues, Fines and Reserves.
Moved the table filter to the right of the tabs.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fefd158f424939fc473f54a2ffe4ee0e39ffba08)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Mon, 6 Dec 2010 15:58:04 +0000 (16:58 +0100)]
Bug 4500 - remove commas from price formatting
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 692786b51922e75dae76403a7a3317f7aae13905)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Mon, 6 Dec 2010 15:48:47 +0000 (16:48 +0100)]
Bug 5022 Supplements were not saved correctly
No subscription id was set
Also entered a default arrived date on the supplement
And removed errors due to bad dates returned from GetSerials
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aa6ce934d9fc3eb260211292c44ae941fe214330)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 6 Dec 2010 15:41:17 +0000 (16:41 +0100)]
Fix for 4832 - Re-editing a suggestion changes the item type
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c9f3f2872f8ca15eed8bcd73fcd498f81ad7d5df)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 6 Dec 2010 14:55:03 +0000 (09:55 -0500)]
Bug 5467: Kits shown wrong as visual material in XSLT displays
- reused icon for mixed materials for kits
- fixed missing icon for mixed materials
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5633b423e3622f21842e38598f208e5da588f7e5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 6 Dec 2010 11:56:12 +0000 (11:56 +0000)]
Incremental fix for Bug 3285 - Location on Add Subscription should be pull down
- Adds location dropdown to subscription edit form
- Pulls authorised value for display on subscription detail page
- Adds function for pulling authorised value description based
on category and value
This patch does NOT implement automatic preselection of the shelving
location form field on the serial add item screen. This must be
worked out in order for the bug to be closed.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e54169ba0f06cd835d72936e14012933a67793e7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Sat, 13 Nov 2010 19:34:42 +0000 (14:34 -0500)]
Fix for Bug 5030 - Improve handling of duplicate patrons
- Making duplicate patron warning dialog simpler but more explicit
- Pointing duplicate patron preview window to new brief version
of moremember.pl to display more patron details than the previous
version.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9f0495238de31cbdcacabe8f3986081f150ae2cb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 30 Nov 2010 07:19:49 +0000 (02:19 -0500)]
Bug 4449: AllowHoldPolicyOverride does not override all hold policies
This patch provides a universal override to any hold policy if the AllowHoldPolicyOverride is set.
Amongst other overrides, this patch allows missing, non-checked out items to be placed on hold even with AllowShelfHolds turned off.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5e8b078651624cee7bc4f86e206cf36c8ace9c4d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Fri, 26 Nov 2010 16:31:35 +0000 (16:31 +0000)]
Bug 5448: Refactor Boolean.pm
Remove unnecesssary export
Use Exporter according to best practices
Use Carp not warn so we know where the error string came from
Don't create warnings manipulating undefined input
Replace package variables by lexicals
Ian Walls [Tue, 30 Nov 2010 07:25:30 +0000 (02:25 -0500)]
Fixes bug 5232: Shelfname won't display on high-numbered lists
This bugfix adds an explicit GetShelf for the specific shelfnumber when viewing that individual shelfnumber. This captures the
shelfname, which was originally pulled from shelflist->{$shelfnumber}, which may not have been populated if the List in question was
beyond the 20th private or public list in the system.
Also adds a more explicit sort: the sort from the CGI takes top priority, then it falls back to the default sort for the list, and
ultimate falls to 'title' if neither CGI nor default sort exist.
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 31439fc51adc7e32a2eff6608bf91e08fcbf0ade)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Fri, 26 Nov 2010 17:27:13 +0000 (17:27 +0000)]
Bug 5450 Avoid a name clash in ILSDI modules
C4::ILSDI::Utility exports a subroutine CanBookBeReserved
Both ILSDI were also importing a subroutine of that name from
C4::Reserves Remove conflict by listing subroutines
imported from C4::Reserves explicitly
Owen Leonard [Tue, 30 Nov 2010 15:14:23 +0000 (10:14 -0500)]
Fix for Bug 5402, "add to cart" shown on checkbox hover
This patch removes the title hint altogether. The checkbox might
be used for the cart, lists, holds, or tags, and expressing this
in a title hint seems overly complicated.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e7321e1a7f471157b4ae24738eb70c54b0798f31)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
projects / koha.git / log