]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoAdd release notes for 3.6.12 3.6.x v3.06.12.000
Jared Camins-Esakov [Mon, 29 Jul 2013 16:34:25 +0000 (12:34 -0400)]
Add release notes for 3.6.12

11 years agoIncrement version for 3.6.12 security release
Jared Camins-Esakov [Mon, 29 Jul 2013 12:49:55 +0000 (08:49 -0400)]
Increment version for 3.6.12 security release

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agomove Auth_ParseSearchHistoryCookie.t to db_dependent directory
Galen Charlton [Sun, 28 Jul 2013 19:42:51 +0000 (19:42 +0000)]
move Auth_ParseSearchHistoryCookie.t to db_dependent directory

The actual tests in this script are not dependent on the database,
but simply loading C4::Auth requires a valid(ish) koha-conf.xml
and database.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b12c7b2ea01a01c2bd300e553d8ad39a1f201297)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agodo some validation of the KohaOpacRecentSearches cookie
Galen Charlton [Sun, 28 Jul 2013 02:48:44 +0000 (02:48 +0000)]
do some validation of the KohaOpacRecentSearches cookie

Add validation of the value of the KohaOpacRecentSearches.  In
particular, this patch avoids the generation of an internal server
error when the OPAC is presented with an old cookie that uses the
old Storable-based serialization.

This patch also moves parsing of the cookie value into a
new routine in C4::Auth, ParseSearchHistoryCookie, and adds
a test case.

To test (in conjunction with the previous patch):

Exercise the OPAC search history functionality, after
turning on the EnableOpacSearchHistory syspref:

- As an anonymous user, conduct a variety of searches,
  including ones that include non-ASCII characters
- Check the search history and verify that all searches
  are listed
- Apply this patch and the previous one.
- Do *not* clear the KohaOpacRecentSearches cookie
- Check the search history and verify that no searches
  are listed any more
- As an anonymous user, conduct a variety of searches,
  including ones that include non-ASCII characters
- Check the search history and verify that all searches
  are listed
- Log into the OPAC
- Verify that current and past searches are listed in
  search history.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2932860374670ac2656261db15e3375c6ed2e9f1)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agouse JSON rather than Storable for the OPAC search history cookie
Galen Charlton [Thu, 25 Jul 2013 16:50:30 +0000 (16:50 +0000)]
use JSON rather than Storable for the OPAC search history cookie

To test:

Exercise the OPAC search history functionality, after
turning on the EnableOpacSearchHistory syspref:

- Clear the KohaOpacRecentSearches cookie
- As an anonymous user, conduct a variety of searches,
  including ones that include non-ASCII characters
- Check the search history and verified that all searches
  are listed
- Log into the OPAC
- Verify that current and past searches are listed in
  search history.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a18b097b000428b143ee1647124566cc8a70f2b6)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoRevert "Bug 8924: Some modules erroneously skipped by 00-load"
Liz Rea [Thu, 14 Feb 2013 20:00:52 +0000 (09:00 +1300)]
Revert "Bug 8924: Some modules erroneously skipped by 00-load"

This reverts commit c0e60a9079c8ffa970676172870eab75ccbcac5d.

11 years agoBug 8481 - Items table is showing in opac-MARCdetail.pl but not in MARCdetail.pl
Fridolyn SOMERS [Thu, 29 Nov 2012 09:30:44 +0000 (10:30 +0100)]
Bug 8481 - Items table is showing in opac-MARCdetail.pl but not in MARCdetail.pl

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 8401 : Highlighting of search terms in preference causes loss of data
Fred Pierre [Thu, 17 Jan 2013 18:50:23 +0000 (13:50 -0500)]
Bug 8401 : Highlighting of search terms in preference causes loss of data

To test:

1/ Go to system preferences
2/ Go to SCOUserCSS
3/ Add #self
4/ Search for self
5/ Open SCOUserCSS
6/ Note it now contains only # (Do not click save)
7/ Apply the patch
8/ Refresh the page, and check SCOUserCSS and note it now says #self
9/ Rejoice!

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9309 - Make OPACurlOpenInNewWindow be respected for 856$u
Robin Sheat [Thu, 20 Dec 2012 02:45:33 +0000 (15:45 +1300)]
Bug 9309 - Make OPACurlOpenInNewWindow be respected for 856$u

If a biblio record contained a URL, and the OPAC was using the "normal"
(non-XSLT) display for records, then these links would never open a new
window. With this patch, they will.

Test plan:
1) have a biblio containing an 856$u link
2) set OPACurlOpenInNewWindow to "true"
3) do not use XSLT for displaying the detail pages in the OPAC
4) view the record, click the link, and note that it opens in the
   current window.
5) apply the patch
6) reload the detail page, click the link, and note that it opens a new
   window.

Sponsored-By: National Institute of Water and Atmospheric Research
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 7143 updating history and about page
Chris Cormack [Thu, 27 Dec 2012 20:51:46 +0000 (09:51 +1300)]
Bug 7143 updating history and about page

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Changes look to be correct

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Conflicts:
docs/history.txt

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Conflicts:
docs/history.txt

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 6574 - js error in en-GB and en-NZ translations due to improper quoting
Liz Rea [Fri, 28 Dec 2012 00:24:45 +0000 (13:24 +1300)]
Bug 6574 - js error in en-GB and en-NZ translations due to improper quoting

To replicate:

* install en-NZ translation (or en-GB)
* activate the new language, and select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* without the patch, the toolbar will be incorrect. The toolbar will also be incorrect on moremember.pl.

To test:
* apply the patch
* re-generate the en-NZ or en-GB translation
* activate the new language, or select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* with the patch, the toolbar will appear to be correct. It will also be correct on moremember.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 8977:replace unitialized directory var in printoverdues
Stéphane Delaune [Mon, 29 Oct 2012 09:09:48 +0000 (10:09 +0100)]
Bug 8977:replace unitialized directory var in printoverdues

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9335 - humanMsg popups don't disapear in webkit browsers
Martin Renvoize [Mon, 31 Dec 2012 16:50:22 +0000 (16:50 +0000)]
Bug 9335 - humanMsg popups don't disapear in webkit browsers

