Commit graph

14919 commits

Author SHA1 Message Date
Ian Walls
a291cc52ca Bug 6633: SCO return button doesn't work
A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
the fines column even if no fines column header was displaying.

This patch adjusts the scope of several T:T variables on the sco-main template to fix this

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-30 09:19:03 +13:00
Ian Walls
973371a68b Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
In the 5 places in the label editor, the user's current branch is determined by taking
the LoginBranchname and doing a reverse look up for the branchcode.  This is an unnecessary
query, since C4::Context->userenv has the immediate access to the branchcode; this is how
it's summoned in all other points in the Koha code.

This addresses bug 6673 because, since the move to T:T, the call in tools/manage-marc-import.pl
has used in correct syntax:  $template->param('LoginBranchname') instead of $template->{VARS}->param('LoginBranchname')

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>
2011-09-28 20:29:39 +13:00
Chris Cormack
405ee6844d Updating history and about file 2011-09-28 09:53:34 +13:00
Chris Cormack
ed328807c3 Merge remote-tracking branch 'kc/new/enh/bug_6871' into kcmaster 2011-09-28 09:51:05 +13:00
Thatcher Rea
69dad7258b Bug 6871 - Have a link to the schema page on the reports page
Adds schema and reports library to reports-home.tt

To Test: Verify that schema and report library links are visible on reports-home.pl

Signed-off-by: Liz Rea <lrea@nekls.org>
Works as advertised, links are correct.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-28 09:49:42 +13:00
Liz Rea
085de44ebd Bug 6927-- Typo in C4::Overdues.pm
Corrected a small typo in overdues.pm to fix a "Undefined subroutine &C4::Members::checkoverdues called at /home/koha/kohaclone/C4/Members.pm line 511." when making calls to GetMemberDetails

This fix suggested by Elliot Davis of UT Tyler, and he did the testing -- I'm just submitting the fix to master for him.  :)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-28 09:24:17 +13:00
5d5c4a67ec Fix for Bug 6872 - Can't set default SMS messaging options for patron category
Passing SMS driver preference value to the template so that SMS
options can be displayed when appropriate.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-27 21:35:41 +13:00
Chris Cormack
b9808b86df Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited 2011-09-27 11:14:06 +13:00
Ian Walls
26acaf3dfa Bug 6801: checkoverdues returns unnecessary fields, causing slowness
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>
2011-09-27 09:43:25 +13:00
Larry Baerveldt
d5a886201c 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>
2011-09-27 08:38:35 +13:00
c9905750e5 Bug 6869 Batch item modification fails whit accented characters
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>
2011-09-27 08:27:01 +13:00
Chris Cormack
944831555e Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster 2011-09-27 08:22:32 +13:00
05d9510ca9 Bug 6755 Followup setlanguagecookie used in 2 places
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-27 08:22:18 +13:00
Chris Cormack
cac6eb1250 Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster 2011-09-27 07:05:03 +13:00
Chris Cormack
c01fcbf973 Bug 6755 : Fixing a bug with guided reports 2011-09-27 07:04:02 +13:00
Chris Cormack
05be38d438 Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-26 23:27:20 +13:00
166f1668d8 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.
2011-09-26 23:26:09 +13:00
Chris Cormack
c5fe424c0f Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster 2011-09-26 23:14:36 +13:00
Chris Cormack
3bb33fd666 Bug 6755 Follow up, fixing broken call to themelanguage 2011-09-26 23:13:18 +13:00
Chris Cormack
592bced8ed Adding new developer to history 2011-09-26 14:40:13 +13:00
Janusz Kaczmarek
0d480bbf5c 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>
2011-09-26 14:32:32 +13:00
Chris Cormack
7244d5060b Fixing a broken test 2011-09-26 11:55:58 +13:00
Meenakshi.R
8b75f5b38c Bug:6781--Log membership renewal
If patron related logging is tuned on, log membership renewal

Signed-off-by: Amit Gupta <amit.gupta@osslabs.biz>
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-26 11:30:27 +13:00
f640a3ea5f Bug 6649 Allow help screens editing
edithelp.pl hadn't been updated to allow help screen editing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Only a note: Apparently you need to be 'superlibrarian' permission
to edit help pages.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-26 11:26:52 +13:00
e9673ea496 Fix for Bug 4298 - Title detail display: improve display of item level hold information
Message changed for two cases, waiting and item-level hold:

