]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoMerge remote-tracking branch 'origin/new/bug_9036' into 3.10.x
Paul Poulain [Fri, 16 Nov 2012 17:29:13 +0000 (18:29 +0100)]
Merge remote-tracking branch 'origin/new/bug_9036' into 3.10.x

11 years agoMerge remote-tracking branch 'origin/new/bug_7119' into 3.10.x
Paul Poulain [Fri, 16 Nov 2012 17:28:26 +0000 (18:28 +0100)]
Merge remote-tracking branch 'origin/new/bug_7119' into 3.10.x

11 years agoMerge remote-tracking branch 'origin/new/bug_8915' into 3.10.x
Paul Poulain [Fri, 16 Nov 2012 17:27:50 +0000 (18:27 +0100)]
Merge remote-tracking branch 'origin/new/bug_8915' into 3.10.x

11 years agoMerge remote-tracking branch 'origin/new/bug_9053' into 3.10.x
Paul Poulain [Fri, 16 Nov 2012 17:18:39 +0000 (18:18 +0100)]
Merge remote-tracking branch 'origin/new/bug_9053' into 3.10.x

12 years agoBug 9036 - 00-load.t checks Koha::Cache::Memcached when it should not this patch...
Chris Nighswonger [Thu, 8 Nov 2012 21:06:47 +0000 (16:06 -0500)]
Bug 9036 - 00-load.t checks Koha::Cache::Memcached when it should not this patch adds code to skip this module during this test

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7119 - tidy t/00-load.t
Christopher Nighswonger [Thu, 8 Nov 2012 20:29:48 +0000 (15:29 -0500)]
Bug 7119 - tidy t/00-load.t

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8915' into 3.12-master
Jared Camins-Esakov [Mon, 12 Nov 2012 15:04:42 +0000 (10:04 -0500)]
Merge branch 'bug_8915' into 3.12-master

12 years agoBug 8915: Followup FIX QA issues
Jonathan Druart [Fri, 9 Nov 2012 13:11:41 +0000 (14:11 +0100)]
Bug 8915: Followup FIX QA issues

Before this patch:
* misc/maintenance/fix_mysql_constraints.pl                                FAIL
    pod                         FAIL
        *** ERROR: unterminated B<...>  in file misc/maintenance/fix_mysql_constraints.pl
    forbidden patterns          OK
    valid                       OK
    critic                      FAIL
        "require" statement with library name as string at line 25, column 12. Use a bareword instead.

+ I add a die on the open statement

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>
12 years agoBug 8915 A script fixing missing MySQL contraints
Frédéric Demians [Sat, 13 Oct 2012 14:45:56 +0000 (16:45 +0200)]
Bug 8915 A script fixing missing MySQL contraints

Help: fix_mysql_contraints.pl -h
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 9053: Test::MockModule and DBD::Mock should be required
Jared Camins-Esakov [Sat, 10 Nov 2012 19:03:11 +0000 (14:03 -0500)]
Bug 9053: Test::MockModule and DBD::Mock should be required

Test::MockModule and DBD::Mock are required for the unit tests in t/
to run. This is good, but means they should be required.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7921' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:45:25 +0000 (14:45 +0100)]
Merge remote-tracking branch 'origin/new/bug_7921' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8988' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:44:00 +0000 (14:44 +0100)]
Merge remote-tracking branch 'origin/new/bug_8988' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8931' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:27:46 +0000 (14:27 +0100)]
Merge remote-tracking branch 'origin/new/bug_8931' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_9010' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:27:08 +0000 (14:27 +0100)]
Merge remote-tracking branch 'origin/new/bug_9010' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8989' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:25:22 +0000 (14:25 +0100)]
Merge remote-tracking branch 'origin/new/bug_8989' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8972' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:24:23 +0000 (14:24 +0100)]
Merge remote-tracking branch 'origin/new/bug_8972' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8832' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:23:14 +0000 (14:23 +0100)]
Merge remote-tracking branch 'origin/new/bug_8832' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8919' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:22:15 +0000 (14:22 +0100)]
Merge remote-tracking branch 'origin/new/bug_8919' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_9005' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:21:44 +0000 (14:21 +0100)]
Merge remote-tracking branch 'origin/new/bug_9005' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8784' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:21:03 +0000 (14:21 +0100)]
Merge remote-tracking branch 'origin/new/bug_8784' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8805' into 3.10.x
Paul Poulain [Mon, 12 Nov 2012 13:20:28 +0000 (14:20 +0100)]
Merge remote-tracking branch 'origin/new/bug_8805' into 3.10.x