The popup message that appears after saving changes to system
preferences should dissapear upon any user actions (i.e mouse
click, mouse move, typing) but this does not happen in modern
webkit based browsers since jQuery was updated.

This patch adds the suggested fix to the jQuery plugin code as
suggested on https://code.google.com/p/humanmsg/issues/detail?id=9

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested with Google Chrome on Windows 7

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with Google Chrome 22 and Firefox on Debian
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested with the following browsers:
  Mac: Chrome 23, Firefox 16.0.2, Opera 11.61, Safari 5.1.7
  Windows: IE8, Firefox 3.6.26

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9141 - Untranslatable strings on "pay an amount..." page
Owen Leonard [Mon, 26 Nov 2012 01:30:57 +0000 (20:30 -0500)]
Bug 9141 - Untranslatable strings on "pay an amount..." page

Moving text of an error message from the script into the
template. To test, submit an amount which is greater
than the amount due. You should see an error message
displayed correctly with a properly-formatted currency
amount.

Signed-off-by: Marc Veron <veron@veron.ch>
Patch behaves as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 8924: Some modules erroneously skipped by 00-load
Jared Camins-Esakov [Tue, 1 Jan 2013 00:45:58 +0000 (19:45 -0500)]
Bug 8924: Some modules erroneously skipped by 00-load

Several patterns were being skipped unnecessarily in t/00-load.t:
* C4::Cache* - no longer exists
* C4::Record - no longer requires database
* C4::Serials - no longer requires database

To test:
1) Unset KOHA_CONF and/or shut down MySQL.
2) Run `prove t/00-load.t`
3) If the test passes, the patch is good.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
144 tests passing.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Conflicts:
t/00-load.t

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 8712 - We should use WAI-ARIA guidelines to help with accessibility
Srikanth Dhondi [Tue, 16 Oct 2012 23:10:05 +0000 (12:10 +1300)]
Bug 8712 - We should use WAI-ARIA guidelines to help with accessibility

Added title to the search box

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9169 - Wrap relator code in <span> to allow for CSS customization
Owen Leonard [Thu, 29 Nov 2012 16:32:52 +0000 (11:32 -0500)]
Bug 9169 - Wrap relator code in <span> to allow for CSS customization

This patch adds <span class="relatorcode"> around the display of
relator codes in the OPAC and the staff client, and adds a space
before the bracket (" [relatorcode]") for readability.

To test, add custom CSS to OPACUserCSS and IntranetUserCSS and
view a record which includes relator code data. Suggested:

.relatorcode {
    background-color: rgb(230, 240, 242);
    border-radius: 3px 3px 3px 3px;
    color: rgb(51, 51, 51);
    display: inline-block;
    font-size: 75%;
    font-weight: normal;
    margin-left: 0.4em;
    padding: 0.1em 0.4em;
}

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9158: correcting whitespace in series (440) display
Chris Hall [Tue, 27 Nov 2012 23:41:28 +0000 (12:41 +1300)]
Bug 9158: correcting whitespace in series (440) display

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Patch changes 'first; second; third.' to 'first ; second ; third.'

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9140: Followup removes the useless variable $message
Jonathan Druart [Tue, 4 Dec 2012 15:56:54 +0000 (16:56 +0100)]
Bug 9140: Followup removes the useless variable $message

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9140 - Untranslatable strings in item circulation history
Owen Leonard [Mon, 26 Nov 2012 14:24:28 +0000 (09:24 -0500)]
Bug 9140 - Untranslatable strings in item circulation history

This patch removes the text of a message from the script
to the template. The lastmove sub now returns either the date
or 0, and the template displays the "no transfers" message
if the date doesn't exist.

To test, view the circulation history for items which
do and do not have a transfer history. A date should be displayed
for items which have a transfer history. A messages should
be displayed for those which do not.

This patch also adds a <span> around the text "Never" which
was not getting picked up by the translation script. To test
this change, run "perl translate update <lang>" from misc/translator,
then check if the string shows up in the po file. (Thanks kf!)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9278 - Remove unused OPAC CSS file sanop.css
Owen Leonard [Wed, 12 Dec 2012 20:47:55 +0000 (15:47 -0500)]
Bug 9278 - Remove unused OPAC CSS file sanop.css

This patch removes an unused CSS file, sanop.css, included in both OPAC
themes even though it is referenced by neither.

To test, apply the patch and listen for the unhappy protestations of
libraries whose OPACs now look different. If there are none, the
patch works.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
According to Paul's answer (on the mailing list), I sign off this
patch.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Seems to work as advertised
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 8878 - a command to provide a shell with the koha environment
Robin Sheat [Fri, 5 Oct 2012 03:04:23 +0000 (16:04 +1300)]
Bug 8878 - a command to provide a shell with the koha environment

This command behaves something like su(1), but provides you with a shell
as the koha user, and with the environment pointing to the right places.

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoFixing errors with updatedatabase.pl
Liz Rea [Thu, 27 Dec 2012 22:16:33 +0000 (11:16 +1300)]
Fixing errors with updatedatabase.pl

Thanks to Eric Bégin at inLibro for catching the problem.

11 years agoBumping version for release v3.06.11
Liz Rea [Wed, 26 Dec 2012 21:02:40 +0000 (10:02 +1300)]
Bumping version for release

11 years agoRelease Notes for 3.6.11
Liz Rea [Wed, 26 Dec 2012 21:00:20 +0000 (10:00 +1300)]
Release Notes for 3.6.11

11 years agoBug 9135: updatedatabase.pl fails when DEBUG is set
Jared Camins-Esakov [Fri, 23 Nov 2012 17:30:26 +0000 (12:30 -0500)]
Bug 9135: updatedatabase.pl fails when DEBUG is set

