Explicitly specifies which fields to return in C4::Overdues::checkoverdues
SQL: all of biblio, items, and issues, and everything in biblioitems
EXCEPT marc, marcxml and timestamp.
Bug 6801: member details page taking long time to load when many checkouts present
This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
subroutine was being run for every single item a patron (or their relatives) have checked out.
Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.
Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).
Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].
Signed-off-by: Liz Rea <lrea@nekls.org>
On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
With this patch, the time is reduced to 5 or so seconds.
Big ups to Ian for tenaciously hunting this one down.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Larry Baerveldt [Thu, 22 Sep 2011 20:36:05 +0000 (16:36 -0400)]
Bug 4841: biblio-level itemtypes not searchable in advance search by itype
Mapping 942$c into itype index along with 952$y; this allows for biblios without any items, but with a biblio-level itemtype to be retrieved in search. This is particularly useful for E-books or Serials without barcoded items.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Corrects a problem in batchMod.pl when accented characters are used.
When modifying multiple items in batchMod.pl, the batch modification
fails if accented characters are used in any of the fields of the
modification form.
This is a port of Frédérick Capovilla patch from 3.2 to 3.4 version
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 6755 Web browser default lang != syspref selected langs
When Web browser default selected language doesn't belong to selected
languages list defined by syspref (language / opaclanguages), web pages
are returned in this language, which is wrong...
This patch get this behavior:
- If selected by user language is available (cookie), it is used.
- Otherwise, language is set to default web browser language.
- If this language doesn't belong to languages list (syspref),
English is selected
Some code cleanup.
To test properly: don't forget to delete your cookies, and to test what
happens without and with cookie.
Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)
A corrected version of the patch of 6 June 2011.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Thu, 22 Sep 2011 03:32:24 +0000 (15:32 +1200)]
Bug 6205 - if an include doesn't exist, fall back to en
If a language that doesn't exist gets accessed, then it will fall back
to en for the templates, but not for the includes, so everything still
dies. This allows the process to work in this case too.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm the bug and the solution. This issue occurs when templates are
partially translated. The main template (.tt) is found for a specific
language, so this language is returned by themetemplate. But in the main
template, some include files (subtemplates) are referenced that can very
well not exist if the translation process had failed to generate them.
This kind of failure is reported by 'translate' script. It's very easy
to miss it, but it's the translator responsability to check it.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 21 Sep 2011 19:17:16 +0000 (21:17 +0200)]
Bug 6901: Add classes to XSLT detail view in STAFF
This patch adds css classes to the fields in XSLT intranet views.
Use OpacUserCss and IntranetUserCss system preferences for altering the styling of
and hiding fields.
The css classes are named like the labels with additional underscores
where necessary.
Example:
.publisher {
display:none;
}
.other_title {
font-weight: bold;
}
Note: This patch also fixes the display of additional authors in field 880 (original
scripts like Hebrew). This small additional problem was found as a side effect of testing, where the
existence of an author in 880 would break the XSLT.
Also moves some CSS from a style attribute into the CSS file for 880 fields.
Signed-off-by: Liz Rea <lrea@nekls.org>
-- minor commit message edits (requested by KF)
Owen Leonard [Fri, 16 Sep 2011 14:27:24 +0000 (10:27 -0400)]
Fix for Bug 6884, Improve TinyMCE configuration on Koha News page
- Increases the width of the editor to fill the space provided
- Adjusts the layout of the toolbars to better fit the space
- Adds a custom editor stylesheet to make the contents of the
editor better match the expected output
In changing the toolbar configuration I chose to make the display
of each button explicit rather than assuming a default set of
buttons and adding or subtracting from that. I think this is
clearer for someone approaching the configuration trying to under-
stand how buttons are displayed. I also chose to use the
shorthand "|" instead of "separator" for brevity. This last change
is the only one made to the edithelp configuration.
[2011.09.20] F. Demians. This patch is compatible with bug 6649 patch,
fixing help pages editing, and so could be applied before or after it.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Liz Rea [Wed, 14 Sep 2011 19:56:03 +0000 (14:56 -0500)]
Bug 6870 [enh] - allow opac-userupdate.pl to use the patron's email as 'from' address
Patch makes it so that Koha sends patron update emails from the first valid patron email address, instead of from the KohaAdmin or branch email address.
This patch should make it so that libraries can directly reply to patrons regarding patron updates.
To test:
Create a patron with no email address, do a patron update and observe the to: and from: - they should both be the KohaAdminEmail address.
Add an email address to that same patron, and send a patron update. Observe the to: and from: - the from: should be the first valid email address of the patron, to should be the KohaAdminEmail address.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
MJ Ray [Thu, 22 Sep 2011 18:27:43 +0000 (19:27 +0100)]
Bug 6460: alternative fix, updating template and script instead of C4::Log
Add some test cases and fix a bug in C4::Log found by in review. Thanks-to: Katrin Fischer. Signed-off-by: Liz Rea <lrea@nekls.org>
Passes test, interface works as expected.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fix for Bug 5436 - Extended patron attributes display improvements
Show patron attributes in the sidebar on circ and patron pages
[Edit from Owen Leonard: This patch takes changes originally in
Bug 5436 and isolates just the parts relating to display of
patron attributes. Because function for pulling patron attributes
was merged with the function for displaying address information
in SetMemberInfosInTemplate() (also found in Bug 5749), I moved
the call to GetBorrowerAttributes into the individual scripts.
That keeps the functionality relating specifically to patron
attributes separate from the proposed changes to displaying
addresses.
Because I think it's important to keep the display consistent,
I added display of patron attributes to all pages which include
the patron information sidebar.]
Rebased for compatability with bug 3489 and database documentation by
Ian Walls, 9-21-11
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Previously you couldn't view baskets that you hadn't created, unless you
were superlibrarian due to a bug. Now people with the right permissions
can see the baskets.
Katrin Fischer [Thu, 22 Sep 2011 19:32:42 +0000 (21:32 +0200)]
Bug 3941 - Combine Notices & Messaging Tabs
Changes to notices tab to make it a full replacement for messages tab.
Removes messages tab from patron account.
- repairs view of patron address in left column (category description, branch)
- shows some explanation, when there are no messages for a borrower
- makes the notice an expandable field, a click on the subject will
expand the field to show the message content
- makes message status and message transport type translatable,
by moving the possible values into the template
- removes the messaging tab from various menus
- removes the files that were associated with the messaging tab
- preserves the line breaks in message content to improve readability
Also fixes Bug 6593 - Some information missing from the "Notices" tab.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frédéric Demians [Thu, 25 Aug 2011 13:01:19 +0000 (15:01 +0200)]
Bug 6755 Problems with switching languages
This patch solves the situation that news is in another language than
the Koha interface AND makes that themelanguage routine is always called
the same way in order to prevent mixed display.
It fixes also a bug related to language preselection based on web
browser prefered language.
September 9: Adjusted with input of Frederic Demians.
Septembre 10: Avoid circular dependency, as pointed by Chris Cormack.
Templates related functions are moved from C4::Output to C4::Templates
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>
Owen Leonard [Mon, 22 Aug 2011 15:33:59 +0000 (11:33 -0400)]
Alternate fix for Bug 2534 - Viewing items table on item edit screen requires horizontal scrolling
This patch doesn't eliminate horizontal scrolling, but simplifies
the situation:
- The left-hand sidebar has been moved below the table of items.
- The "overflow:scroll" style has been removed from the table of items.
Having overflow set meant that it was often necessary to scroll twice
to reach data in the table: once using the scrollbars on the table
and again using the page's scrollbars.
The NEKLS catalogers also extend their thanks for this fix.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Fri, 2 Sep 2011 14:21:23 +0000 (16:21 +0200)]
Bug 3704: SIP Checkin of not checked out item returns error without reason
Checking in an available item returns an error (which is correct) without
giving a reason for the failure as screen_msg (aka AF field in SIP2 is empty).
Based on code suggested by Patrick Langer <patrick.langer@easycheck.org>
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
bug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available funds", as in "Already received"
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- add new fund for an active budget
- order item, price 8.00
- check funds page and acq home: committed amount should be 8.00
- receive item, enter actual price 10.00
- check funds page and acq home: spent amount should be 10.00
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 6900 - line break between available and reference items
This patch adds a conditional line-break in the availability section of XSLT results.
Signed off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Tue, 13 Sep 2011 03:50:26 +0000 (15:50 +1200)]
Bug 6360 - add some more sounds to some happenings on returns
This adds an alert sound to various events around transfers and holds
when items are being returned, to make it more apparent that attention
is needed.
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>
bug_6576: Submit when changing framework rather then reloading
TransformHtmlToMarc(): changed interface - no point passing params when
they can be accessed from $cgi
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 8 Aug 2011 08:29:05 +0000 (20:29 +1200)]
Bug 6679 Fix scripts in admin & acqui to pass Perl::Critic
Scripts in admin & acqui subdirectores weren't passing t/00-testcritic.t. This
patch add admin & acqui scripts to test case and fix various errors related to
Perl::Critic compliancy.
- Fixing a style error to pass Perl::Critic, plus silencing a warn
- More style errors, plus fixing a security issue
- Explicitly using Carp
Contrary to common belief, subroutine prototypes do not enable
compile-time checks for proper arguments. Don't use them.
Defining a named sub within another sub, does not prevent that
subroutine being global
Signed-off-by: Frédéric Demians <frederic@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Tue, 20 Sep 2011 19:32:14 +0000 (15:32 -0400)]
Enh 6887: Add 'checked out from' column to issued items display tables
Adds "checked out from" column to the right of "checked out on" on both
circ/circulation.pl and members/moremembers.pl. Columns are sortable with tablesort
(though only on circ/circulation.pl if syspref enabled).
The branch name is sourced from issues.branchcode.
EDIT BY Owen Leonard: Adjusting table columns which are sorted by default
to accommodate the new column.
Things look good! Thanks!
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 15 Sep 2011 14:12:27 +0000 (10:12 -0400)]
Fix for Bug 6842 - Branch transfer limits broken
- Changing library select form so that chosen library is preselected
- Changing pager <form> to a <p> so that nested form tags don't
conflict. It was the addition of the javascript table pager
which broke the functionality on this page.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- It's possible to select a different library now. The pull down shows
the chosen library correctly.
- I can make changes and save them without any problems.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sun, 28 Aug 2011 23:21:24 +0000 (11:21 +1200)]
Bug 5675 : CheckReserves not honouring item level itemtypes preferences
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
With item level itypes activated only the item for which holds were
allowed in circulation rules triggered the hold notice on checkin.
Also checked that biblio level itype still trigered correctly.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
bug_6318: Always give predefined fields drop downs on label layout edit
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>
Owen Leonard [Thu, 1 Sep 2011 15:14:50 +0000 (11:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in MARC
editor. Modifying script to stop tag attribute markup from being
passed to the template directly in favor of using template logic.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
The patron stats wizard had 'debarred' in the pull down
for status, but it's called restricted everywhere else.
This patch changes debarred to restricted.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Liz Rea [Tue, 6 Sep 2011 18:00:51 +0000 (13:00 -0500)]
Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)
This patch does a couple of things.
1. Changes permission over all to set branch printer (change branch/Set Library) from "circulation" privileges to "view catalogue" permissions. Reasoning: anyone who has privileges to view catalogue could reasonably be expected to perhaps need to change the set branch, but you might have people who don't have circulate permissions who need to change the branch, centralized cataloguing, for example. Those people would never circ and wouldn't need circ privileges, but *would* need to be able to change the set branch.
2. Changes the template flags to see the "Set Library" link with independent branches set from "manage users" to "manage users or edit catalogue." Reasoning: even with indy branches on, there might be reasons for catalogers to be able to change the set branch (that reason was the impetus for this patch in the first place).
To test:
Create a user with only "View Catalogue" Permissions (no circulate permissions), that user should be able to change set library with Independent branches OFF.
With independent branches on, give a user edit catalogue permissions. That user should be able to change set library.
I want to add that this patch was specifically written in response to chris_n's bug report. It may not be practical for these changes to be in mainline, but I haven't thought of any reasons why it would be explicitly bad. That doesn't mean there aren't some, though.
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Thu, 21 Jul 2011 11:16:22 +0000 (12:16 +0100)]
Bug 6620 Ensure autoflush is set on output filehandles
stdout is by default buffered and a flush is only guaranteed on CR
Sip responses are not CR terminated so we need to ensure autoflush
is switched on so that the filehandle is flushed after a print
Otherwise this can manifest as self checks running slow or
failing due to timeout (although in the log we see the response)
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 13 Sep 2011 16:30:05 +0000 (12:30 -0400)]
Follow-up fix for Bug 6458, incorrect parsing result in translation processing
Somehow some markup which should have been deleted by a previous
patch has reappeared, messing up the display of the MARC editor.
This patch removes that section again.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 2 Sep 2011 14:14:51 +0000 (10:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
There is template logic in manage-marc-import.tt which is intended
to set the "selected" option for the framework chooser ("Add new
bibliographic records into this framework"). However, I can't see
any place in the code which sends the "selected" variable to the
template, and I can't see any circumstance in which a value would
be passed to the template.
This patch removes the "selected" variable from the template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 25 Aug 2011 19:37:25 +0000 (15:37 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Correction in opac holds template. Corrections made are logically
consistent, but I couldn't reproduce the combination of factors
to trigger the "disabled" attribute on the branch selector. In
that respect this hasn't been tested 100%.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 14:54:07 +0000 (10:54 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types
Correction for patron-attr-types.tt stops tag attribute markup from
being passed to the template directly in favor of using template
logic.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Read the patch and tested the page, didn't find any problems. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 13:07:15 +0000 (09:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
member entry form.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Fixes lots of problems. Spotted one small problem. I am sending a follow-up. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Sun, 31 Jul 2011 02:26:23 +0000 (14:26 +1200)]
Bug 6651 - fix splitting of names when updating to 3.4
This affects only koha package installations that have multiple
instances running. After this patch, it's worth running the upgrade
again to ensure that everything happened correctly the first time.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 18 Jul 2011 18:36:05 +0000 (14:36 -0400)]
Fix for Bug 6609, Clean up guided reports dictionary entry process
Some general interface cleanup tasks with the guided reports dictionary entry
process:
- Improving the breadcrumb links
- Eliminating the tabs in favor of more descriptive <legend> labels
- Clarifying some labels
- Correcting form markup according to established patterns
(Undertaken primarily because the tabs translated poorly when trying to
re-implement them for Bug 5481, Replace YUI JS libraries with Jquery UI)
Signed-off-by: Nicole Engard <nengard@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
projects / koha.git / log