12 years agoBug 5490: smsoverdues.pl is an orphan
Jared Camins-Esakov [Wed, 31 Oct 2012 23:23:35 +0000 (19:23 -0400)]
Bug 5490: smsoverdues.pl is an orphan

The script misc/cronjobs/smsoverdues.pl requires HTML::Template::Pro and
uses templates that do not exist in Koha. Since this has been true for
at least a year and a half, and no one is aware of anyone who is using
it, it seems prudent to remove the script so that no one is confused
and/or distressed by its non-functioning nature.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8996' into 3.12-master
Jared Camins-Esakov [Sat, 10 Nov 2012 02:30:30 +0000 (21:30 -0500)]
Merge branch 'bug_8996' into 3.12-master

12 years agoBug 8996: In result page items with negative notforloan are available
Fridolyn SOMERS [Wed, 31 Oct 2012 15:45:14 +0000 (16:45 +0100)]
Bug 8996: In result page items with negative notforloan are available

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Marcel de Rooy <M.de.Rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_6428' into 3.12-master
Jared Camins-Esakov [Sat, 10 Nov 2012 01:37:26 +0000 (20:37 -0500)]
Merge branch 'bug_6428' into 3.12-master

12 years agoBug 6428: Increment version number
Jared Camins-Esakov [Sat, 10 Nov 2012 01:36:13 +0000 (20:36 -0500)]
Bug 6428: Increment version number

Database update for bug 6428 has been given version 3.09.00.064

12 years agoBug 6428 - refered column 'items.coded_location_qualifier' does not exist
Nuño López Ansótegui [Tue, 23 Oct 2012 11:32:43 +0000 (13:32 +0200)]
Bug 6428 - refered column 'items.coded_location_qualifier' does not exist

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_7921' into 3.12-master
Jared Camins-Esakov [Sat, 10 Nov 2012 01:24:24 +0000 (20:24 -0500)]
Merge branch 'bug_7921' into 3.12-master

12 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>
12 years agoBug 8988: item status uses authorized value description for intranet
Fridolyn SOMERS [Tue, 30 Oct 2012 16:12:33 +0000 (17:12 +0100)]
Bug 8988: item status uses authorized value description for intranet

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Marcel de Rooy <M.de.Rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8931' into 3.12-master
Jared Camins-Esakov [Sat, 10 Nov 2012 01:08:49 +0000 (20:08 -0500)]
Merge branch 'bug_8931' into 3.12-master

12 years agoBug 8931 [Follow-up] submit buttons have blue background
Owen Leonard [Thu, 8 Nov 2012 16:40:58 +0000 (11:40 -0500)]
Bug 8931 [Follow-up] submit buttons have blue background

This follow-up removes the white background from fieldsets
with class "action" when they are embedded inside another
fieldset (Comment 4).

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 9010 - Follou up Quote of the day: Umlauts do not display correctly
Marc Veron [Tue, 6 Nov 2012 12:56:30 +0000 (13:56 +0100)]
Bug 9010 - Follou up Quote of the day: Umlauts do not display correctly

After applying Serhij's patch I had still troubles with umlauts, e.g. while editing or adding a new quote.

Added explicit utf-8 encoding at 3 places.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 9010 - Quote of the day: Umlauts do not display correctly Added utf8-encoding...
Serhij Dubyk {Сергій Дубик} [Tue, 6 Nov 2012 12:16:39 +0000 (14:16 +0200)]
Bug 9010 - Quote of the day: Umlauts do not display correctly Added utf8-encoding in json-header for correct view quotes in quotes editor.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8832' into 3.12-master
Jared Camins-Esakov [Fri, 9 Nov 2012 04:23:52 +0000 (23:23 -0500)]
Merge branch 'bug_8832' into 3.12-master

12 years agoBug 8832: Increment version number
Jared Camins-Esakov [Fri, 9 Nov 2012 04:17:21 +0000 (23:17 -0500)]
Bug 8832: Increment version number

Database update for bug 8832 has been given version 3.09.00.063

12 years agoBug 8989 - Availability facet needs an id
Owen Leonard [Wed, 31 Oct 2012 16:02:56 +0000 (12:02 -0400)]
Bug 8989 - Availability facet needs an id