When the DEBUG environment variable is set to a true value, all DBI
errors are treated as fatal. Unfortunately, duplicate keys are
incredibly common in updatedatabase.pl, since sysprefs are often added
in testing, then re-added once the patches have been pushed to master
(or added when on a maintenance branch, and then re-added when the
system is upgraded to either a newer maintenance branch or master).
This patch disables fatal errors for the updatedatabase.pl script.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and perlcritic pass.
To test, run from command line:
export DEBUG=1
installer/data/mysql/updatedatabase.pl

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
If a query causes an error, the script continues as expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 7129 [3.8.x] actual cost showing too many zeros
Owen Leonard [Wed, 28 Nov 2012 15:02:35 +0000 (10:02 -0500)]
Bug 7129 [3.8.x] actual cost showing too many zeros

Reimplemented for 3.8.x: Added a sprintf to format the actual cost

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Simple bug fix, TT plugin would be nicer but this is a perfectly
acceptable fix for now

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 8820 [3.8.x] Don't show orders table if there are no orders
Owen Leonard [Wed, 21 Nov 2012 19:38:12 +0000 (14:38 -0500)]
Bug 8820 [3.8.x] Don't show orders table if there are no orders

Reworkd for 3.8.x: Patch removes the "basket empty" message in
favor of hiding the orders table altogether when a basket has
no orders.

Other textual changes:

- Correcting capitalization according to coding guidelines
- Replacing the "Order Details" heading with the more
  succinct "Orders"

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, template change only.

To test:
1) Create a new basket - verify 'basket empty' shows up
2) Create order line - verfiy table heading is 'Order Details'
3) Close basket, check capitalization on basket group dialog

Repeat with patch applied.
- 'basket empty' is gone
- Heading is now 'Orders'
- Capitalization on basket group dialog is correct

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 9106 - Filtering list of uncertain price list by owner empties order information
Owen Leonard [Mon, 19 Nov 2012 16:00:15 +0000 (11:00 -0500)]
Bug 9106 - Filtering list of uncertain price list by owner empties order information

The form which filters the list of orders with uncertain prices
includes a parameter which tells the script to modify the orders,
resulting in order information being lost. This patch removes
the unnecessary form field.

To test you must have orders with uncertain prices, preferably from
more than one user. Go to the uncertain prices page. Before applying
this patch, submitting the "orders from" form would cause the page
to refresh with no results. This is because the script cleared the
orders of price, quantity, etc. information.

After applying this patch the uncertain prices list should refresh
and show the correct results, either your orders ("me") or all
("Everyone").

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 9123: Authorities search ordered by authid does not work
Fridolyn SOMERS [Wed, 21 Nov 2012 10:05:05 +0000 (11:05 +0100)]
Bug 9123: Authorities search ordered by authid does not work

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with Zebra, marc21, grs1.
Discovered that paging through auth search results does no longer work, but that is not related to these changes.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with Zebra, marc21, dom.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 5801 - C4::Circulation::_GetCircControlBranch wrongly used in opac-reserve.pl
Kyle M Hall [Mon, 1 Oct 2012 19:16:29 +0000 (15:16 -0400)]
Bug 5801 - C4::Circulation::_GetCircControlBranch wrongly used in opac-reserve.pl

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and perlcritic pass.

Tests done:
holds policy vs. circulation rules seemed to make the difference for me,
I am not totally sure why that is, but see no reason to fail this patch as
results are ok.

System preferences
- CircControlBranch = the library the item is from
- ReservesControlBranch = patron's home library

Circulation rules
- Library A - Holds policy: Books can not be put on hold.
- Library B - Holds policy: Books can be put on hold. (no special setting needed)

Catalog data
- A record with an item for library B, itemtype Books.

Test without patch:

1) Patron A (home library A) places a hold in OPAC on an item from library B.

Should be: hold is NOT allowed.
Before patch: hold IS allowed.
After patch: hold is NOT allowed.
OK

2) ReserveControlbranch = item's home library
Patron A (home library A) places a hold in OPAC on an item from library B.

Should be: hold is allowed.
Before patch: hold is allowed.
After patch: hold is allowed.
OK

3) ReservesControlBranch = patron's home library
Circulation rules: Remove hold policy for library B.
Library A: no holds allowed for books using 'Holds allowed (count)' = 0
Library B: 5 holds allowed for books using 'Holds allowed (count)' = 5
Patron A (home library A) places a hold in OPAC on an item from library B.

Should be: hold is NOT allowed
Before patch: hold is NOT allowed
After patch:  hold is NOT allowed
OK

4) ReserveControlbranch = item's home library

Should be: hold is allowed
Before patch: hold is allowed
After patch:  hold is allowed
OK
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 9137 - Focus when editing/adding new itemtypes/authorised values
Owen Leonard [Mon, 26 Nov 2012 15:49:22 +0000 (10:49 -0500)]
Bug 9137 - Focus when editing/adding new itemtypes/authorised values

This patch adds the "focus" class to the relevant inputs so
that the global staff client JS will move the focus to those fields.
Logic in the authorised_values template puts the focus on the
correct field whether you're adding a new category, a new value,
or performing an edit.

To test, try the following operations:
 - add an itemtype
 - edit an itemtype
 - add an authorised value category
 - add an authorised value value
 - edit an authorised value value

In all cases the focus should automatically be in the first
form field.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass and works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Works well in 3.10.x
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Works well in 3.8.x

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 7921: Software error while placing order
Fridolyn SOMERS [Wed, 31 Oct 2012 13:26:31 +0000 (14:26 +0100)]
Bug 7921: Software error while placing order

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
11 years agoBug 8946: corrections in inc files for UNIMARC coded fields advanced search
Mathieu Saby [Thu, 18 Oct 2012 21:21:25 +0000 (23:21 +0200)]
Bug 8946: corrections in inc files for UNIMARC coded fields advanced search

