]> git.koha-community.org Git - koha.git/log
koha.git
13 years agoBug 6363 : Make the "Item Location" selectbox appears correctly in inventory.pl
Frédérick Capovilla [Wed, 18 May 2011 14:32:44 +0000 (10:32 -0400)]
Bug 6363 : Make the "Item Location" selectbox appears correctly in inventory.pl

The "Item Location" selectbox didn't appear when the only available MARC
framework was the default framework.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2bdd8ebd1e12ed0ab185af2cd7d57f70811a30e3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6375, Markup and style corrections for overdue report
Owen Leonard [Thu, 19 May 2011 17:42:50 +0000 (13:42 -0400)]
Fix for Bug 6375, Markup and style corrections for overdue report

[2011.05.21] F. Demians - I confirm the bug and solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7d237976490b31f67bd5d79701b6a206ed37c5e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6377 - fines should be red on patron search
Owen Leonard [Wed, 25 May 2011 12:54:59 +0000 (08:54 -0400)]
Fix for Bug 6377 - fines should be red on patron search

Adding classes for credit (green) and debit (red)

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a17e9712507b2f30b232503747cee4c5daa274ab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBUG6389 Administration menu like Tools menu
Fridolyn SOMERS [Mon, 23 May 2011 11:51:14 +0000 (13:51 +0200)]
BUG6389 Administration menu like Tools menu

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6443fae16d098c3c47aaadd22f2ee0d0257d89cf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6402, Lists sorted by year appear to be empty
Owen Leonard [Tue, 24 May 2011 16:11:07 +0000 (12:11 -0400)]
Fix for Bug 6402, Lists sorted by year appear to be empty

If you create a list, populate it with titles, and then change the sort to
"year" it will appear as if your list is empty. The SQL in VirtualShelves.pm's
GetShelfContents tries to accept "year" as a sort by but 'year' is not a valid
column name.

The SQL pulls biblioitems.publicationyear. Changing this to
'biblioitems.publicationyear as year,'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a13194f2cde980dc38efbf4e125754ee6449f91c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 6409: fix pagination of SQL report output when parameters are used
Galen Charlton [Tue, 24 May 2011 19:25:41 +0000 (15:25 -0400)]
bug 6409: fix pagination of SQL report output when parameters are used