This patch adds an id to the <li> which contains
the "limit to available" facet in the OPAC and
staff client.

To test, add custom CSS for the staff client and
OPAC to hide the id "availability_facet" and
confirm that the link is no longer visible.

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8972 - Due Date set to 100 years ago
Owen Leonard [Wed, 7 Nov 2012 14:41:03 +0000 (09:41 -0500)]
Bug 8972 - Due Date set to 100 years ago

In order to prevent submission of dates with ambiguous two-digit
years this patch makes date-due input fields read-only so that
users must use date/time picker.

Other minor fixes:

- Adding missing labels
- Adding common class wrapper to datepicker for checkout and renewal
- Correcting focus handling on "specify due date" field (should
  focus on barcode field after a date has been selected).
- Removing trailing comma from JavaScript (breaks IE)

To test, try typing an invalid number in any of the date due entry
fields: Under 'specify due date,' 'renewal due date,' or the
confirm "invalid" date dialog (after specifying a date in the past).
Manual entry should not work. Choosing a date/time using the
widget should work.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8972 - Due Date set to 100 years ago
Owen Leonard [Wed, 7 Nov 2012 14:41:03 +0000 (09:41 -0500)]
Bug 8972 - Due Date set to 100 years ago

In order to prevent submission of dates with ambiguous two-digit
years this patch makes date-due input fields read-only so that
users must use date/time picker.

Other minor fixes:

- Adding missing labels
- Adding common class wrapper to datepicker for checkout and renewal
- Correcting focus handling on "specify due date" field (should
  focus on barcode field after a date has been selected).
- Removing trailing comma from JavaScript (breaks IE)

To test, try typing an invalid number in any of the date due entry
fields: Under 'specify due date,' 'renewal due date,' or the
confirm "invalid" date dialog (after specifying a date in the past).
Manual entry should not work. Choosing a date/time using the
widget should work.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8832: Update the gist pref and hide the tax rate value if not needed
Jonathan Druart [Mon, 15 Oct 2012 13:49:30 +0000 (15:49 +0200)]
Bug 8832: Update the gist pref and hide the tax rate value if not needed

The gist system preference will be updated with the existing values and
with the supplier's gstrate values.
The "Tax rate" part becomes hidden if the syspref is not filled.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8989 - Availability facet needs an id
Owen Leonard [Wed, 31 Oct 2012 16:02:56 +0000 (12:02 -0400)]
Bug 8989 - Availability facet needs an id

This patch adds an id to the <li> which contains
the "limit to available" facet in the OPAC and
staff client.

To test, add custom CSS for the staff client and
OPAC to hide the id "availability_facet" and
confirm that the link is no longer visible.

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_9005' into 3.12-master
Jared Camins-Esakov [Thu, 8 Nov 2012 17:47:04 +0000 (12:47 -0500)]
Merge branch 'bug_9005' into 3.12-master

12 years agoBug 8919 - ExtendedPatronAttributes not populated from LDAP
Dobrica Pavlinusic [Mon, 15 Oct 2012 12:55:05 +0000 (14:55 +0200)]
Bug 8919 - ExtendedPatronAttributes not populated from LDAP

Current code is overly complex and assumes that
C4::Members::AttributeTypes::GetAttributeTypes
returns array of attribute codes which is not true.

Instead it return array of hashes so none of extended attributes
will be replicated from LDAP.

This code correctly extracts extended attributes from borrower data
provides simpler code which fills same structure.

It also skips empty values (" ") which are result of mapping without
any default value. This is needed to make unique extended patron values
work. If not handled it would insert empty value for first user and
fail for all others on uniqueness constraint.

Test scenario:

1. define Patron attribute types in administration
2. define mapping from LDAP fields to attributes in koha-conf.xml
3. login as new user with LDAP fields and verify that extended
   attributes are replicated from LDAP

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 9005: Allow user to disable syspref cache
Jared Camins-Esakov [Thu, 1 Nov 2012 18:46:57 +0000 (14:46 -0400)]
Bug 9005: Allow user to disable syspref cache

Because C4::Context uses an in-memory hash for caching sysprefs,
changing a syspref under a multi-threaded persistent environment
requires a server restart. This patch makes it possible disable
the syspref cache.

To test:
1) If you are using a multi-threaded persistent server (Starman, etc.),
   change a syspref and note that the effects of the syspref change may
   or may not be visible on any given request before applying this patch.
   You will need to choose a syspref with obvious effects that can be
   seen by simply refreshing the page. I recommend enabling or
   disabling additional languages in the OPAC, since you can refresh the
   page a dozen times and reasonably expect to see the new behavior you
   set only 1/n of the time.