In subtypes_unimarc.inc files for opac and staff interface, this patch
- fix 1 wrong code (Frequency-code:i = Other should be z)
- fix the label "Feschrift Ind." to "Literary genre"
- add some values for Material-type index (s, t), Literature-Code (i), ctype (v, w), Type-Of-Serial (e,f,g)
- fix a few typos
- change the order of some values (u values)

To test, check if the new values are visible in the opac and staff interface.

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoRevert "Bug 9024: Add missing sample data to existing files"
Liz Rea - Catalyst [Mon, 3 Dec 2012 20:24:37 +0000 (09:24 +1300)]
Revert "Bug 9024: Add missing sample data to existing files"

This reverts commit 82c6edfe5404bd2ebfe576acb93c6908c3013548.

Conflicts:

installer/data/mysql/de-DE/optional/auth_val.sql

11 years agoBug 9073 - Download option from the cart should match the menu button in lists
Owen Leonard [Tue, 20 Nov 2012 17:27:25 +0000 (12:27 -0500)]
Bug 9073 - Download option from the cart should match the menu button in lists

This patch moves the staff client Cart download choices into a toolbar
menu button instead of requiring that the user make the choice via a form
in the pop-up window.

To test, add items to Cart in the staff client. Open the cart and
choose a download option from the Download menu. Your download
should complete correctly without the page changing or reloading.

Unrelated edit: Eliminating duplicate document.ready() block by
consolidating a couple of lines of JavaScript.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked all export formats can be selected and downloaded, including
CSV profiles.
All tests and perlcritic pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 5521 - item edit form appears if no items found
Owen Leonard [Tue, 30 Oct 2012 14:53:39 +0000 (10:53 -0400)]
Bug 5521 - item edit form appears if no items found

This patch changes the template so that if no items are
found the page doesn't show "The following barcodes were found"
and doesn't show the item edit form.

To test, submit a batch which contains no valid barcodes.
Compare to a batch which contains some or all valid barcodes.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests succeed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 8954: Make languages list in advanced search translatable (revision 1)
Mathieu Saby [Thu, 8 Nov 2012 23:49:49 +0000 (00:49 +0100)]
Bug 8954: Make languages list in advanced search translatable (revision 1)

In opac-search.pl and search.pl, this patch moves the $lang variable from the end to the begining of the script, and use it as a parameter for getAllLanguages.
In Languages.pm, getAllLanguages function is modified :
- if no parameter is passed to the function, it returns english languages names
- if a $lang parameter conforming to RFC4646 syntax is passed :
-- the function returns languages names translated in $lang if possible
-- if a language name is not translated in $lang in database, the function returns english language name
To test, set your opac and staff interface in english and in other languages and check search.pl and opac-search.pl :
- If language names in your languages_description table are translated in the same language you use for your GUI, the language names in dropdown list will be translated in this language (+native name).
- If your GUI is in english, or in a language into whitch languages names are not translated in languages_description, the dropdown list will stay in english (+native name).

Signed-off-by: Marc Veron <veron@veron.ch>
Patch behaves as expected.

With Opac language set to French I got all languages with French language name.
With German (de-DE), I got only a few with German language names (and all other with English ones),
this was due to missing entries for de-DE in table language_descriptions.
This behaviour is consistent with the description above.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested language list in OPAC and staff advanced search is translated
properly after applying the patch. Checked that language switcher still
works like it should.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixed typo in POD.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 8983: Typo in UNIMARCslim2OPACResults.xsl
Fridolyn SOMERS [Tue, 30 Oct 2012 10:20:05 +0000 (11:20 +0100)]
Bug 8983: Typo in UNIMARCslim2OPACResults.xsl

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 9024: Fix typo
Mirko Tietgen [Tue, 20 Nov 2012 16:39:01 +0000 (17:39 +0100)]
Bug 9024: Fix typo

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9024: Add missing sample data to existing files
Katrin Fischer [Wed, 7 Nov 2012 15:04:06 +0000 (16:04 +0100)]
Bug 9024: Add missing sample data to existing files

Adds missing authorised values (enhancement)

Adds missing slip notice templates (bug fix)
Koha will complain if you try to print a slip and there is no notice
defined for them, so this is not really an improvement, but kind of a bug fix.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 9024: Adding sample patron attributes to German web installer
Katrin Fischer [Wed, 7 Nov 2012 14:39:48 +0000 (15:39 +0100)]
Bug 9024: Adding sample patron attributes to German web installer

Adds SHOW_BCODE as sample patron attribute to the German web installer.

To test:
- Run the web installer in German, make sure the new sample data shows up
and can be installed.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 8804 [Revised] Quiet errors in the log from Auth.pm
Owen Leonard [Fri, 21 Sep 2012 20:49:51 +0000 (16:49 -0400)]
Bug 8804 [Revised] Quiet errors in the log from Auth.pm

Found three cases where variables were being
referenced which did not (in each case) exist. Adding
checks for those variables' existence.

Errors appeared when logged in and viewing a detail
page in the OPAC.

Revision simplifies logic as per RM suggestion.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoBug 8936: Search RSS feeds does not show there items when subscribing in Firefox
Fridolyn SOMERS [Wed, 17 Oct 2012 08:53:29 +0000 (10:53 +0200)]
Bug 8936: Search RSS feeds does not show there items when subscribing in Firefox

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:
koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
11 years agoMerge branch '3.6.x' of git://git.koha-community.org/koha into 3.6.x
Liz Rea - Catalyst [Tue, 20 Nov 2012 00:54:57 +0000 (13:54 +1300)]
Merge branch '3.6.x' of git://git.koha-community.org/koha into 3.6.x

11 years agoBug 8973 [3.6.x] HTML and URL escape missing in OPAC templates
Owen Leonard [Mon, 19 Nov 2012 13:46:46 +0000 (08:46 -0500)]
Bug 8973 [3.6.x] HTML and URL escape missing in OPAC templates

