Commit graph

14362 commits

Author SHA1 Message Date
Magnus Enger
a54716e50d Bug 6459 : Needless call to C4::Context->dbh in C4::Templates::themelanguage()
As far as I can tell, $dbh is never used again in the scope in which it is
created. This patch simply removes the line.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 11:16:36 +12:00
Janusz Kaczmarek
1b5805e336 Bug 6462 - Authority type is not displayed in OPAC
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 11:08:42 +12:00
Janusz Kaczmarek
86096350a9 Bug 6463 - Authorities browsing error when using auth. plugins
[2011.06.05] I confirm the solution. On my test UNIMARC installation, I haven't
an error 500 but I have a wrong result pages navigation bar which doesn't limit
search result on the selected authority type.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 11:01:37 +12:00
84a8c9a522 Fix for Bug 6487 - No error explanation if patron expiration date is missing
The script tries to parse the patron expiration date without
checking that it is a valid date. If expiration date is empty
it doesn't get caught along with past expiration dates.

I wonder if this line was supposed to catch this problem:

Line 233: if ( $warning_year*$warning_month*$warning_day==0

This patch adds "!$borrower->{'dateexpiry'} ||" to that line.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 10:49:43 +12:00
Colin Campbell
716442708b Remove a typo from serials-edit template
Rogue 'i' removed from template would show up in display

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 10:17:09 +12:00
Elliott Davis
bc8984f5d6 Bug 6491 Added: id in opac-privacy around the privacy policy div container Testing: An ID should appear in the container for the privacy rules saying userprivacy
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 10:10:11 +12:00
2281350b6e Bug 6464 Check inconsistent placeholders in translated strings
Display a warning for strings that don't have the same count of %s placeholders
that the English original strings. Don't warn for not translated string and
'fuzzy' string because those strings are not installed, and this is the
translator responsability to examine them.

Based on Frère Sébastien Marie work.

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-09 19:48:48 +12:00
Chris Cormack
e071651533 Updating upgrade information to note the fact language templates need
to be rebuilt
2011-06-09 09:51:15 +12:00
Ricardo Dias Marques
24d3e5b257 Updating INSTALL.opensuse file with the changes by Freek de Kruijf
Freek de Kruijf (from @opensuse.org) has adapted the installation
guide (that I - Ricardo Dias Marques - had created) about installing
"Koha 3.0.0 in openSUSE 11.0" and he kindly updated it with the
information about installing the same version of Koha (3.0.0),
but on a more recent version of openSUSE (openSUSE 11.3 instead
of openSUSE 11.0).

He also has put his version on the Koha Wiki:

Koha 3.0.0 on openSUSE 11.3
http://wiki.koha-community.org/wiki/Koha_3.0.0_on_openSUSE_11.3

This commit updates the INSTALL.opensuse to have the content of
that wiki page (last modified on 16-Oct-2010), changing only
things that are related to converting the format from a wiki
page to text format (replacing some HTML tags by some markers
and replacing screenshots by their descriptions).

This commit may be applied to the "master" branch and it can
also be "cherry-picked" to the "3.2.x" branch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-09 09:45:22 +12:00
Katrin Fischer
4cf1046816 Bug 6472: HidePatronName on detail page broken
TT issue

To test:
- Check out an item to a patron
- Go to detail page of the title in intranet
- Normal view will show cardnumber when HidePatronName is activated
- Normal view will show patron's name, when HidePatronName is off

Hold page was not broken.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-08 14:28:21 +12:00
Fridolyn SOMERS
c78a926046 BUG6067 When Add Duplicate changing framework would loose data
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-07 16:39:48 +12:00
Chris Cormack
700249eb3c Merge remote-tracking branch 'kc/new/bug_5868' into kcmaster 2011-06-07 16:35:30 +12:00
Jared Camins-Esakov
e594e8c8b9 Bug 5868 follow-up: missing subfields in subject index
Index 658 (curriculum) as subject, and add some missing subfields to the subject
index.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-07 16:34:30 +12:00
Nicole C. Engard
54d4277125 Bug 5268: Change all occurances of 'debar' to 'restrict'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-07 11:28:01 +12:00
ruth@bywatersolutions.com
414880167c Bug 6467: Add shelving location to checkin screen
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-07 11:16:17 +12:00
529b6ab9fe Fix for Bug 6446, batch item deletion interface problems
Scoping error in T:T variable caused incorrect column display
in batch delete and batch edit interfaces.
After applying this patch header cells should align correctly
with content and checkbox column should appear.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-05 18:47:45 +12:00
Frédérick Capovilla
ddcf63d29b Bug 6444 Corrects encoding problems in subscription-add.pl
When searching for a vendor, if the vendor has accented character in its
name, the vendor's name that's added in the form of subscription-add.pl
is encoded incorrectly.

[2011.06.01] F. Demians. Port it to 3.4

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-05 18:41:43 +12:00
Chris Nighswonger
939d0ab639 Bug 2246 - (Partial) Label printing doesn't work with Unicode characters
This patch provides a very partial fix for this bug in that it reduces
the number of pdf generation failures due to a "wide character" error.
It does not ensure that all unicode characters will print correctly as
this is dependent upon many other issues mentioned in this bug and
various posts to the developer list.

What this code does is test to see if the pdf stream is utf8 encoded
and if it is, explicitly declares it to be so. Unicode chars will still
print incorrectly, but the pdf will be created and should open properly
in whatever pdf reader.

You may test this by adding any character with a diacritical to the
title of a bib and then attempting to generate a label pdf with the
title of that bib. Before the patch is applied the resulting pdf
should contain an error mentioning a wide character issue. After the
patch is applied, the pdf should be valid.

No documentation changes are necessary as a result of this patch.

This patch should be backported to 3.2.x.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-04 20:03:10 +12:00
ded47a7793 Fix for Bug 6337 - Variable scope errors in staff client cart print view
Also removing "Return to cart" link from the print view,
redundant now that the print view prints and redirects
automatically.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-04 19:55:31 +12:00
Nicole C. Engard
ee05848331 bug 6442 change opacnav wording so it's more accurate
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-04 19:53:27 +12:00
ruth@bywatersolutions.com
bf503688a0 Bug 6397: fix variable name in template that mis-aligns table
This patch repairs the detail table when enumeration and chronology is present.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-04 19:48:20 +12:00
a53ae578b4 Fix for Bug 5714 - Unescaped ampersands in OPAC facets
In the OPAC the "query_cgi" variable passed to the template
outputs a string like this:

idx=kw&q=thing

The ampersand is unescaped. Adding an "|html" filter to
the variable. Also correcting some TT markup which
added a new validation error (an unopened <div>).

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-04 19:44:49 +12:00
Ian Walls
5ae3a3aa4f Bug 5929: use branch admin email for advance_notice.pl emails
This squash commit takes the two patches from Srdjan and adds a minor fix to work with
template toolkit variable renames.

Squashed commit of the following:

commit 2cab669d1fd072600942e1e6fbf3378944255a68
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Thu Jun 2 14:08:40 2011 -0400

    Bug 5929: Fix advanced_notices to use new template-toolkit compatible message names

    Uses 'item_due' and 'advance_notice' for advance notices names; letters do not send otherwise

commit caded04702d5eebd0f63a3b93cdddce28257f092
Author: Srdjan Jankovic <srdjan@catalyst.net.nz>
Date:   Tue Mar 29 12:38:49 2011 +1300

    wr77490 (bug 5929): removed debugging leftover

commit 1944de0de40f937b1d8748500f24a119390db3f0
Author: Srdjan Jankovic <srdjan@catalyst.net.nz>
Date:   Tue Mar 22 19:05:23 2011 +1300

    wr77490 (bug 5929): use branch email in preference for due notices

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-04 19:41:26 +12:00
Frère Sébastien Marie
8b3c9e3ef9 Bug 6452: Use placeholders in sql
Signed-off-by: Frre Sbastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-04 06:56:36 +12:00
Frère Sébastien Marie
4475e9a675 Bug 6452 : Use placeholders in sql but makepayment seems dead code ?
Signed-off-by: Frre Sbastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-04 06:54:57 +12:00
Chris Cormack
8c9645b1f9 Bug 6350 Adding Fridolyn Somers to the history 2011-06-03 14:31:54 +12:00
Fridolyn SOMERS
8e8093b4fb BUG6436 Don't allow deletion of an itemtype used in items.itype
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-03 14:24:54 +12:00
ruth@bywatersolutions.com
586a476ec4 Bug 6362: fixes display to re-embed items in OPAC MARC view
This patch is a followon to repair a side-effect of Bug 5579.  A
similar patch is already pushed to make this change for ISBD view.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-03 14:18:51 +12:00
Chris Cormack
f0a1165a2c Bug 6350 - Keeping history page up to date 2011-06-03 11:37:33 +12:00
Elliott Davis
7a2bf32ba2 Bug 6437: Added div with id yui-main around advsearch form
Testing: Make sure div shows up directly above form

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-03 11:18:20 +12:00
Liz Rea
d816d6fc5b Bug 6380 - Z39.50 Cataloging Search needs a way to try search again, even if results are found
This patch adds a nice button to the results page to "Try Another Search" even if results are found. It also makes the "no results found" try again link a proper button.

To test:
Do a search for something that will give results -- there should now be a button to "Try Another Search"

Do a search for something that returns no results -- The link for "Try Another Search" should now be a proper button.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
[EDIT: Form slightly changed in order to remember biblio and framework. Link is no official html method value btw.]

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-03 11:11:34 +12:00
Robin Sheat
c779f2b380 Bug 6361 - make the packages work with koha 3.4
This commit does the following:
* Merge the changelog from the releases of 3.2
* Adds a command 'koha-upgrade-to-3.4' that does the MARC item splitting
  stuff.
* Adds a debconf note to make sure people know that they need to run
  the above command.
* Fixes the inclusion of jQuery in the packages.
* Makes build-git-snapshot build packages with a 3.5 version.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-03 11:06:31 +12:00
Chris Cormack
b8ccb80bb1 Bug 5918 : Use the default messaging preferences if the user does not select any
Signed-off-by: Jesse Weaver <pianohacker@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-02 09:14:38 +12:00
Chris Cormack
bbe37ed54f Merge remote-tracking branch 'kc/new/bug_5683' into kcmaster 2011-06-02 09:12:29 +12:00
Chris Cormack
2468bab611 Fixing permissions, no need for this file to be executable 2011-06-02 09:05:37 +12:00
Jared Camins-Esakov
5bbfb94f43 Bug 5683 follow-up: calls to ModBiblio can still fail
Because C4::Charset directly manipulates the MARC::Record object, bad data has
to be cleaned in ModBiblio before the call into C4::Charset. The corrupted
records can also break the Zebra index. After this fix has been applied, it
would probably be a good idea to run the misc/maintenance/touch_all_biblios.pl
script to ensure that this problem has been cleared up.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-02 09:04:48 +12:00
Chris Cormack
7aa3a05591 Merge remote-tracking branch 'kc/master' into new/bug_5683 2011-06-02 09:02:50 +12:00
Jared Camins-Esakov
d949472324 Add unit tests to ensure bug 5683 doesn't reappear
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-06-02 08:46:40 +12:00
Chris Cormack
27ec47ba15 Bug 6429 : Fixing numbering of developers 2011-05-31 09:10:21 +12:00
6e4a9c29c9 6429: Sync history/about
Adding new developers (including myself :-)
Adding Rijksmuseum.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-31 08:57:49 +12:00
468f40010d 6429: Sync history/about
Some initial corrections in history/about to improve syncing.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-31 08:56:33 +12:00
Chris Cormack
44b52a4c87 Updating about page 2011-05-29 22:52:59 +12:00
98ff8672e8 Fix for Bug 6338 - Datepickers on OPAC hold form does not work
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 16:14:16 +12:00
71d9dfda3c Fix for Bug 6306 - It is not possible edit news
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 16:05:34 +12:00
Katrin Fischer
8a3160c870 Bug 6415: Can't make patron card batch
TT corrections from bug 6343 for label creator were also needed for patron card creator.

- Manage Batch and New Batch were missing the branch info
- Add link on patron search was missing batch id parameter

To test:
- Check branch is correctly shown on pages 'Manage Batch' and 'New Batch'
- Check you can create a new batch and add names to it by using the 'Add'
right to the patron's name

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 16:00:57 +12:00
f7d0939942 Fix for Bug 6408 - column alignment off on the patron categories admin
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 15:58:20 +12:00
Janusz Kaczmarek
52ebf8f3f0 Bug 6365: Missing information about tab number when mandatory fields unfilled
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 15:53:38 +12:00
559091c558 Fix for Bug 6364 - Display of item availability broken on OPAC detail screen
Owen:

The markup for showing item availability has been moved to an include
file. The include lacked the scope declaration for the item results
loop. Adding the scope declaration to the include file means it can't
be used by other template unless within the same scope, but I'm not
aware of a better way to do it given the number of variables in use.

Frédéric:

I confirm the bug.

I propose a alternative solution which solve the bug and keep its
versability-reusability to the include file. With this solution, when including
item-status.inc, the foreach loop variable name, which can change from template
to template, is renamed by using a local variable definition: ie a variable
name specified after file name in the INCLUDE directive, this variable
temporalily masking any existing variable.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 15:49:50 +12:00
481ffe7474 Bug 6347 - Fix for itemlevel holds in OPAC
Edits by Owen:

- More variable scope corrections
- Minor markup and style tweak
- Table column span correction

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Item level holds can be placed and hold saved
- Table and layout are ok now

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 15:46:57 +12:00
31fbe0d70d Fix for Bug 6300 - can't get to other pages of marc import
T:T variable scope error.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 14:03:14 +12:00