2) Apply patch.
3) Add "C4::Context->disable_syspref_cache();" to your koha.psgi file
4) Repeat step 1, noting that you never see the stale behavior.
5) Run test at t/db_dependent/Context.t.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
All tests passed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8784' into 3.12-master
Jared Camins-Esakov [Thu, 8 Nov 2012 17:39:47 +0000 (12:39 -0500)]
Merge branch 'bug_8784' into 3.12-master

12 years agoBug 8784 - Missing files in debian.packages list
Mark Tompsett [Tue, 18 Sep 2012 12:53:32 +0000 (20:53 +0800)]
Bug 8784 - Missing files in debian.packages list

Added missing items based on ./koha_perl_deps.pl -m -u

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8805 - Add a biblio-zebra-indexdefs.xsl for NORMARC
Magnus Enger [Wed, 31 Oct 2012 08:06:31 +0000 (09:06 +0100)]
Bug 8805 - Add a biblio-zebra-indexdefs.xsl for NORMARC

This is required in order for Koha to support DOM indexing of the
NORMARC dialect, cf Bug "Bug 7818 - support DOM mode for Zebra
indexing of bibliographic records".

The two files in this patch were generated from the NORMARC
record.abs by doing the steps suggested at the bottom here:
http://wiki.koha-community.org/wiki/Switching_to_dom_indexing
No manual editing was involved.

To test:
- Do a fresh install, choosing NORMARC as the MARC dialect
- Run rebuild_zebra.pl and check it does not complain about missing
  files or other things
- Check that search works as expected. Using MARC21 records for
  the testing should be OK.

2012-10-31: New patch after an update to Bug 8665
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_9001' into 3.10.x
Paul Poulain [Thu, 8 Nov 2012 16:31:36 +0000 (17:31 +0100)]
Merge remote-tracking branch 'origin/new/bug_9001' into 3.10.x

12 years agoBug 9001: Remove Zebraqueue_daemon
Tomas Cohen Arazi [Wed, 31 Oct 2012 18:47:25 +0000 (14:47 -0400)]
Bug 9001: Remove Zebraqueue_daemon

[This patch was split out from tcohen's excellent patches for bug 8519
 --jcamins]

It removes the obsolete zebraqueue_daemon.pl and koha-zebraqueue-ctl.sh
obsolete scripts too.

Several files are modified to address te removal/addition of these files.

I didn't run the install procedure as I was working on my laptop with a dev
setup, just set the symlinks. Now fixed things as proposed by wajasu
on comment #4. Any other suggestion please let me know.

Tested to work on an up-to-date Ubuntu 12.04.

Asked by wajasu, remove remaining obsolete zebraqueue stuff.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8872' into 3.10.x
Paul Poulain [Tue, 6 Nov 2012 17:10:51 +0000 (18:10 +0100)]
Merge remote-tracking branch 'origin/new/bug_8872' into 3.10.x

12 years agoBug 8872: Changes for intranet showmarc
Marcel de Rooy [Thu, 4 Oct 2012 11:34:51 +0000 (13:34 +0200)]
Bug 8872: Changes for intranet showmarc

Simplifies template (eliminating intranet-bottom include).
Makes encoding for card view more consistent with approach in Templates module.
Rearranges a few lines in script for consistency and performance.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8872: Changes for opac-showmarc
Marcel de Rooy [Thu, 4 Oct 2012 11:40:51 +0000 (13:40 +0200)]
Bug 8872: Changes for opac-showmarc

Simplifies template (eliminating opac-bottom include).
Makes encoding for card and html view more consistent with approach in Templates module.
Rearranges a few lines in script for consistency and performance.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8872 Add UTF-8 encoding to opac xslt files
Marcel de Rooy [Thu, 4 Oct 2012 10:05:10 +0000 (12:05 +0200)]
Bug 8872 Add UTF-8 encoding to opac xslt files