Adding HTML filter to some template variables which require them.
This patch is for 3.6.x, based on Fridolyn SOMERS patch for master.

Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
11 years agoBug 8234: fixes date sort on 'Transfers to receive' page
Adrien Saurat [Fri, 21 Sep 2012 13:48:53 +0000 (15:48 +0200)]
Bug 8234: fixes date sort on 'Transfers to receive' page

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
11 years agoBug 8910 - silent warnings triggered in about.pl
Mark Tompsett [Fri, 12 Oct 2012 06:29:59 +0000 (14:29 +0800)]
Bug 8910 - silent warnings triggered in about.pl

In order to detect the apache version, there are multiple
commands used. These may not all exist, which triggers error log
entries. By simply adding " 2> /dev/null", the errors are no
longer generated.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
11 years agoBut 8787: don't load the page if OpacMaintenance is ON
Jonathan Druart [Wed, 19 Sep 2012 07:59:59 +0000 (09:59 +0200)]
But 8787: don't load the page if OpacMaintenance is ON

If the syspref OpacMaintenance is ON, it is useless to loaded the
requested page.

To test:
- switch on the syspref OpacMaintenace
- check in your apache access log, zebra log, etc. the requested page is
  not loaded (i.e. on the opac-search.pl page)

Signed-off-by: Marc Veron <veron@veron.ch>
Checked by watching  other_vhosts_access.log
Works as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
11 years agoBug 8953 - opac-userupdate encoding issues
Dobrica Pavlinusic [Mon, 22 Oct 2012 12:13:12 +0000 (14:13 +0200)]
Bug 8953 - opac-userupdate encoding issues

This script has various encoding problems:

1. parametars from CGI are not encoded in utf-8, so when they are
   compared with utf-8 strings from database every field with
   utf-8 characters will be reported in e-mail as changed
2. when sending e-mail, wide characters are passed to Mail::Sendmail
   which results in software error if edited field has utf-8 characters
   (because of first point, this happend if ANY fields has utf-8 chars)
3. when declaring encoding for outgoing e-mail utf-8 is more correct
   than just utf8

Test scenario:

1. open opac-userupdate and edit user which has utf-8 characters in
   at least one field (firstname and surname are common examples)
2. edit one of other fields and add utf-8 character to it
3. verify that e-mail with changes arrived with just edited field

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
12 years agoBug 8792 : Babeltheque: Remove the unused tab on the opac detail page
Jonathan Druart [Wed, 19 Sep 2012 13:05:03 +0000 (15:05 +0200)]
Bug 8792 : Babeltheque: Remove the unused tab on the opac detail page

Signed-off-by: Marc Veron <veron@veron.ch>
Babeltheque tab is removed as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:

koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
12 years agoBug 4177 opaccloud missing from the system preferences interface
Mirko Tietgen [Thu, 4 Oct 2012 11:26:26 +0000 (13:26 +0200)]
Bug 4177 opaccloud missing from the system preferences interface

There is no option to toggle the (existing) syspref OpacCloud. This patch adds one.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Inserted tags manually, enabled system preference, tag subject cloud displays nicely.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
12 years agoBug 8862 follow-up s/\t/4spaces/g
Paul Poulain [Fri, 12 Oct 2012 20:19:25 +0000 (22:19 +0200)]
Bug 8862 follow-up s/\t/4spaces/g

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
12 years agoBug 8862 - merge.pl contains untranslatable strings
Kyle M Hall [Tue, 2 Oct 2012 12:58:40 +0000 (08:58 -0400)]
Bug 8862 - merge.pl contains untranslatable strings

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:

koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea - Catalyst <liz@catalyst.net.nz>
12 years agoBump version number for 3.6.10 release v3.06.10 v3.06.10.000
Jared Camins-Esakov [Tue, 23 Oct 2012 11:17:35 +0000 (07:17 -0400)]
Bump version number for 3.6.10 release

12 years agoMerge remote-tracking branch 'tamil/3.6.10-translate' into 3.6.x
Jared Camins-Esakov [Tue, 23 Oct 2012 11:13:14 +0000 (07:13 -0400)]
Merge remote-tracking branch 'tamil/3.6.10-translate' into 3.6.x

12 years agoAdd release notes for Koha 3.6.10
Jared Camins-Esakov [Tue, 23 Oct 2012 11:09:45 +0000 (07:09 -0400)]
Add release notes for Koha 3.6.10

12 years ago3.6.10 Translation Update
Frédéric Demians [Tue, 23 Oct 2012 05:18:00 +0000 (07:18 +0200)]
3.6.10 Translation Update

12 years agobug 3652 fixing XSS vulnerabilities in opac-search
Chris Hall [Wed, 17 Oct 2012 01:32:19 +0000 (14:32 +1300)]
bug 3652 fixing XSS vulnerabilities in opac-search

Signed-off-by: Mason James <mtj@kohaaloha.com>
12 years agoBug 3652: close XSS vulnerabilities in opac-export
Jared Camins-Esakov [Mon, 15 Oct 2012 15:58:30 +0000 (11:58 -0400)]
Bug 3652: close XSS vulnerabilities in opac-export

The opac-export.pl script had a number of XSS vulnerabilities relating
to its error handling.

To test:
1) Go to /cgi-bin/koha/opac-export.pl?op=export&bib=2&format=<h2>evil</h2>
   (substituting a valid biblionumber for the '2')
2) Notice that "evil" is rendered as an h2 heading.
3) Apply patch.
4) Notice that you now see the h2 tags, and they are not rendered by
   the browser.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 3652: close XSS vulnerabilities on biblionumber and authid
Jared Camins-Esakov [Mon, 15 Oct 2012 15:45:38 +0000 (11:45 -0400)]
Bug 3652: close XSS vulnerabilities on biblionumber and authid

Previously we did not sanitize biblionumber and authids passed in by
the user.

To test:
1) Go to /cgi-bin/koha/opac-detail.pl?biblionumber=2hi (substituting a
   valid biblionumber for the 2).
