Colin Campbell [Tue, 14 Dec 2010 09:28:53 +0000 (09:28 +0000)]
Bug 5403 Remove DisplayISBN and GetPublisherNameFromIsbn
These two subroutines were no longer being used by any other code
removed them from their respective modules
If we need any ISBN in future we should use Business::ISBN directly
Owen Leonard [Fri, 14 Jan 2011 14:31:24 +0000 (09:31 -0500)]
Fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view
Fixed by doing a pretty dumb copy of GetMarcNotes. Functional,
but it could be there is a more efficient way to do it given
we want one repeating tag rather than a range of tags?
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- fixed small typo in opac-detail
- corrected isbd punctuation in opac-detail
- tested with 0, 1, 2, 3 isbns in 020, MARC21 Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 13 Jan 2011 21:53:51 +0000 (22:53 +0100)]
Fix for Bug 3459, topissues doesn't take care of ccode
- Change conditional to display filter in sidebar without EXPR
- Enhance switch between ccode default and itemtype default searches
- Enable preselect of submitted collection code in filter form,
stealing code from opac-search.pl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f45969422c55f34edec3145b7e2fa1a85222932f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 4438: incorrect "Budget total exceeds period allocation" error when editing fund
The process in check_parent_total for period allocation was not good.
It took all the children of a period.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9bf9e2d9b4408579667d904ec94d064dc0c8f882)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 13 Jan 2011 14:38:23 +0000 (09:38 -0500)]
Fix for Bug 5006 - Invalid XHTML in record matching rules template
- Rework JavaScript clone routines to use jQuery, to take
label "for" into account, to handle incrementing label,
and to properly place cloned blocks at the bottom of the group
- Rework JavaScript delete routines to use jQuery, to take
block label numbers into account, and to show the "add"
link if you have deleted the last block.
- Correcting markup which nests <div> inside <fieldset>
- Ensuring labels' "for" attribute matches input IDs
- Adding "required" style to required fields
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch fix ordering in acquisition stats to order by month number.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e8de8b97c66a67427f4b458e2c3f3e43ea43d963)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Wed, 12 Jan 2011 16:53:22 +0000 (16:53 +0000)]
Bug 5611 Tidy up C4::Scrubber
Remove the unneeded package variables
Remove unnecessary variables
Removed some cargo-cult programming
Tidied the indentation from mix of tabs & spaces
Add a Test that we actually return the required class
of object
Bryce Sanchez [Wed, 12 Jan 2011 16:53:21 +0000 (16:53 +0000)]
Bug 5611 INIT block causes failure with mod perl
Per module INIT Blocks are not run in mod_perl so their
variables are not visible. A lexical var is adequate
for this purpose
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e0d76bd88d25e87f9d8f450f1c4e029812eacf02)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Wed, 12 Jan 2011 06:34:21 +0000 (07:34 +0100)]
Bug 5601 Fix processing of DueDate return
item duedate is not a datetime entity but a string retrieved
direct from the db that only needs restructuring
checkout was doing so but item_info was pretending it was in secs
(actually Item.pm manipulated then overwrote it!!)
assume the date in the db is correct (otherwise madness ensues)
dont try to second guess it
As duedates do not yet include a time element assume end of day
as a safety first
[F. Demians] I confirm Joe Atzberger diagnostic. That's a bug reported by a
library. I've tested Colin Campell solution. It fixes the bug.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d4842d45601bd0f9c1bd33bf7978586ae746888f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Tue, 11 Jan 2011 07:33:51 +0000 (02:33 -0500)]
bug 4131 have subscription so edit routing if one exists
Changes the template variable checked in serials-menu.inc for determining where to
show 'Create Routing List' or 'Edit Routing List' to hasRouting.
Also adds the $hasRouting variable to serials/routing.pl and serials/routing-preview.pl,
for completeness.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b7fdfc1384a749471f2c9a00b910b063778085e2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Tue, 11 Jan 2011 06:55:21 +0000 (01:55 -0500)]
bug 5486 remove note about HomeOrHoldingBranch being removed soon
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 50694f39594f1f4fcfd0efe28a1f47ab6c23bfd7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Sat, 8 Jan 2011 22:25:56 +0000 (17:25 -0500)]
Bug 5603: advance_notice.pl uninitialized element in hash
Changings one of the LEFT JOINS in C4::Members::Messaging::GetMessagingPreferences
to a JOIN to prevent NULL message_transport_types from being returned
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8185db47878630399eedc8ca227ab0e111a3acad)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Tue, 11 Jan 2011 06:36:40 +0000 (01:36 -0500)]
bug 5604 additional icons in the Seshat icon set
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d1ef8313609bb5617a6c3439b55da5e4df96e88f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 4 Jan 2011 14:04:41 +0000 (09:04 -0500)]
Fix for Bug 4945 - Patron search is limited by default to the currently logged-in library
I couldn't figure out how (or whether) GetBranchesLoop could be
convinced to return a list of branches without selecting one, so
I swapped GetBranchesLoop with GetBranches. This will preselect
a branch only if a branch has been submitted as part of a query.
This does NOT preselect the correct branch when IndependantBranches
is turned on.
I also added a template variable which is true if a query has
been submitted with a branch or a category so that the extra
form fields can be displayed, reminding the user that they
added limiters to their query.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 98efac4c0a3c6dfd857901ce6c639f93bcda8b76)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 4 Jan 2011 17:47:29 +0000 (12:47 -0500)]
Fix for Bug 5570 - item types not showing on other editions
The item type which shows on other editions is the biblio-level
itemtype. XISBN.pm had some item-handling code, but I'm
removing it because it is unused. The editions tab should
now display item type only if item-level itemtypes are not
enabled.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bbd50b2d1219c904f3a7db3cfa49feca13bd8278)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This pref was accidentally added during non-English syspref updates.
It is properly a part of enh bug 1997 which will not be included in
the 3.2.x branch.
Owen Leonard [Thu, 6 Jan 2011 18:56:06 +0000 (13:56 -0500)]
Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl
Changes to list contents view to make it consistent with search results
My intention is to make the OPAC more consistent in the way it displays
lists of items, whether it be in search results, lists, etc. This patch
adds data to the list contents output and reformats it to that end.
The other significant change is the removal of jQuery table sorting.
Since list contents are both sorted and paginated on the server
side. Adding a client-side sort to one page of many doesn't make sense.
Other changes include:
- Change "Your lists" to "Your private lists"
- Remove "sort by" column because it seems unnecessary
- Adding logic to control display of count (item or items
rather than item(s)
- Styling pagination bar and placing at the bottom of the page,
consistent with other instances of pagination navigation
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 6 Jan 2011 18:48:40 +0000 (13:48 -0500)]
Fix for Bug 4950 - checkbox should be removed when can't place a hold
- Hiding form controls for titles which can't be placed on hold
- Highlighting hold blocked message for better visibility
- Showing table of blocked holds even if none can be placed on
hold: hiding the table hides the messages explaining why
titles can't be placed on hold
- Removing an unused line from the script which was leaving errors
in the error log
- Consolidating error messages into one box which were displaying
in two.
- Correcting link to unused opac-userdetails.pl
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Thu, 30 Dec 2010 16:57:06 +0000 (11:57 -0500)]
bug 5419: make reason checkouts blocked stand out
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f379638c9d1921e8663e2c8c5bfabe27af42a666)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Wed, 15 Dec 2010 23:11:28 +0000 (18:11 -0500)]
Bug 5374 (update transaction date when saving biblio) RESENT with small fix
Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.
I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 76338220ddf688f6e38488624dd260e0810db1c3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Thu, 30 Dec 2010 16:59:20 +0000 (11:59 -0500)]
bug 5562 change 'issues' to read 'checkouts'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c71a36fd27ece805705161149bb885aa3e4decdd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Thu, 30 Dec 2010 17:02:15 +0000 (12:02 -0500)]
bug 5563 change note about cover images on enhanced content
on the enhanced content tab of system
preferences it says that Koha will pick
the first cover image - but in fact it
shows them all - that note needs to be
updated to properly warn of the expected
behavior.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 606f9784199722bd661d60be1944aa97c6a8971c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 30 Dec 2010 17:07:11 +0000 (12:07 -0500)]
Reimplemented fix for bug 5556, OPAC does not display the type of authority
Formatting Janusz's suggested changes as a patch.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4e1f49097c184ec7b199fe8176ccf6b9ae331035)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 30 Dec 2010 17:20:33 +0000 (12:20 -0500)]
Reimplement fix for bug 5557 - Link to logs for user with view_system_logs permission
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6a61750bf0a5a6cc5668e0419ab2160cf5d02eac)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Thu, 30 Dec 2010 17:32:37 +0000 (12:32 -0500)]
bug 5040 fix misspelling of distance in marc21 framework
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Fri, 31 Dec 2010 14:18:55 +0000 (09:18 -0500)]
bug 4942 - add validation to patron administration
This validation requires an enrollment period or a date to be provided
before the form will save, which will prevent invalid dates getting into
the system.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7d0212cf38b802d510aa03a705b19fb11060a537)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Fri, 31 Dec 2010 16:19:17 +0000 (11:19 -0500)]
bug 5045 - Help works even when the referrer is being stripped
This fix puts the URL of the source page as a parameter to help.pl,
which will override the referrer value, if it's provided. This deals
with people sitting behind proxies that strip the referrer information
out.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 980de26320d7dc389a0faf88d341f3dc373dd831)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 20 Dec 2010 15:56:11 +0000 (09:56 -0600)]
Fix for Bug 5526, List of lists should be in alphabetical order by list name
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cdbf872bd5dcc99b6e93ab920a0ef17a7592c8c9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 17 Dec 2010 23:11:43 +0000 (18:11 -0500)]
Fix for bug 5451, can add tags with userlogin turned off
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(Corrected to apply to 3.2.x)
Frédéric Demians [Fri, 17 Dec 2010 11:16:52 +0000 (11:16 +0000)]
Bug 5446 Fix a bug introduces by previous patch
When AcqCreateItem was set to 'cataloguing' there was no items fields in the
acq web form to validate in JS...
Alert commented.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9a048e2b12e2004fad51b5b0db3187a8eb6c2a04)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Thu, 16 Dec 2010 09:59:34 +0000 (04:59 -0500)]
Bug 4286 Allow receiving if subscription enddate not set
HasSubscriptionExpired is not a boolean return it may also
return that a valid subscription enddate is not set
This should not block receipting of issues
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 74e63fe0e602f745e711cf00417b965614f7be68)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
projects / koha.git / log