Does also fix head and body tags in MARC21slim2OPACMARCdetail.xsl.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8872: Add UTF-8 encoding to intranet xslt files
Marcel de Rooy [Thu, 4 Oct 2012 10:00:28 +0000 (12:00 +0200)]
Bug 8872: Add UTF-8 encoding to intranet xslt files

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8949' into 3.10.x
Paul Poulain [Mon, 5 Nov 2012 15:58:30 +0000 (16:58 +0100)]
Merge remote-tracking branch 'origin/new/bug_8949' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8842' into 3.10.x
Paul Poulain [Mon, 5 Nov 2012 15:58:03 +0000 (16:58 +0100)]
Merge remote-tracking branch 'origin/new/bug_8842' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8490' into 3.10.x
Paul Poulain [Mon, 5 Nov 2012 15:57:34 +0000 (16:57 +0100)]
Merge remote-tracking branch 'origin/new/bug_8490' into 3.10.x

12 years agoMerge branch 'bug_8842' into 3.12-master
Jared Camins-Esakov [Mon, 5 Nov 2012 13:41:50 +0000 (08:41 -0500)]
Merge branch 'bug_8842' into 3.12-master

12 years agoBug 8842 fix Plack scoping for holidays
Paul Poulain [Fri, 2 Nov 2012 09:02:30 +0000 (10:02 +0100)]
Bug 8842 fix Plack scoping for holidays

the internal sub add_holiday uses some variables that are defined in the main script, usual fix

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8949' into 3.12-master
Jared Camins-Esakov [Mon, 5 Nov 2012 13:39:58 +0000 (08:39 -0500)]
Merge branch 'bug_8949' into 3.12-master

12 years agoBug 8949: Trying to view help on a page without any help results in a nasty error
Paul Poulain [Fri, 2 Nov 2012 10:19:23 +0000 (11:19 +0100)]
Bug 8949: Trying to view help on a page without any help results in a nasty error

The problem was probably a side effect of bug 7038

I've checked that things are OK in translated languages.

Test plan:
 * open help on a page with help in english (mainpage.pl)
 * open help on a page with help in another language (mainpage.pl)
=> you'll see the online help, as usual
 * open help on a page without help in english (acqui/addorderiso2709.pl)
 * open help on a page without help in another language (acqui/addorderiso2709.pl)
=> you'll get the "oops, no help available, sorry", no more the Perl error

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8490: fix Plack error when creating label layout
Paul Poulain [Fri, 2 Nov 2012 11:16:19 +0000 (12:16 +0100)]
Bug 8490: fix Plack error when creating label layout

This patch fixes "Error message "Can't bless non-reference value at
/home/pi/koha/C4/Creators/Layout.pm line 111." when trying to add a
label layout while using plack."

The $layout_id variable is set to 5001 on my setup. And 5001 is the Unix
port where I run Plack. WTH is this value stored in this variable ?
Because of
> my $layout_id = $cgi->param('layout_id') || $cgi->param('element_id') || $ARGV[1] || '';
in label-edit-layout.pl

Removing $ARGV[1] solves the problem
Also removing $ARG[0] because I also don't think it's useful

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed off after confirming with Chris Nighswonger that these scripts
were not intended to be run from the command line. Works as promised.

Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8904' into 3.10.x
Paul Poulain [Mon, 5 Nov 2012 08:51:46 +0000 (09:51 +0100)]
Merge remote-tracking branch 'origin/new/bug_8904' into 3.10.x

12 years agoBug 8904: fix Plack scoping for overduerules.pl
Paul Poulain [Fri, 2 Nov 2012 08:53:57 +0000 (09:53 +0100)]
Bug 8904: fix Plack scoping for overduerules.pl

There are 2 Plack scoping errors in tools/overduerules.pl:
the local sub blank_row require that @rule_params and input are global

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>y
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8826' into 3.10.x
Paul Poulain [Fri, 2 Nov 2012 16:42:58 +0000 (17:42 +0100)]
Merge remote-tracking branch 'origin/new/bug_8826' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8945' into 3.10.x
Paul Poulain [Fri, 2 Nov 2012 16:42:45 +0000 (17:42 +0100)]
Merge remote-tracking branch 'origin/new/bug_8945' into 3.10.x

12 years agoBug 8826 - Initialization of hash triggers error log entries - Followup
Kyle M Hall [Fri, 28 Sep 2012 13:19:29 +0000 (09:19 -0400)]
Bug 8826 - Initialization of hash triggers error log entries - Followup

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8826 - Initialization of hash triggers error log entries.
Mark Tompsett [Thu, 27 Sep 2012 06:52:14 +0000 (14:52 +0800)]
Bug 8826 - Initialization of hash triggers error log entries.