2) Notice the presence of "2hi" on this page, and also on the ISBD and
   MARC views.
3) Go to /cgi-bin/koha/opac-authoritiesdetail.pl?authid=2bye
   (substituting a valid authid for the 2).
4) Notice the presence of "2bye" on this page.
3) Apply patch.
4) Notice that "2hi" and "2bye" strings are gone.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 8806 - [3.6.x] Update changelog for 3.6.5-3.6.9, dependencies.
Robin Sheat [Sun, 10 Jun 2012 15:44:04 +0000 (03:44 +1200)]
Bug 8806 - [3.6.x] Update changelog for 3.6.5-3.6.9, dependencies.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 3652 XSS vulnerability in facets
Chris Cormack [Tue, 9 Oct 2012 01:19:18 +0000 (14:19 +1300)]
Bug 3652 XSS vulnerability in facets

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug with test plan on the bug and checked that
problem is fixed after applying the patch and that facets
still work.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Conflicts:

koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 3652: XSS vulnerability in page numbering
Chris Cormack [Tue, 9 Oct 2012 01:11:10 +0000 (14:11 +1300)]
Bug 3652: XSS vulnerability in page numbering

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed the problem with test plan on the bug and checked that
paging works correctly after the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Conflicts:

koha-tmpl/opac-tmpl/prog/en/includes/page-numbers.inc

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability
Chris Cormack [Mon, 8 Oct 2012 08:30:49 +0000 (21:30 +1300)]
Bug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. After applying the patch, <blink>fish</blink>
is displayed on the page, but no blinking occurs.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8772 - Uninitialized variable triggers error log entry in smart_rules.pl
Mark Tompsett [Tue, 18 Sep 2012 16:05:24 +0000 (00:05 +0800)]
Bug 8772 - Uninitialized variable triggers error log entry in smart_rules.pl

Changed declartion from:
  my $op = $input->param('op');
to
  my $op = $input->param('op') || q{};
in order to give an empty string default preventing error
logs from filling needlessly.

Signed-off-by: Marc Veron <veron@veron.ch>
The patch removes warnings like:
Use of uninitialized value $op in string eq at...

However there is one more warning, but it is not related to $op (addressed by this patch):
smart-rules.pl: Use of uninitialized value in string ne at .../admin/smart-rules.pl line 388.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping...
Owen Leonard [Fri, 14 Sep 2012 16:33:42 +0000 (12:33 -0400)]
Bug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page

Extra </div> returned. Killing it again.

After applying the patch the validator should only warn of
invalid "autocomplete" attribute.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8796 - patron cards not starting on designated card
Marc Veron [Mon, 24 Sep 2012 20:19:56 +0000 (22:19 +0200)]
Bug 8796 - patron cards not starting on designated card

Better wording for the meaning of 'Position' to prevent mistakes on behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8497: Strange behavior when modifying the timeout system preference
Fridolyn SOMERS [Tue, 2 Oct 2012 11:49:32 +0000 (13:49 +0200)]
Bug 8497: Strange behavior when modifying the timeout system preference

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested standard login, patron auto-complete, and system preferences.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8810 - Opac: Cart should display branchname instead of branchcode
Marc Veron [Mon, 24 Sep 2012 13:05:12 +0000 (15:05 +0200)]
Bug 8810 - Opac: Cart should display branchname instead of branchcode

In Opac, the cart should display the branchname instead of the branchcode.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7589 - tinymce editor broken in .deb packages - in 'en' templates
Mason James [Tue, 8 May 2012 04:59:20 +0000 (16:59 +1200)]
Bug 7589 - tinymce editor broken in .deb packages - in 'en' templates

this patch fixes a glitchy symlink to tiny_mce

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Note that you have to *remove* koha-common then install fresh in order
to recreate the symlink.

VERY IMPORTANT!!! debian/rules MUST USE TABS. USE -n WHEN COMMITING
THIS PATCH, AND DO NOT REPLACE TABS WITH SPACES.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8744: Thesaurus in authorities should not lock fields
Jared Camins-Esakov [Sun, 9 Sep 2012 12:55:12 +0000 (08:55 -0400)]
Bug 8744: Thesaurus in authorities should not lock fields

Although fields in the authority editor should support thesaurus
control, they should never be locked, as authority records commonly
refer to other records that may not be in use locally (and therefore
might not be in the authority file).

Test plan:
1) Make sure a 5xx field in one of your authority frameworks is
   thesaurus-controlled.
2) Note that you cannot edit the field directly.
3) Apply patch.
4) Note that you can now edit the field irectly.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8350: warning in logs when searching for nonexistent ISBN
Mark Tompsett [Thu, 30 Aug 2012 07:06:07 +0000 (15:06 +0800)]
Bug 8350: warning in logs when searching for nonexistent ISBN

Searching for a 10 or 13 digit numeric string that does not exist in
one's catalog will fail to affect SQL statement correctly
in C4::Breeding. Moved string substitution, which was triggering error
when search was undefined, and fixed if statements accordingly.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8659 Remove and readd the inactive funds in javascript to make it work in all...
Maxime Pelletier [Tue, 21 Aug 2012 22:02:31 +0000 (18:02 -0400)]
Bug 8659 Remove and readd the inactive funds in javascript to make it work in all browsers

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8702: System preferences search does not allow accented letters
Fridolyn SOMERS [Tue, 18 Sep 2012 13:59:37 +0000 (15:59 +0200)]
Bug 8702: System preferences search does not allow accented letters

This bug enables accented/diacritic system preference text to be matched
when searching for sysprefs.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8721: Fixes minor typo in AllowItemsOnHoldCheckout
Nicole C. Engard [Tue, 4 Sep 2012 15:22:48 +0000 (11:22 -0400)]
Bug 8721: Fixes minor typo in AllowItemsOnHoldCheckout

Small string fix to remove repeated word.