Fixes bug where paging through output of an SQL report that includes
one or more parameters fails by asking you for the parameter values
and again and sending you back to the first page of results.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 577ce72e91dfafda270deb37d20c4ef1d573d493)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_6433: exception handling
Srdjan Janković [Tue, 31 May 2011 03:18:21 +0000 (15:18 +1200)]
bug_6433: exception handling

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
(cherry picked from commit 5829cef6d837cee4fddb0b917520206c86518d06)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBUG 6388 Broken pager images in branch_transfer_limits.tt
Fridolyn SOMERS [Mon, 23 May 2011 13:13:21 +0000 (09:13 -0400)]
BUG 6388 Broken pager images in branch_transfer_limits.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 529842ab6c34198e4c64a1bfe97b9ff34e456f40)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6459 : Needless call to C4::Context->dbh in C4::Templates::themelanguage()
Magnus Enger [Sat, 4 Jun 2011 17:51:00 +0000 (19:51 +0200)]
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>
(cherry picked from commit a54716e50d2099b06f952c7494b9651db3a7a7de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6462 - Authority type is not displayed in OPAC
Janusz Kaczmarek [Sun, 5 Jun 2011 00:25:13 +0000 (03:25 +0300)]
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>
(cherry picked from commit 1b5805e336fbcc91def6d10b13d091fe918e8bbe)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6463 - Authorities browsing error when using auth. plugins
Janusz Kaczmarek [Sun, 5 Jun 2011 16:34:44 +0000 (19:34 +0300)]
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>
(cherry picked from commit 86096350a9904990b402dd84a089c4f733382db1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6487 - No error explanation if patron expiration date is missing
Owen Leonard [Wed, 8 Jun 2011 14:07:32 +0000 (10:07 -0400)]
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>
(cherry picked from commit 84a8c9a52222355dc298d00164f363f37e9a400c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoRemove a typo from serials-edit template
Colin Campbell [Thu, 9 Jun 2011 14:11:30 +0000 (15:11 +0100)]
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>
(cherry picked from commit 716442708b199f07a85df75434b1fa99d9ccaf0f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6491 Added: id in opac-privacy around the privacy policy div container Testing...
Elliott Davis [Wed, 8 Jun 2011 16:16:00 +0000 (12:16 -0400)]
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>
(cherry picked from commit bc8984f5d6d7169d7758baa1dd8104c8bbb347c5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6464 Check inconsistent placeholders in translated strings
Frédéric Demians [Mon, 6 Jun 2011 12:43:21 +0000 (14:43 +0200)]
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>
(cherry picked from commit 2281350b6eb2b4d7043aad7baeb93f9bfa185a91)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating upgrade information to note the fact language templates need
Chris Cormack [Wed, 8 Jun 2011 21:51:15 +0000 (09:51 +1200)]
Updating upgrade information to note the fact language templates need
to be rebuilt
(cherry picked from commit e0716515336da42f604764eb37be47354be73a8b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating INSTALL.opensuse file with the changes by Freek de Kruijf
Ricardo Dias Marques [Wed, 8 Jun 2011 11:44:36 +0000 (12:44 +0100)]
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>
(cherry picked from commit 24d3e5b2577767d12b8318a7a612ec3ac14f8657)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6472: HidePatronName on detail page broken
Katrin Fischer [Mon, 6 Jun 2011 21:32:28 +0000 (23:32 +0200)]
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>
(cherry picked from commit 4cf1046816d86200f1d55030b9bb28684059563d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBUG6067 When Add Duplicate changing framework would loose data
Fridolyn SOMERS [Tue, 17 May 2011 16:10:01 +0000 (18:10 +0200)]
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>
(cherry picked from commit c78a926046f93606681e64c332f374aa2bba603e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5868 follow-up: missing subfields in subject index
Jared Camins-Esakov [Sat, 7 May 2011 14:28:20 +0000 (10:28 -0400)]
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>
(cherry picked from commit e594e8c8b9ce762faa8e7377e54a91f6c525a0c6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5268: Change all occurances of 'debar' to 'restrict'
Nicole C. Engard [Wed, 11 May 2011 08:30:20 +0000 (04:30 -0400)]
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>
(cherry picked from commit 54d42771258681762b659a2685e2678dc6bd8ef6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6446, batch item deletion interface problems
Owen Leonard [Thu, 2 Jun 2011 06:30:22 +0000 (02:30 -0400)]
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>
(cherry picked from commit 529b6ab9fe21a508e01e1eb8dd37d83e8e2556c7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6444 Corrects encoding problems in subscription-add.pl
Frédérick Capovilla [Thu, 2 Jun 2011 10:36:54 +0000 (11:36 +0100)]
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>
(cherry picked from commit ddcf63d29b7f4fc20e46765b76df95e037caa2d6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 2246 - (Partial) Label printing doesn't work with Unicode characters
Chris Nighswonger [Tue, 19 Apr 2011 13:07:49 +0000 (09:07 -0400)]
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>
(cherry picked from commit 939d0ab63939ad5cd2d6946bc203208d533089d2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6337 - Variable scope errors in staff client cart print view
Owen Leonard [Fri, 13 May 2011 14:58:18 +0000 (10:58 -0400)]
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>
(cherry picked from commit ded47a7793dc2bf8568a01ce2d7b8467d6f3b5b8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 6442 change opacnav wording so it's more accurate
Nicole C. Engard [Wed, 1 Jun 2011 04:08:17 +0000 (00:08 -0400)]
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>
(cherry picked from commit ee05848331e29145c33d30ff20a573e5185b89e4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6397: fix variable name in template that mis-aligns table
ruth@bywatersolutions.com [Tue, 24 May 2011 19:56:53 +0000 (15:56 -0400)]
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>
(cherry picked from commit bf503688a0b852b268677790b1a47a861f6eef10)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5714 - Unescaped ampersands in OPAC facets
Owen Leonard [Fri, 27 May 2011 12:54:06 +0000 (08:54 -0400)]
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>
(cherry picked from commit a53ae578b428a3cddd2802a972ee048b479a44aa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5929: use branch admin email for advance_notice.pl emails
Ian Walls [Fri, 3 Jun 2011 20:29:38 +0000 (16:29 -0400)]
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>
(cherry picked from commit 5ae3a3aa4f79f457605e03f53a4b385212d9d93e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6452: Use placeholders in sql
Frère Sébastien Marie [Sun, 27 Feb 2011 14:36:12 +0000 (15:36 +0100)]
Bug 6452: Use placeholders in sql

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8b3c9e3ef975c72fb025930d58358d3564cb0aac)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6452 : Use placeholders in sql but makepayment seems dead code ?
Frère Sébastien Marie [Sun, 27 Feb 2011 14:24:53 +0000 (15:24 +0100)]
Bug 6452 : Use placeholders in sql but makepayment seems dead code ?

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4475e9a67574c32cd01b47bf6f22aeb3cc0eb648)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6350 Adding Fridolyn Somers to the history
Chris Cormack [Fri, 3 Jun 2011 02:31:54 +0000 (14:31 +1200)]
Bug 6350 Adding Fridolyn Somers to the history
(cherry picked from commit 8c9645b1f9f70541c7c9c5ee6d334ff15095740c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBUG6436 Don't allow deletion of an itemtype used in items.itype
Fridolyn SOMERS [Tue, 31 May 2011 13:16:15 +0000 (15:16 +0200)]
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>
(cherry picked from commit 8e8093b4fbcaa75a71134d621f6d328f13390d07)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6362: fixes display to re-embed items in OPAC MARC view
ruth@bywatersolutions.com [Tue, 24 May 2011 19:56:38 +0000 (15:56 -0400)]
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>
(cherry picked from commit 586a476ec4a62f47128d16dc77f2d1145e50a493)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6350 - Keeping history page up to date
Chris Cormack [Thu, 2 Jun 2011 23:37:33 +0000 (11:37 +1200)]
Bug 6350 - Keeping history page up to date
(cherry picked from commit f0a1165a2c3e32fb8e2b1ac48793f6d34c54cb2b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5918 : Use the default messaging preferences if the user does not select any
Chris Cormack [Tue, 31 May 2011 22:34:02 +0000 (10:34 +1200)]
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>
(cherry picked from commit b8ccb80bb11651d40fa07ed3fb084c112b55a6eb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixing permissions, no need for this file to be executable
Chris Cormack [Wed, 1 Jun 2011 21:05:37 +0000 (09:05 +1200)]
Fixing permissions, no need for this file to be executable
(cherry picked from commit 2468bab611e91a3e1d3477fecd8f4abc1b63a058)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5683 follow-up: calls to ModBiblio can still fail
Jared Camins-Esakov [Wed, 6 Apr 2011 12:58:07 +0000 (08:58 -0400)]
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>
(cherry picked from commit 5bbfb94f4399485a96c7f4478a3641da450926ca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdd unit tests to ensure bug 5683 doesn't reappear
Jared Camins-Esakov [Wed, 6 Apr 2011 14:07:29 +0000 (10:07 -0400)]
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>
(cherry picked from commit d949472324b37b4484ec962bf96722c118a2bac2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6429 : Fixing numbering of developers
Chris Cormack [Mon, 30 May 2011 21:10:21 +0000 (09:10 +1200)]
Bug 6429 : Fixing numbering of developers
(cherry picked from commit 27ec47ba15978b82c75f792eb39cef9a43c1cf18)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6429: Sync history/about
Marcel de Rooy [Mon, 30 May 2011 12:14:03 +0000 (14:14 +0200)]
6429: Sync history/about

Adding new developers (including myself :-)
Adding Rijksmuseum.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6e4a9c29c948cb34e3524e2581421ffa7649c39f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6429: Sync history/about
Marcel de Rooy [Mon, 30 May 2011 11:19:39 +0000 (13:19 +0200)]
6429: Sync history/about

Some initial corrections in history/about to improve syncing.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 468f40010d753ede2e45009f246f4fc6114584de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating about page
Chris Cormack [Sun, 29 May 2011 10:52:59 +0000 (22:52 +1200)]
Updating about page
(cherry picked from commit 44b52a4c870684bcbf58bf0b87302c6b5227cfbd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6338 - Datepickers on OPAC hold form does not work
Owen Leonard [Wed, 11 May 2011 14:51:01 +0000 (10:51 -0400)]
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>
(cherry picked from commit 98ff8672e8b10a8835fe6ec37c4a161902a52ffb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6306 - It is not possible edit news
Owen Leonard [Fri, 20 May 2011 19:38:51 +0000 (15:38 -0400)]
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>
(cherry picked from commit 71d9dfda3c75a53485abbb1eec95e4e9720a1f53)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6415: Can't make patron card batch
Katrin Fischer [Fri, 27 May 2011 05:46:06 +0000 (07:46 +0200)]
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>
(cherry picked from commit 8a3160c870d17c4a4efa7d91afa018afc5b4f442)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6408 - column alignment off on the patron categories admin
Owen Leonard [Wed, 25 May 2011 16:55:22 +0000 (12:55 -0400)]
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>
(cherry picked from commit f7d0939942268e736f5d7939417ba3d6532f2f79)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6365: Missing information about tab number when mandatory fields unfilled
Janusz Kaczmarek [Wed, 18 May 2011 16:19:28 +0000 (18:19 +0200)]
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>
(cherry picked from commit 52ebf8f3f0dde98386cf5a12917c19e6d236a465)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6364 - Display of item availability broken on OPAC detail screen
Owen Leonard [Wed, 18 May 2011 15:01:20 +0000 (11:01 -0400)]
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>
(cherry picked from commit 559091c5589887adc774e2f217c64de390270d4e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6347 - Fix for itemlevel holds in OPAC
Chris Cormack [Mon, 16 May 2011 21:23:52 +0000 (09:23 +1200)]
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>
(cherry picked from commit 481ffe7474fa9d0a972dd4be70ac2cad62e315a6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6300 - can't get to other pages of marc import
Owen Leonard [Wed, 11 May 2011 14:56:39 +0000 (10:56 -0400)]
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>
(cherry picked from commit 31fbe0d70dff7ed4e04a4b84462c6c833090ead2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow-up fix for Bug 6170 'More options' in advanced search broken
Owen Leonard [Mon, 16 May 2011 19:42:12 +0000 (15:42 -0400)]
Follow-up fix for Bug 6170 'More options' in advanced search broken

Simplifying markup in the staff client advanced search:

- Moving IDs to fieldsets and removing redundant divs
- Removing unused section
- Adding missing IDs and fieldsets

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c97868ef6338d2dd41f9d75618c9d4ff9a0db8cd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6417 - Template variable errors in Guided Reports
Owen Leonard [Wed, 25 May 2011 16:52:23 +0000 (12:52 -0400)]
Fix for Bug 6417 - Template variable errors in Guided Reports

Looks like the T:T conversion script missed these instances
of TMPL markup because they had line breaks:

<!-- TMPL_VAR
NAME="name" -->

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d19998413a7a67798626400466e8adaee167a579)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6332, Hold forms missing 'clear date' link
Owen Leonard [Fri, 13 May 2011 15:11:46 +0000 (11:11 -0400)]
Fix for Bug 6332, Hold forms missing 'clear date' link

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3e69eb7cddeeb31c4c72cc4a0e994e17c691fc0b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5020 - on patron record sex should be gender
Owen Leonard [Tue, 24 May 2011 17:00:29 +0000 (13:00 -0400)]
Fix for Bug 5020 - on patron record sex should be gender

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f1ecfc7669f085c7577100db2902ac0de34b827e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6378 - Misaligned columns on tags approval page
Owen Leonard [Fri, 20 May 2011 14:48:13 +0000 (10:48 -0400)]
Fix for Bug 6378 - Misaligned columns on tags approval page

T:T variable scope correction.

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>
(cherry picked from commit fa7d6a0435f5ef2e6b8f50a61b95d4bfc22c8bef)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBUG6091 Remove undeclared syspref OPACAdvSearchInputCount
Fridolyn SOMERS [Wed, 6 Apr 2011 14:04:55 +0000 (16:04 +0200)]
BUG6091 Remove undeclared syspref OPACAdvSearchInputCount

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a8f5bf93f962ae21c2bddf32832a511d9e778e12)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdd entries so Z39.50 public server works
Tomas Cohen Arazi [Wed, 30 Mar 2011 14:38:42 +0000 (11:38 -0300)]
Add entries so Z39.50 public server works

I added a comment on the file so the user uncomments the appropriate koha-conf.xml sections.

To+

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b4b445818f46e59cf62f968f219963c132832c2b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6342 Help link doesn't popup anymore contextual help page
Frédéric Demians [Sun, 15 May 2011 05:23:03 +0000 (07:23 +0200)]
Bug 6342 Help link doesn't popup anymore contextual help page

Fix help.pl script to deal with Template Toolkit.

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>
(cherry picked from commit becc07cb7b944f66d7f7df92dfc69317e8127d1e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6370 - news showing that it's for the opac when it's for the librarian...
Owen Leonard [Fri, 20 May 2011 19:22:11 +0000 (15:22 -0400)]
Fix for Bug 6370 - news showing that it's for the opac when it's for the librarian interface

T:T variable scope error.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 28eca1ec926e2971cf20d1ce18dafe6896fb7db8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6351: Unable to delete branch-specific circulation rule
D Ruth Bavousett [Tue, 17 May 2011 15:45:48 +0000 (11:45 -0400)]
Bug 6351: Unable to delete branch-specific circulation rule

The URL on the page did not have a branchcode, so the delete failed silently, and
returned the user to the "All" rules page.  Turns out, the array for the rules was
not being populated with the branchcode!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit eba64bf25d8da0f091ce0b5d8329385638fb1fe1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6340: Pagination bar on guided reports result page broken
Katrin Fischer [Sat, 14 May 2011 10:36:25 +0000 (12:36 +0200)]
Bug 6340: Pagination bar on guided reports result page broken

The pagination on the guided reports page was not showing up.
TT problem.

To test:
Add a sql report with more than 20 results.
Example: select * from borrowers
Without the patch, only the first 20 results will show and no pagination bar.

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>
(cherry picked from commit ad6ec128e7cb012bd0e4afa8ac168b0c6b08d5db)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6258 - Guided reports wizard 'Build new' brings up empty page
Liz Rea [Fri, 20 May 2011 19:41:20 +0000 (14:41 -0500)]
Bug 6258 - Guided reports wizard 'Build new' brings up empty page

Patch fixes a TT error that caused Build New to be empty.

To test:
Click More -> Reports, you should see the welcome page and be able to step through creating the report.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 14364d9866dd65abb737a59e49f297328edde83d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 3140 - It is possible to email someone else's private list
Owen Leonard [Tue, 17 May 2011 15:07:03 +0000 (11:07 -0400)]
Fix for Bug 3140 - It is possible to email someone else's private list

Adding check for ShelfPossibleAction("view") to make sure the logged
in user has permission to view the selected list when downloading
or emailing a list.

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>
(cherry picked from commit b65f6d0a99dc13e73aed5058a44a72895c829b32)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6395, Cannot create routing list
Owen Leonard [Tue, 24 May 2011 19:15:18 +0000 (15:15 -0400)]
Fix for Bug 6395, Cannot create routing list

Some old TMPL tags got left behind.

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>
(cherry picked from commit 5984520211337750fbae0fe5a5fcba7cb85bf212)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6343: TT issues in label creator
Katrin Fischer [Fri, 20 May 2011 19:14:56 +0000 (21:14 +0200)]
Bug 6343: TT issues in label creator

- Manage Batch had no branch set
- New Batch had no branch set
- Add link on item result list was broken, missing the batchid

To test:
Create a new batch and add items one by one. Look at 'Manage batches'.
Check that the branch in the top right corner is always correctly shown and set.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit f515052d6e2a41f0a84b2999204691a84ebe78e1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5658 can't delete subfields in frameworks
Fridolyn SOMERS [Mon, 23 May 2011 13:07:28 +0000 (09:07 -0400)]
Bug 5658 can't delete subfields in frameworks

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
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>
(cherry picked from commit fafbff9018ecc4030983ca14c4743813e2e95f2b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6401 fix to the history file
ruth@bywatersolutions.com [Tue, 24 May 2011 19:57:08 +0000 (15:57 -0400)]
Bug 6401 fix to the history file

This patch adds Ian Walls' name to the history file, so he can be found.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 59e9137d8339de68f2cc4c7dcc60f4e2d7fbea43)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6350 : Updating history docs
Chris Cormack [Tue, 17 May 2011 03:36:01 +0000 (15:36 +1200)]
Bug 6350 : Updating history docs

http://bugs.koha-community.org/show_bug.cgi?id=6350
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37cf503fdf1006e0c0c935e795dfc8cb4af80c9a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for bug 6367 - 'Preview MARC' hover button does not show correct MARC record
Owen Leonard [Wed, 18 May 2011 18:05:47 +0000 (14:05 -0400)]
Fix for bug 6367 - 'Preview MARC' hover button does not show correct MARC record

Misplaced line of JavaScript meant that the menu always grabbed
the ID of the last item in the search results.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3b8c61d5dcd985ea4e2bd80f9f0628f4cb4dd7c0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoImprove error message when translation installation fails
Frédéric Demians [Wed, 18 May 2011 05:23:21 +0000 (07:23 +0200)]
Improve error message when translation installation fails

For Translator Manager (myself...). A translation installation may fail because
translator hasn't enter properly string parameters (%s). With this patch, the
message ID is displayed not only the parameter.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e6b591d95fd40eb68bfa71761010bf85e3116c5b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug #6131 - change index "Author-name-personal" for "Personal-name"
Alex Arnaud [Fri, 13 May 2011 14:19:09 +0000 (16:19 +0200)]
Bug #6131 - change index "Author-name-personal" for "Personal-name"

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>
(cherry picked from commit 7006eebd6eb234901e2397f289444b7024d0e16b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6294: {BIBLIONUMBER} parsing for SearchForTitleIn
Ian Walls [Tue, 3 May 2011 15:37:46 +0000 (11:37 -0400)]
Bug 6294: {BIBLIONUMBER} parsing for SearchForTitleIn

Adds support for parsing of the biblionumber into the SearchForTitleIn system preference, allowing
external sites with APIs (like Facebook or Twitter) to do link-backs to the details page for the
title.

Sample code for implementing Facebook "like" links and Twitter "tweet this" are included on the bug report

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e064aba47e2047df9feeac985573784f6eff5912)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6031 : Fix for syntax (bashism crept into a pure sh script)
Chris Cormack [Mon, 2 May 2011 00:39:35 +0000 (12:39 +1200)]
Bug 6031 : Fix for syntax (bashism crept into a pure sh script)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ae70c2f79007e224510d13eb52e6a392c60e25a6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5509 - use an XML parser to get values from config
Robin Sheat [Thu, 16 Dec 2010 05:05:43 +0000 (18:05 +1300)]
Bug 5509 - use an XML parser to get values from config

Using sed and regex was causing issues when LDAP connection details were
added.

See
http://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags/1732454#1732454
for more information.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dfc1038931618a820942f8cb9456be72648ce0f4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.04.01.000 v3.04.01
Chris Nighswonger [Tue, 24 May 2011 02:59:06 +0000 (22:59 -0400)]
Updating Version Number to 3.04.01.000

13 years agoRelease Notes for 3.04.01.000
Chris Nighswonger [Tue, 24 May 2011 02:56:37 +0000 (22:56 -0400)]
Release Notes for 3.04.01.000

13 years agoUpdate translation 3.4.1
Frédéric Demians [Mon, 23 May 2011 05:51:36 +0000 (07:51 +0200)]
Update translation 3.4.1
(cherry picked from commit cd95c644b8c4ce5e419a778d34d9550e1e711cdd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6330 - Change hold language from 'until' to 'since'
Nicole C. Engard [Wed, 11 May 2011 19:46:29 +0000 (15:46 -0400)]
Bug 6330 - Change hold language from 'until' to 'since'

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>
(cherry picked from commit 10ea4544ea0813d359f9f2df68ba9ad531cc86e7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6320 Generate Next button doesn't generate next issue
Frédéric Demians [Tue, 10 May 2011 17:25:05 +0000 (13:25 -0400)]
Bug 6320 Generate Next button doesn't generate next issue

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c92f9dee40c0945575b25e811adb3e08d4747923)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6295 - misaligned columns in opac suggestions list
Owen Leonard [Tue, 10 May 2011 17:09:38 +0000 (13:09 -0400)]
Fix for Bug 6295 - misaligned columns in opac suggestions list

Template variable scope error.

NOTE: this bug only applies when OPACViewOthersSuggestions is turned on; otherwise there is nothing to fix.

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>
(cherry picked from commit 9773c746a9402e3d6ea91e918e5a1fa530140851)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5995 : MT2892: Fix security issue in CAS intranet login
Matthias Meusburger [Fri, 5 Feb 2010 11:00:15 +0000 (12:00 +0100)]
Bug 5995 : MT2892: Fix security issue in CAS intranet login

Users could log in intranet using their cardnumber, with superlibrarian
rights.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 417c9084b4c5a3637ffc2a29d4f3db929285fead)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6152: Document DOM authority index config
Jared Camins-Esakov [Sat, 9 Apr 2011 15:29:07 +0000 (11:29 -0400)]
Bug 6152: Document DOM authority index config

Add a note so developers know not to edit authority-zebra-indexdefs.xsl directly
but to instead edit authority-koha-indexdefs.xml and use the
koha-indexdefs-to-zebra.xsl stylesheet to generate the former from the latter.

Signed-off-by: Frederic Demians <frederic@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 190a4234f7e4a869498c6cc67453bbe8a256467c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6218: patron gets dot added if no first name
conan (aka Fernando Canizo) [Wed, 20 Apr 2011 20:04:37 +0000 (17:04 -0300)]
Bug 6218: patron gets dot added if no first name

Trivial fix, now it choose surname if firstname is empty and behaves
like before (firstname.surname) if both are provided.

Signed-off-by: Frederic Demians <frederic@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c87e872278f890cf1a9ab17583431f60786cb566)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6312: Remove references to login being OPAC only
Nicole C. Engard [Thu, 5 May 2011 16:25:29 +0000 (12:25 -0400)]
Bug 6312: Remove references to login being OPAC only

This patch changes the 'opac login' label to read 'username'
since it can be used in the staff client and the opac

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cec59e7ea0dd3101031fbe916f6e207d212793b4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6315: Fix depreciated constructions in C4::Serials
Colin Campbell [Fri, 6 May 2011 11:50:39 +0000 (12:50 +0100)]
Bug 6315: Fix depreciated constructions in C4::Serials

Perl 5.14 will issue warnings in cases where it is assumed that
() will magically appear around qw() as the interpreter
will stop fooling itself that they are there
Added the missing () in the couple of cases they were required

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>
(cherry picked from commit 968a6af37dd3472b7417bfa694bf6cf3b75e1713)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6001 : batchRebuildBiblioTables.pl doesn't crash anymore when GetMarcBiblio fails...
Matthias Meusburger [Thu, 1 Apr 2010 14:07:25 +0000 (16:07 +0200)]
Bug 6001 : batchRebuildBiblioTables.pl doesn't crash anymore when GetMarcBiblio fails. Unprocessed biblionumbers are displayed at the end of the execution instead.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a9cb5fa1ee0a773164e962ff9616685042a8dff5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6265: Authority search in OPAC not exact
Katrin Fischer [Mon, 25 Apr 2011 19:55:40 +0000 (21:55 +0200)]
Bug 6265: Authority search in OPAC not exact

The search for linked records from the full heading page was not exact.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 799126e5b6a7d419c1e8e41552a656a59e085f4f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoRewriting the valid templates test to test template toolkit
Chris Cormack [Thu, 28 Apr 2011 23:33:19 +0000 (11:33 +1200)]
Rewriting the valid templates test to test template toolkit
(cherry picked from commit c2a5e0fd45fb0f9810e1a328ccb598929428f2cd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixing a template error
Chris Cormack [Thu, 28 Apr 2011 23:39:18 +0000 (11:39 +1200)]
Fixing a template error
(cherry picked from commit 5d4d5989d0356153a6780b16650b2c43ed6b9e8b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6282: HomeOrHoldingBranchReturn missing from pref file
Colin Campbell [Thu, 28 Apr 2011 15:47:07 +0000 (16:47 +0100)]
Bug 6282: HomeOrHoldingBranchReturn missing from pref file

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c83cdd07670f67d04f051f8576c8fcc0aabc389d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3543: split NLM call numbers in label creator
Jared Camins-Esakov [Wed, 13 Apr 2011 14:03:03 +0000 (10:03 -0400)]
Bug 3543: split NLM call numbers in label creator

Split NLM call numbers using the same rules as those used for Library of
Congress call numbers.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 139f7343f42c32e4bc1981bc072cf6ba05b20c0b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5445: Nicer breadcrumbs when ordering from different sources
Katrin Fischer [Mon, 25 Apr 2011 22:27:34 +0000 (18:27 -0400)]
Bug 5445: Nicer breadcrumbs when ordering from different sources

Replaces previous patch. Also fixes ordering from existing records.

While it was possible to go back to vendor and basket page when ordering
from a new suggestion the other odering options missed those 'crumbs'.

This patch makes the breadcrumbs for all orderings options consistent and
makes it possible to navigate back to the vendor or basket from all
pages.

- from existing record
- from staged record
- from external source
- from empty record

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 883bc625b29f8d36064724479fe975e8b6b22f1a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3202: creating new 'child' categorytype patrons doesn't set branch properly
Ian Walls [Thu, 21 Apr 2011 04:46:34 +0000 (00:46 -0400)]
Bug 3202: creating new 'child' categorytype patrons doesn't set branch properly

If a guarantor search is not being performed, the creation of any Child category_type patron will
not default to the currently logged in branch, but rather the first branch alphabetically.

Adding a test for the existence of any guarantor branch data before assigning it clears up this problem

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b08be41d41b2c974ed338d7ed3fff31ffcd848bf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6153: Display imprint subfields in order
Jared Camins-Esakov [Sun, 10 Apr 2011 21:32:26 +0000 (17:32 -0400)]
Bug 6153: Display imprint subfields in order

Prior to this patch, the imprint (field 260) was displayed out-of-order on the
MARC21 XSLT record detail page. For example, the following data:
=260  \\$aNew York :$bHarper,$c2003$g(2005 printing)
Displayed as:
Harper, New York : 2003 (2005 printing)
Instead of:
New York : Harper, 2003 (2005 printing)

Even more problematically, the following data:
=260  \\$a[S.l. :$bs.n.],$c1860.
Displayed as:
s.n.], [S.l. : 1860
Instead of:
[S.l. : s.n.], 1860.

This patch changes the MARC21 OPAC Details display to display the imprint
subfields in the proper order (as the Results display already does).

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 694f0fbeaf1f6896fe476977786e561c78946986)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6194 Suppress punctuation when no location
Colin Campbell [Mon, 18 Apr 2011 03:35:21 +0000 (23:35 -0400)]
Bug 6194 Suppress punctuation when no location

Template was showing empty parentheses when no location
data was present. Punctuation should be dependent on
the variable being set

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1c13785fed0473fbf631b047c5d543cac121ef43)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6257: Fix broken MARC documentation links
Katrin Fischer [Sun, 24 Apr 2011 15:58:45 +0000 (17:58 +0200)]
Bug 6257: Fix broken MARC documentation links

Another TT issue.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8aa1bac805f05d3538cb00c6b64b2edf71f12dec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6263: shelf browser broken in 3.4
Katrin Fischer [Mon, 25 Apr 2011 16:35:28 +0000 (12:35 -0400)]
Bug 6263: shelf browser broken in 3.4

Another problem with TT.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3a7edeeab44e721286408bdbcb6ea407f6251e46)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoMove nb-NO-i-staff-prog-v-3002000.po -> nb-NO-i-staff-t-prog-v-3002000.po
Magnus Enger [Mon, 25 Apr 2011 09:34:04 +0000 (11:34 +0200)]
Move nb-NO-i-staff-prog-v-3002000.po -> nb-NO-i-staff-t-prog-v-3002000.po

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 00f5953924fe8f3082540c7f62d54c62e4125a86)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6228: Show active currency in system preferences
Katrin Fischer [Mon, 25 Apr 2011 09:25:13 +0000 (11:25 +0200)]
Bug 6228: Show active currency in system preferences

Some system preferences like maxoutstanding should show the
active currency behind the value. The code for this was not
translated to Template Toolkit.

Will change strings, so probably for 3.4.1

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0f453776ff8859cd3017d6de43a7e215845cf44e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>