Changed:
our %renew_failed = {};
To:
our %renew_failed = ();
This prevents an error log about Reference found where
even-sized list expected.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8945' into 3.12-master
Jared Camins-Esakov [Fri, 2 Nov 2012 16:00:32 +0000 (12:00 -0400)]
Merge branch 'bug_8945' into 3.12-master

12 years agoBug 8945: Update Tags help files for 3.10
Nicole C. Engard [Fri, 26 Oct 2012 15:12:18 +0000 (11:12 -0400)]
Bug 8945: Update Tags help files for 3.10

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8945: Tools Help Files
Nicole C. Engard [Fri, 26 Oct 2012 15:44:24 +0000 (11:44 -0400)]
Bug 8945: Tools Help Files

This patch updates the help files for 3.10 in the Tools
section and adds a help file for the patron modification tool

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed off patch includes one small fix:
Profilemarcfields -> Profile MARC fields
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8945: Update lists help for 3.10
Nicole C. Engard [Fri, 26 Oct 2012 15:46:20 +0000 (11:46 -0400)]
Bug 8945: Update lists help for 3.10

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8945: Update suggestion help file for 3.10
Nicole C. Engard [Fri, 26 Oct 2012 15:08:46 +0000 (11:08 -0400)]
Bug 8945: Update suggestion help file for 3.10

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8945: Serials Help Files for 3.10
Nicole C. Engard [Fri, 26 Oct 2012 15:04:04 +0000 (11:04 -0400)]
Bug 8945: Serials Help Files for 3.10

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8804' into 3.10.x
Paul Poulain [Thu, 1 Nov 2012 21:48:27 +0000 (22:48 +0100)]
Merge remote-tracking branch 'origin/new/bug_8804' into 3.10.x

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7455' into 3.10.x
Paul Poulain [Thu, 1 Nov 2012 21:41:58 +0000 (22:41 +0100)]
Merge remote-tracking branch 'origin/new/bug_7455' into 3.10.x

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8931' into 3.10.x
Paul Poulain [Thu, 1 Nov 2012 21:36:28 +0000 (22:36 +0100)]
Merge remote-tracking branch 'origin/new/bug_8931' into 3.10.x

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8636' into 3.10.x
Paul Poulain [Thu, 1 Nov 2012 21:35:15 +0000 (22:35 +0100)]
Merge remote-tracking branch 'origin/new/bug_8636' into 3.10.x

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8846' into 3.10.x
Paul Poulain [Thu, 1 Nov 2012 21:32:17 +0000 (22:32 +0100)]
Merge remote-tracking branch 'origin/new/bug_8846' into 3.10.x

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 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>
12 years agoMerge remote-tracking branch 'origin/new/bug_8978' into 3.10.x
Paul Poulain [Thu, 1 Nov 2012 19:32:19 +0000 (20:32 +0100)]
Merge remote-tracking branch 'origin/new/bug_8978' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8982' into 3.10.x
Paul Poulain [Thu, 1 Nov 2012 19:30:02 +0000 (20:30 +0100)]
Merge remote-tracking branch 'origin/new/bug_8982' into 3.10.x

12 years agoMerge remote-tracking branch 'origin/new/bug_8707' into 3.10.x
Paul Poulain [Thu, 1 Nov 2012 19:26:14 +0000 (20:26 +0100)]
Merge remote-tracking branch 'origin/new/bug_8707' into 3.10.x

12 years agoCorrect a typo in docs/history.txt and add 3.6.x releases
Jared Camins-Esakov [Wed, 31 Oct 2012 19:10:02 +0000 (15:10 -0400)]
Correct a typo in docs/history.txt and add 3.6.x releases

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge branch 'bug_7455' into 3.12-master
Jared Camins-Esakov [Thu, 1 Nov 2012 14:31:14 +0000 (10:31 -0400)]
Merge branch 'bug_7455' into 3.12-master