Signed-off-by: Marc Veron <veron@veron.ch>
Tiny typo fix

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 3782: Remove broken z39.50 targets from sample files
Katrin Fischer [Wed, 22 Aug 2012 20:33:26 +0000 (22:33 +0200)]
Bug 3782: Remove broken z39.50 targets from sample files

Removes NYPL and NYU from the list of sample z39.50 servers, because
they don't work or only work inconsistently.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8275: xml parsing error when the webservice GetPatronInfo/show_loans is called
Fridolyn SOMERS [Thu, 19 Jul 2012 09:37:16 +0000 (11:37 +0200)]
Bug 8275: xml parsing error when the webservice GetPatronInfo/show_loans is called

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8713 - Warning message triggered by clicking Keywords to MARC mapping
Mark Tompsett [Mon, 3 Sep 2012 03:00:32 +0000 (11:00 +0800)]
Bug 8713 - Warning message triggered by clicking Keywords to MARC mapping

In the Koha Administration screen, clicking
Keywords to MARC mapping triggered an uninitialized $op warning
in the koha error logs. Added a "|| q{}" to ensure it is set.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7690: hidelostitems not working in Normal Display
Fridolyn SOMERS [Thu, 9 Aug 2012 10:43:20 +0000 (12:43 +0200)]
Bug 7690: hidelostitems not working in Normal Display

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested by toggling both the hidelostitems preference and the
OpacHiddenItems preference. Both work as expected in the normal
search results display.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8714 - Poorly ordered and triggers warning in marctagstructure.pl
Mark Tompsett [Mon, 3 Sep 2012 04:27:58 +0000 (12:27 +0800)]
Bug 8714 - Poorly ordered and triggers warning in marctagstructure.pl

An array boundary check was after a comparison using the array.
By changing the logic which had " and ( $j < $cnt)" to be at the
beginning "( $j < $cnt ) and ", the warning is no longer shown
in the error log.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8705: Software error on help of main page
Fridolyn SOMERS [Thu, 30 Aug 2012 16:42:26 +0000 (18:42 +0200)]
Bug 8705: Software error on help of main page

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8743 follow-up, throw a more explanatory error message
Paul Poulain [Fri, 14 Sep 2012 13:59:50 +0000 (15:59 +0200)]
Bug 8743 follow-up, throw a more explanatory error message

When testing bug 8743, I discovered a missing index in my authority file.
The error message was
"CCL parsing error (10014) Unknown qualifier ZOOM"

which is not very helpfull because it does not show the query that was made.
This patch add the query itself after the zebra error

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8743: ZOOM error when merging authority change to biblios
Jared Camins-Esakov [Sun, 9 Sep 2012 12:18:05 +0000 (08:18 -0400)]
Bug 8743: ZOOM error when merging authority change to biblios

The merge fails and the following errors appear in the log:
[Sun Sep 02 23:38:10 2012] [error] [client 75.149.175.233] ZOOM error 25
"Specified element set name not valid for specified database" (addinfo:
"F") from diag-set 'Bib-1', referer:
http://****/cgi-bin/koha/authorities/authorities.pl?authid=3010
[Sun Sep 02 23:38:11 2012] [error] [client 75.149.175.233] Premature end of
script headers: authorities.pl, referer:
http://****/cgi-bin/koha/authorities/authorities.pl?authid=3010

Test plan:
1) Set dontmerge to "Do"
2) Find an authority that is linked to a bib record.
3) Edit the main entry of the authority.
4) Save the authority record.
5) Notice that you got a nasty error and the bib record was not updated.
6) Apply patch.
7) Edit the main entry of the authority again (you can just set it back
   to what it was to start with).
8) Save authority record.
9) Notice that there was no error, and the bib record was updated.
10) Sign off.

Signed-off-by: Doug Kingston <dpk@randomnotes.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 6976 Close loophole allowing borrowers extra holds via opac
Colin Campbell [Tue, 28 Aug 2012 13:34:55 +0000 (14:34 +0100)]
Bug 6976 Close loophole allowing borrowers extra holds via opac

The check that the max number of reserves has
not been reached needs to take account of the fact
that we may have added enouch reserves to
reach the limit while this script is running.
Add a check against the incrementing count

The variable canreserve was only used when looping
through multiple holds but was not being
reinitialized on every iteration
make variable local to loop it is used in and
initialize to zero

Have used perltidy to correct the indention of
the while loop as it was misleading to the reader

Some numeric comparisons were using a string operator
fix them before strange bugs manifest themselves

The loophole manifests thus:
borrowers are only allowed Y holds.
If holds are done individually, it is
obeying that law i.e. X has held Y separate books –
 when I tried to do a 6th
book it told me that I could not place a hold.
However, if a borrower checks the catalogue,
gets the intial list up and clicks items on the “results”
box and then clicks “place hold” they can hold more than Y
items Please enter the commit message for your changes. Lines starting

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8447: Make sure we have enough subfields for broader_headings
Jared Camins-Esakov [Fri, 7 Sep 2012 14:58:53 +0000 (10:58 -0400)]
Bug 8447: Make sure we have enough subfields for broader_headings

Thanks to wajasu for providing the debugging information, as I cannot
seem to duplicate the problem, even seeing where it could come from.

Fix corrects cases where upon save, a software error complaing about
indicators being wrong as a side effect of a poorly autogenerated
biblio/authority record.

Behvior with this fix causes existing bilio data to to be preserved
while linking to the authority via subtag 9.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8071: link between bib and authorities with the authid
Fridolyn SOMERS [Wed, 25 Jul 2012 15:59:54 +0000 (17:59 +0200)]
Bug 8071: link between bib and authorities with the authid

Do not automatically populate $9 in bibliographic headings when the
$9 is set in the authorized heading field of the authority record.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8730 - browse overlaying powered by
Owen Leonard [Thu, 6 Sep 2012 19:02:29 +0000 (15:02 -0400)]
Bug 8730 - browse overlaying powered by