"Waiting for [ patron name ] at [ library] since [ date ]"

"Item-level hold for [ patron name ] for delivery at [ library ] (placed [ date ])"

Signed-off-by: Liz Rea <lrea@nekls.org>
Works as advertsed, is MUCH more clear.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-25 21:25:52 +13:00
Chris Cormack
5e0f0f487a Merge remote-tracking branch 'kc/new/bug_6205' into kcmaster 2011-09-25 21:23:21 +13:00
Robin Sheat
62b76aa98c 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>
2011-09-25 21:21:41 +13:00
Liz Rea
9f688ab5bc Bug 6871 - add schema and sql library reports to guided reports sidebar
This patch adds links for schema.k-c.org and the sql report library to the guided reports sidebar.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-25 15:10:37 +13:00
Joy Nelson
38ca8d6de1 Bug 6773: circ/ysearch.pl is unlimited
Added a LIMIT 10 to the SQL statement
Edited the circulation.pref stating that autocomplete returns the first 10 results at a time

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-25 15:05:56 +13:00
Chris Cormack
04b413623b Fixing a bug in the templates that will break translation 2011-09-24 20:54:42 +12:00
Katrin Fischer
5ecbdcab93 Bug 6901: Add classes to XSLT detail view in OPAC
This patch adds css classes to the fields in XSLT OPAC view so
you can use OpacUserCss system preference for formatting
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: Patch also moves some hard-coded CSS from Utils into the CSS file (only
apples for 880 fields)

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-24 19:49:59 +12:00
Katrin Fischer
f297a3ecd2 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)
2011-09-24 19:49:20 +12:00
3c0883fac7 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>
2011-09-24 19:45:47 +12:00
Liz Rea
0920d96767 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>
2011-09-24 10:09:14 +12:00
Chris Cormack
6b9fff61fb Merge remote-tracking branch 'kc/new/bug_6460' into kcmaster 2011-09-24 10:03:08 +12:00
MJ Ray
a746e11c14 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>
2011-09-24 10:01:09 +12:00
Henri-Damien LAURENT
061f2e9251 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>
2011-09-23 15:35:54 +12:00
Chris Cormack
5e94de9566 Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster 2011-09-23 15:01:21 +12:00
Robin Sheat
ca149ec0bb Bug 4877 - note that the create-db (or related) options are required
Also fix the example so that it is there.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-23 14:52:13 +12:00
Chris Cormack
48d62dccfd Merge remote-tracking branch 'kc/new/bug_6679' into kcmaster 2011-09-23 14:19:11 +12:00
Chris Cormack
e1bb9e5137 Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings
Signed-off-by: Ian <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-23 14:18:21 +12:00
Robin Sheat
9966d218ae Bug 6824 - correctly check basket viewing permissions
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.

Applies to both 3.04.04 and master.

Signed-off-by: Brendan <info@bywatersolutions.com>
Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-23 11:47:25 +12:00
Chris Cormack
2c09527abe Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster 2011-09-23 11:34:28 +12:00
Chris Cormack
8e7b163608 Bug 6755 follow up, fixing broken POD 2011-09-23 11:33:00 +12:00
Katrin Fischer
c5dfe7bb35 Bug 3941: Follow up
Improving the notices field to make it possible
- to expand more than one field at a time
- hide the notice content with another click

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-23 10:06:47 +12:00
Katrin Fischer
042fd50313 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>
2011-09-23 10:06:06 +12:00
Alex Arnaud
d60732119c Bug 6755 follow up
Use C4::Templates::_get_template_file instead od C4::Output::_get_template_file
in preferences.pl

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-23 09:48:28 +12:00
6b8be20497 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>
2011-09-23 09:47:09 +12:00
Chris Cormack
4029e8ed75 Bug 6881 - Not able to accept a suggestion (typo in template)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Easy fix, works great.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-23 09:27:48 +12:00
dc439dcb7b 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>
2011-09-23 06:21:05 +12:00