12 years agoBug 7455: Authority subfields are cloned in the wrong field (follow-up 3)
Fridolyn SOMERS [Thu, 27 Sep 2012 08:14:55 +0000 (10:14 +0200)]
Bug 7455: Authority subfields are cloned in the wrong field (follow-up 3)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7455: Authority subfields are cloned in the wrong field (follow-up 2)
Fridolyn SOMERS [Tue, 18 Sep 2012 15:34:51 +0000 (17:34 +0200)]
Bug 7455: Authority subfields are cloned in the wrong field (follow-up 2)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7455: Authority subfields are cloned in the wrong field (follow-up)
Fridolyn SOMERS [Tue, 28 Aug 2012 12:55:01 +0000 (14:55 +0200)]
Bug 7455: Authority subfields are cloned in the wrong field (follow-up)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7455: Authority subfields are cloned in the wrong field
Fridolyn SOMERS [Fri, 13 Jul 2012 13:26:34 +0000 (15:26 +0200)]
Bug 7455: Authority subfields are cloned in the wrong field

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8931' into 3.12-master
Jared Camins-Esakov [Thu, 1 Nov 2012 13:32:53 +0000 (09:32 -0400)]
Merge branch 'bug_8931' into 3.12-master

12 years agoBug 8931 - submit buttons have blue background
Owen Leonard [Tue, 16 Oct 2012 18:12:13 +0000 (14:12 -0400)]
Bug 8931 - submit buttons have blue background

This patch specifies a transparent background for fieldsets
and divs with the class "action," which are typically containers
for the submit/cancel actions.

For testers, a good example page to view is the "set library" page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8636 - add Moose dependency to the dependencies
Robin Sheat [Wed, 24 Oct 2012 04:49:20 +0000 (17:49 +1300)]
Bug 8636 - add Moose dependency to the dependencies

Koha::SearchEngine requires moose, but it wasn't declared as a
dependency.

Also update the debian/control dependencies to match the current state
of the requirements.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8846 conflict resolution: correct path
Jared Camins-Esakov [Wed, 31 Oct 2012 21:07:03 +0000 (17:07 -0400)]
Bug 8846 conflict resolution: correct path

The test was moved since the original patch was written, making the
revised test fail. This patch corrects the mocked template patch so that
the test will pass.

To test:
1) Before applying patch, run
   `prove t/db_dependent/SuggestionEngine_ExplodedTerms.t`
2) Note that it fails.
3) Apply patch.
4) Run `prove t/db_dependent/SuggestionEngine_ExplodedTerms.t`
5) Note that it passes.
6) Celebrate.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 8846: Exploded Terms test sneakily uses database
Jared Camins-Esakov [Sat, 29 Sep 2012 13:28:43 +0000 (09:28 -0400)]
Bug 8846: Exploded Terms test sneakily uses database

Even though there is no need for anything stored in the database for the
test, C4::Templates requires the database and a koha-conf.xml. The
solution is to mock all database- and koha-conf-using routines.

To test:
1) Stop MySQL
2) Unset KOHA_CONF
3) Run test

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8978: Patron's dateexpiry erroneously updated when in UnwantedField
Lyon3 Team [Mon, 29 Oct 2012 10:59:44 +0000 (11:59 +0100)]
Bug 8978: Patron's dateexpiry erroneously updated when in UnwantedField

If dateexpiry field was absent because it has been included in
UnWantedField syspref list, the script assumed that the date has
been forgotten and updated it when clicking on 'save' button.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoMerge branch 'bug_8982' into 3.12-master
Jared Camins-Esakov [Wed, 31 Oct 2012 21:22:35 +0000 (17:22 -0400)]
Merge branch 'bug_8982' into 3.12-master

12 years agoBug 8982 make koha-create accept --database option
MJ Ray [Tue, 30 Oct 2012 10:14:49 +0000 (10:14 +0000)]
Bug 8982 make koha-create accept --database option

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8707 - tags always say approved
Owen Leonard [Tue, 30 Oct 2012 15:07:04 +0000 (11:07 -0400)]
Bug 8707 - tags always say approved

Template scope error caused an incorrect state on the
approval/rejection buttons when viewing rejected tags.

To test, go to Tags and view the list of rejected tags.
In the "Actions" column, the "rejected" button should be
greyed out, and the "approve" button active.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoCorrect a typo in docs/history.txt and add 3.6.x releases
Jared Camins-Esakov [Wed, 31 Oct 2012 19:10:02 +0000 (15:10 -0400)]
Correct a typo in docs/history.txt and add 3.6.x releases

12 years agoBug 8980 - Untranslatable strings in modborrowers.pl
Owen Leonard [Mon, 29 Oct 2012 19:24:37 +0000 (15:24 -0400)]
Bug 8980 - Untranslatable strings in modborrowers.pl

This patch removes the declaration of interface labels
from the script and puts it in the template where the
labels can be translated. The labels have been modified
to match those used on the patron entry form.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>