This patch adds a "z-index" property to the CSS for
the browse results menu so that it will appear
on top of the "Powered by Koha" link.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8339 - div id="login" should be id="login_controls" in header.inc
Mark Tompsett [Tue, 11 Sep 2012 16:57:43 +0000 (00:57 +0800)]
Bug 8339 - div id="login" should be id="login_controls" in header.inc

After experiencing what I believe was stale CSS, I have
implemented oleonard's suggested fix which does work. That is:
header.inc change login to login_controls, and in
staff-global.css change the #login to #login_controls.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8677 - table overlapping to the right on holds waiting
Owen Leonard [Fri, 7 Sep 2012 15:23:08 +0000 (11:23 -0400)]
Bug 8677 - table overlapping to the right on holds waiting

Converting layout to 100% flexible width to allow
table to expand as needed.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8716 - make the routing list reordering function work
Robin Sheat [Tue, 4 Sep 2012 14:53:36 +0000 (16:53 +0200)]
Bug 8716 - make the routing list reordering function work

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7068 - autobarcode not working when duplicating patrons
MJ Ray [Fri, 7 Sep 2012 16:40:26 +0000 (17:40 +0100)]
Bug 7068 - autobarcode not working when duplicating patrons

Fixed by blanking cardnumber in the code and showing it in the template,
instead of just not showing it in the template

Autobarcode now correctly fills in on a duplicated patron.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7143: Adding Kathryn Tyree to the history and About page.
Melia Meggs [Tue, 11 Sep 2012 21:38:28 +0000 (16:38 -0500)]
Bug 7143: Adding Kathryn Tyree to the history and About page.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8678: XSLT stylesheets output XML, but HTML is needed
Jared Camins-Esakov [Thu, 23 Aug 2012 16:27:49 +0000 (12:27 -0400)]
Bug 8678: XSLT stylesheets output XML, but HTML is needed

Because we are embedding the results of XSLT stylesheets in HTML, we
need to output HTML instead of XML. Outputting XML results in
non-standard-compliant (or at least non-Firefox-compliant) markup.

To test:
View a variety of XSLT-rendered pages on the OPAC and intranet, and
confirm that all look as expected.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8594 - prevent the report system from breaking some subqueries
Robin Sheat [Wed, 8 Aug 2012 16:02:13 +0000 (18:02 +0200)]
Bug 8594 - prevent the report system from breaking some subqueries

If you had a report query that had a subquery in the fields list, and
that subquery had a LIMIT specifier, then it would be removed which
could break your query. This patch prevents this case from breaking by
ensuring that only a LIMIT that follows the last WHERE in the query is
removed.

If you don't have a WHERE, then it will behave like it always
did, removing all the cases of LIMIT (which would still break a subquery
but this is a) more rare, and b) would require more intelligent parsing
to deal with.

Also adds test cases and function documentation.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested with this report:

select biblionumber, (select itemnumber from items where items.biblionumber=biblio.biblionumber LIMIT 1) from biblio where biblionumber<1000;

and it worked like a charm

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

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 4064 - Uninitialized variable errors in opac-search.pl
Mark Tompsett [Tue, 4 Sep 2012 00:15:19 +0000 (08:15 +0800)]
Bug 4064 - Uninitialized variable errors in opac-search.pl

In 3.6.3 the error was triggered. It was already fixed with some
particularly ugly logic: if (($params->{'offset'}||'') eq '') {
Having read through the code, $offset is a better choice and
produces prettier, clearer code: if (!$offset) {

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

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8012: default values for defaultSortField/defaultSortOrder NULL on install
D Ruth Bavousett [Fri, 17 Aug 2012 12:42:12 +0000 (08:42 -0400)]
Bug 8012: default values for defaultSortField/defaultSortOrder NULL on install

...which *looks* like "relevance/ascending" in the staff client, which doesn't make sense.
This patch initializes the values at "relevance/descending", which is a functional
combination.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5bc1246b6d1e3e25ff6c4b430bd698185ba876cc)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8646 - prevent the highlighter from going infinite loop
Robin Sheat [Thu, 16 Aug 2012 14:57:29 +0000 (16:57 +0200)]
Bug 8646 - prevent the highlighter from going infinite loop

On certain search queries, for example
http://koha-intra/cgi-bin/koha/catalogue/search.pl?kw=idx&q=ti:book%20
the highlighter starts going into an infinite loop until the browser
decides to kill it.

This patch prevents the bad input going to the highlighter.

It also includes the fix on the OPAC, even though the issue doesn't come
up there. Better to be safe...

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3e599787d4a3b918f45914347344f4a1d99241c2)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8533 - Non-numeric cardnumbers screw up autoMemberNum
Kyle M Hall [Tue, 31 Jul 2012 12:14:19 +0000 (08:14 -0400)]
Bug 8533 - Non-numeric cardnumbers screw up autoMemberNum

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Removes a warning from mysql:
    Truncated incorrect INTEGER value: 'P13000'

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

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8162: allow packages to work on Ubuntu Precise
Robin Sheat [Fri, 20 Jul 2012 10:20:47 +0000 (12:20 +0200)]
Bug 8162: allow packages to work on Ubuntu Precise

The newer version of MySQL in Ubuntu 12.04 installs a default
'localhost' user with no username. Due to the way that MySQL looks up
user details when you connect, if you connect from localhost and the
user was only created with a wildcard host (%), the anonymous localhost
user will be found instead. This means that your username is lost for
the connection, and you have no privileges.

This patch creates a second user with a hostname of 'localhost'. This
will not work if your database is on a remote server, but you probably
know what you are doing if that's the case. Patches to determine this
server's name relative to the MySQL server are welcome (or even ideas on
how to do it.)

It also fixes up a couple of other small things:
* make koha-remove stop zebra properly
* stop the warning that the password file is missing on create

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works as promised.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Allows 3.8.4 packages to work on Ubuntu 12.04
(cherry picked from commit 7d8078472d6ad04e1fb61ab3542f86226517a45a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>