This is a followup :
When editing a budget, the check for the total allocation would take into account the budget itself.
Showing an improper error message
The problem was solved when adding a child budget but not when editing the same budget.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
Reinstates the deleted maxItemsInSearchResults system preference, which was erroneously thought to no longer be utilized.
It's removal has led to bug 4430
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
Owen Leonard [Wed, 5 Jan 2011 08:26:30 +0000 (03:26 -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: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 5 Jan 2011 05:27:14 +0000 (00:27 -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: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 5 Jan 2011 04:51:54 +0000 (23:51 -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: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
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>
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>
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>
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>
Owen Leonard [Thu, 30 Dec 2010 11:33:46 +0000 (06:33 -0500)]
Fix for Bug 3665, adding another submit button as in OPAC
This is the only change proposed in Bug 3665 which hasn't
already been implemented by someone else. It adds a submit
button under the first section of the advanced search page
just like the OPAC advanced search has.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 30 Dec 2010 11:31:23 +0000 (06:31 -0500)]
Fix for Bug 4820, Alter layout of Circulation and fines rules page for clarity
I propose some changes to the issuing rules interface to improve usability:
- Better define and delineate the sub-sections on the page:
- Default checkout and hold policy
- Checkout limit by patron category
- Holds policy by item type
- Repeat the current library name, when selected, for clarity: "Default
checkout and hold policy for Athens" rather than "Default checkout and
hold policy for this library"
- Use the phrase "all libraries" when no library is selected. "Default
library" seems ambiguous. "All libraries" better defines how the rule
will be applied: to all libraries in the absence of a more specific rule.
- Use the term "all" instead of "default" in cases where a rule will apply
to all categories or item types.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 29 Dec 2010 22:04:45 +0000 (17:04 -0500)]
Fix for Bug 5560 - pagination option for lists
This patch doesn't enable per-list pagination options,
but makes OPAC and staff client list display obey
the OPACnumSearchResults and numSearchResults system
preferences instead
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 24 Dec 2010 18:39:13 +0000 (13:39 -0500)]
Fix for Bug 5540, editing slip news changes to librarian interface
The script checks for a language-specific OPAC message and, if none
is found, preselects none of the "display location" options. This
results in the first item in the <select> behing highlighted by
default, "Librarian interface." If we want to select "slip," we
must add an explicit check for it.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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:
Owen Leonard [Mon, 20 Dec 2010 19:11:26 +0000 (20:11 +0100)]
Proposed fix for Bug 5106 - Simplify MARC view choices in the OPAC (Conflict marker fix 2nd try)
- Eliminates the "Extended MARC View" tab
- Points the "MARC View" tab to opac-MARCDetail.pl as it is when XSLT is off
- Offers a "view plain" link on opac-MARCDetail.pl. Clicking this link
replaces the standard labeled MARC view with an unformatted view similar to the
one displayed in the pop-up modal MARC view.
- When viewing the "plain view," clicking the "view labeled" link will return
you to the standard labeled MARC view.
- Adds a new XSL file for displaying MARC data in a slightly-more-formatted
manner (compared to one big <pre></pre> block).
Removed a conflict marker line from Owen's patch (Marcel).
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frédéric Demians [Mon, 20 Dec 2010 14:09:49 +0000 (15:09 +0100)]
Bug 4838 Allow to choose which authority heading to copy into biblio record
With this patch, in biblio record data entry form, when ... is clicked for an
authority controlled field, it's possible to select which heading repetion to
copy if the authority has repeated headings.
When there is just one authority repetition, the first one is displayed to
choose, as previously.
This patch is REQUIRED by French libraries following SUDOC UNIMARC format, and
cataloguing multilingual materials ie all Higher Educational and Research
libraries.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
projects / koha.git / log