]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoBug 10420 - Standardize spelling of "authorized"
Owen Leonard [Wed, 5 Jun 2013 14:48:36 +0000 (10:48 -0400)]
Bug 10420 - Standardize spelling of "authorized"

This patch corrects instances of the non-[American]-standard spelling
"authorised" when used in text.

The following instances are corrected:

- In Administration -> Funds, the error message displayed if you do not
  have permission to edit a fund.
- In Administration -> Authorized values, the instructions linked to the
  "Libraries limitation" field.
- In Administration -> MARC bibliographic framework test, instructions
  related to linking to authorized values.
- In the course reserves add form, error messages referring to missing
  authorized values.
- In guided reports, error messages shown when an authorized value
  chosen as a report parameter doesn't exit.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 20180b4c392219f41d86becbbda1133ac9c2c075)

Conflicts:

koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Trivial string changes. There was a conflict with course reserves stuff, that is absent from 3.12.

11 years agoBug 10413 - Odd space character breaks translation
Fridolyn SOMERS [Thu, 6 Jun 2013 09:44:38 +0000 (11:44 +0200)]
Bug 10413 - Odd space character breaks translation

This patch simply removes an odd space character that
breaks translation by adding a second msgid="" in PO files.
VI shows it as <U+2028>.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Small patch, removes invisible char. No errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7b667ab134cdec5d90e71f52c6cdd3ee78559f6a)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 8600: (followup) remove debug logging statement
Galen Charlton [Wed, 5 Jun 2013 15:19:30 +0000 (08:19 -0700)]
Bug 8600: (followup) remove debug logging statement

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 73535cb1120ddb1c1c0fb8f1568cc4da51903a25)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 8600: can now remove search input fields in OPAC advanced search form
Frédérick [Wed, 20 Mar 2013 21:23:39 +0000 (17:23 -0400)]
Bug 8600: can now remove search input fields in OPAC advanced search form

If you follow the 'More options' link in the OPAC
advanced search form, each search input field after
the first now has a '-' button that lets you remove
the box.  This complements the '+' buttons that
already existed that allow the user to add additional
input fields.

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0d6bd380ba644ce2cf36a40edbfa5e231e1e19ab)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10249: Fix untranslatable strings in OPAC detail page
Katrin Fischer [Sun, 19 May 2013 08:56:01 +0000 (10:56 +0200)]
Bug 10249: Fix untranslatable strings in OPAC detail page

Star ratings feature:
- Your CGI session cookie is not current. Please refresh
  the page and try again.
- average rating:
- your rating:

Browse results feature:
- Click to rewind the list to
- See biblio
- with biblionumber
- by (between title and author)
- Click to forward the list to
- Go to detail

To test:
- Update the po file using 'perl translate update <langcode>'
- Translate all new strings, maybe mark them with XX to make it easier
  to find them
- Install the updated translation file using 'perl translate install
  <langcode>'
- Test the ratings and browse results features in the OPAC detail page
- Verify everything is still working/displaying like it should
- Check that you don't find any unstranslated strings/terms

Some hints where the changes are:
- Change an existing rating - the average and your rating will change
- Browse result list and check mouse over tooltips for all links

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Strings are now translated, and no emergent JS errors have revealed
themselves.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 787a480626be474afa65737ae37a6c07cad0b1c7)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 7892: Open link to imported record in new tab
Katrin Fischer [Sun, 14 Apr 2013 15:05:39 +0000 (17:05 +0200)]
Bug 7892: Open link to imported record in new tab

Change links to imported records to open in a new window/tab
on the staged records management page.

To test:
1) Go to Tools > Staged MARC record management
2) Open an imported batch by clicking on the file name
3) Click on bib# in the record column
4) Verify links open in a new window/tab now

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

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 72157d66886e21354aa754f75530bbec1f11b9e5)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10015 - UniqueItemFields could have link to database documentation
Owen Leonard [Tue, 9 Apr 2013 19:11:22 +0000 (15:11 -0400)]
Bug 10015 - UniqueItemFields could have link to database documentation

Other system preferences which require entry of database column names
include a link to the scheme for reference. The UniqueItemFields should
do the same. This patch rewords the preference description to
incorporate a link.

To test, open the acquisitions tab in system preferences and confirm
that the UniqueItemFields description looks correct and links to the
right page in the schema.

Signed-off-by: Frederic Durand <frederic.durand@unilim.fr>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 336301e63a919d90d4205f3f537130b7d69b0448)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Usefull and trivial string patch.

11 years agoBug 10307 - z39.50 server search tab shows z390.50
Owen Leonard [Tue, 4 Jun 2013 18:36:41 +0000 (14:36 -0400)]
Bug 10307 - z39.50 server search tab shows z390.50

The label on the global search form for Z39.50 administration reads
"Z390.50." This patch corrects the typo.

To test, apply the patch and navigate to Administration -> Z39.50
servers. The label on the global search tab should read "Search Z39.50
servers."

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b74ac4a1cf64678d2a0dab13965576af1e6ed9c8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10290: Followup for Virtualshelves.t
Marcel de Rooy [Mon, 3 Jun 2013 12:25:43 +0000 (14:25 +0200)]
Bug 10290: Followup for Virtualshelves.t

Put the 10 biblionumbers in a list
Add a FIXME for deleting shelves
Do temporary repair on duplicate name test (Followup via report 10386)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1ef99ace2043d75889830c4c0af8af3e9e36104e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10290: UT: VirtualShelves.t needs to create its own data
Jonathan Druart [Mon, 20 May 2013 14:56:38 +0000 (16:56 +0200)]
Bug 10290: UT: VirtualShelves.t needs to create its own data

Try before the patch:
prove t/db_dependent/VirtualShelves.t

And after, it should produce:
  t/db_dependent/VirtualShelves.t .. ok
  All tests successful.
  Files=1, Tests=82,  6 wallclock secs ( 0.03 usr  0.00 sys +  0.46 cusr  0.03 csys =  0.52 CPU)
  Result: PASS

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 44905ac99cee8ddca6c63752d948a74afae20194)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Tests are good :-D. They look fine and work as expected.

11 years agoBug 10350 - Capitalization: Home Library column in staff detail items table
Owen Leonard [Fri, 31 May 2013 15:36:02 +0000 (11:36 -0400)]
Bug 10350 - Capitalization: Home Library column in staff detail items table

"Home library" is incorrectly capitalized on the catalog detail page.
This patch corrects it.

To test, view the normal view of record in the staff client catalog.
The "Home library" table header in the holdings table should be
correctly capitalized.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit fd9d643705b5bb0134ee229a076130a966be23bd)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Trivial string patch

11 years agoBug 10326: bulkmarcimport.pl doesn't restore value of CataloguingLog syspref
Janusz Kaczmarek [Fri, 24 May 2013 11:21:36 +0000 (14:21 +0300)]
Bug 10326: bulkmarcimport.pl doesn't restore value of CataloguingLog syspref

To test:

0) Don't apply the patch yet.
1) Have the CataloguingLog system preference set to 'Log'.
2) Import a file of bibliographic records with bulkmarcimport.pl.
3) Check the state of CataloguingLog system preference -- it will be
   set to 'Don't log'.
4) Apply the patch.
5) Repeat steps 1-3.  The CataloguingLog system preference
   will be 'Log'.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9d0284096708a65954c7e35a093cfdb727a6bb84)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10381: Followup adding some text around Apply/cancel filter.
Marcel de Rooy [Wed, 22 May 2013 13:01:07 +0000 (15:01 +0200)]
Bug 10381: Followup adding some text around Apply/cancel filter.

The texts Apply/cancel filter did not need translation and were used to get
this change into 3.12.
For 3.12.X or 3.14 we can add some words to clarify its meaning.
With thanks to Owen for some rewording.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 600eff7827be1c396e7ea13cd7c7159003d6c794)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10381: POD lines of GetBasketsInfosByBookseller
Marcel de Rooy [Wed, 22 May 2013 12:51:00 +0000 (14:51 +0200)]
Bug 10381: POD lines of GetBasketsInfosByBookseller

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5bf996f68d2279ae9582b338b3d094ad20f7596c)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10359: transform masthead dropdown after user JS for CCSR
Jared Camins-Esakov [Tue, 28 May 2013 11:44:35 +0000 (07:44 -0400)]
Bug 10359: transform masthead dropdown after user JS for CCSR

Since libraries may want to customize the options in the masthead search
dropdown, which is done via dropdown, it would be better if the select
box were transformed *after* user javascript was run.

To test:
1) Switch to the CCSR OPAC theme.
2) Add some Javascript to your OpacUserJS that will modify the masthead
   search dropdown, such as:
   $("select[name='idx']").append("<option value='Host-item,wrdl'>Journal title</option>");
3) Note that when you view the OPAC, the results in the dropdown are unchanged.
4) Apply patch.
5) Note that your new option now shows up.
6) Sign off.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ff2b4d1ff5992989478f83517d95f957c4af50d4)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agobug 10292: improve fallback logic for picking XSLT
Galen Charlton [Mon, 20 May 2013 17:12:44 +0000 (10:12 -0700)]
bug 10292: improve fallback logic for picking XSLT

This patch fixes a bug whereby XSLT files from the
prog theme would be used (for English OPACs and staff
interfaces) even if the user had created and enabled a
custom theme that provided override XSLT files.

This patch provides a clearer implementation of the fallback
logic and adds test cases.

To reproduce the bug:

[1] Set OPACXSLTDetailsDisplay to 'default' and English as the OPAC
    language.
[2] Create a new OPAC theme, including copying the XSLT files.
[3] Set opactheme to the new theme.
[4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl
[5] View a bib record in the OPAC. The change made in the previous step
    is not reflected.

To test after applying the patch:

[6] Reload the bib record in the OPAC. The change made in step 4 should
    now be reflected.
[7] (To be thorough) Go through the test plan for bug 8947
    and verify that there is no regression.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b0eeb00d48892c2ea7f42d787dae10364537ed6f)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10262 - fine calculation at checkin not respecting CircControl
Kyle M Hall [Thu, 16 May 2013 18:02:24 +0000 (14:02 -0400)]
Bug 10262 - fine calculation at checkin not respecting CircControl

The fines.pl script uses the system preference CircControl to decide
what branches circ rules to use for fine generation.

Recently, code was added to the returns system to recalculate the fine
at checkin time ( to support hourly loans ). The problem is that this
code does not respect CircControl.

Test Plan:
1) Set circ control to "the library you are logged in at"
2) Set different fines rules for two different librarys
3) Check an item out at library A, backdate the due date so it's overdue
   and will have fines.
4) Check the item in at library B
5) Observe that the fines should be generated based on library A's rules,
   but the fines will be based on library B's rules instead!
5) Apply the patch
6) Repeat steps 3 and 4.
7) Observe now that the fines should reflect the fines rules for Library A

Note: it seems counter-intuitive for the fines system to behave this way
based on the preference being set to "the library you are logged in at"
but it does make sense. The rules used are from "the library you are
logged in at" when the item is first checked out.

If the fines system really did use the rules for the library the item was
returned to, it would be easy to exploit the library system. Some Koha
using systems have branches that charge fines, and others that don't, so
a patron could just return any overdue items to a non-charging branch
to avoid ever paying fines!

Furthermore, it would mean that the fines.pl script would be using one
set of rules to charge fines, and the returns system could possibly be
using another. Since fines.pl has been around far longer, it makes sense
to assume the fines.pl behavior is canonical.

Signed-off-by: Mickey Coalwell <mcoalwell@nekls.org>
Signed-off-by: George Williams <georgew@latahlibrary.org>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Merged with reservations; see comment on bug report for details.

(cherry picked from commit 040eb4016f4b01d44f87ab6aca515c6917f73479)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10218 - In OPAC XSLT search results, add class to 'online access'
Owen Leonard [Mon, 13 May 2013 19:07:34 +0000 (15:07 -0400)]
Bug 10218 - In OPAC XSLT search results, add class to 'online access'

In some cases in OPAC search results and the detail page there is a
class specific to each line of data being output (publisher, date,
subjects, etc). In other cases there is no additional class. This patch
makes modifications to a few different OPAC files in an attempt to make
them consistent with each other.

To test, apply the patch and view:

- an OPAC detail page with OPACXSLTDetailsDisplay off
- the OPAC search results page with OPACXSLTDetailsDisplay off
- the OPAC search results page with OPACXSLTDetailsDisplay on

Labels should have classes relevant to their data. To test the specific
case requested by this bug, view details/results for a record which
includes online resources (856u in MARC21).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
html changes only, passes all tests

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 45168efeb9a2c6e3268e2f002ca31af8e5e6afc8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10184 - Circulation History reverses sort order
Colin Campbell [Fri, 3 May 2013 14:35:44 +0000 (15:35 +0100)]
Bug 10184 - Circulation History reverses sort order

Issue data is passed to the readingrec template ordered
most recent due date first. Datatables unless specified
otherwise do a presort on the data they will display
the default results in an order the reverse of what was
intended. Disabling the presort preserves the initial sort
order until the user selects a different sort

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3285261d0150113e597d48a5a78aee5fdc1ebd94)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10193 - Copies should be holdings as label for items on MARC view
Owen Leonard [Mon, 13 May 2013 19:21:46 +0000 (15:21 -0400)]
Bug 10193 - Copies should be holdings as label for items on MARC view

In the OPAC MARC view, the table of holdings is labeled 'copies.' In
order to be consistent with the normal view this should be labeled
'holdings.' This patch makes this correction.

To test, apply the patch and view the MARC detail page for any record
with items. The table of holdings data at the bottom of the page should
be labeled 'Holdings.'

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 492a1a19f99c27ccbb94cab2fa4318379076bc6f)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 7368: Correct three typos in history.txt
Connor Fraser [Fri, 24 May 2013 23:25:18 +0000 (11:25 +1200)]
Bug 7368: Correct three typos in history.txt

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 342463b5796825e8dd941e575694e8e4be6aa274)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10284: Add missing spaces between label and content in XSLT view (780/785)
Katrin Fischer [Sun, 19 May 2013 10:16:16 +0000 (12:16 +0200)]
Bug 10284: Add missing spaces between label and content in XSLT view (780/785)

To test:
- Check OPAC and intranet XSLT view for a record that contains
  780 and 785 fields.
- Verify there is no space between the label and the content of the
  field.
- Apply patch.
- Verify the display both in intranet and OPAC is a little nicer now.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4c1c323232cd303c9c1e0f02c83871e1e6fcd62d)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10120: DBRev 3.12.00.001
Tomas Cohen Arazi [Mon, 3 Jun 2013 15:11:49 +0000 (12:11 -0300)]
Bug 10120: DBRev 3.12.00.001

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10120: Adding a syspref to control if overdue charges are updated on return
Chris Cormack [Mon, 29 Apr 2013 20:56:22 +0000 (08:56 +1200)]
Bug 10120: Adding a syspref to control if overdue charges are updated on return

On by default.

To Test

1/ Create an overdue item, that should get fines
2/ Return the item
3/ Check the borrowers record to see if the fine has been added/updated

Apply patch
1/ Make sure preference is set to do
Repeat steps 1-3 above

2/ Switch the preference to don't
Repeat stes 1-2
3/ Check the fine hasn't been added/updated

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass, works as described.
I would categorize this a bug fix for libraries that don't want
the new changed  behaviour that was introduced by recalculating
fines on return.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit fc61bd30186b0305579c5dee0a14f9d2733cd5db)

Solved conflicts in:
installer/data/mysql/sysprefs.sql
installer/data/mysql/updatedatabase.pl
and changed DB version number.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10313 Fix link to invoice from orders
Colin Campbell [Wed, 22 May 2013 18:32:45 +0000 (19:32 +0100)]
Bug 10313 Fix link to invoice from orders

Need to have invoiceid and pass it to retrieve selected
invoicenumber. Wrong data passed causing incorrect
records to be displayed

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3f4d31309203b85b5415788967d4c8cf3ce83570)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
There's a small POD error, I'll try to provide a followup for it.

11 years agoBug 10310: Followup Prevent submitting form with enter does not work with IE
Jonathan Druart [Thu, 23 May 2013 07:33:48 +0000 (09:33 +0200)]
Bug 10310: Followup Prevent submitting form with enter does not work with IE

Check e.target.type instead of using jQuery.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c4978ef178746df06333c6704ea9e6f888b4b9ff)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10310: Prevent submitting form with enter does not work with IE
Jonathan Druart [Wed, 22 May 2013 13:49:26 +0000 (15:49 +0200)]
Bug 10310: Prevent submitting form with enter does not work with IE

I am not able to test this patch with IE...
I tested it with Chromium and FF and it works great.

This patch can be tested on the neworderempty.pl page
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit efdf30bc476ab130b0dc4767ba38d68208eb2ca7)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9507: prevent submit: refactor some code in a js file
Jonathan Druart [Wed, 30 Jan 2013 14:19:58 +0000 (15:19 +0100)]
Bug 9507: prevent submit: refactor some code in a js file

This patch refactors some code in a js file.

Test plan:
On acqui/neworderempty.pl, acqui/orderreceive.pl and
serials/serials-edit.tt try to scan a barcode (or press enter) on the
form and check that it is not sent.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Have to note that the code for IE9 does not work. Before and after this patch.
If we refactor code, it would have been nice to resolve this too.
But I do not oppose pushing this patch.
The test uses 'an ancient Netscape property' window.Event (uppercase!) to make
the distinction between browers and event models. Some more documentation here
would be welcome too.

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

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Refactoring, but needed for 10310 inclusion

11 years agoBug 10036 - adding header search to additem page
Owen Leonard [Tue, 30 Apr 2013 19:33:48 +0000 (15:33 -0400)]
Bug 10036 - adding header search to additem page

The add item screen lacks a header search form. This patch adds the
cataloging header search include to additem.tt.

To test, apply the patch and add items to or edit items of an existing
record. The header search form should appear with options for cataloging
search and circulation.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 646015c6471fa3d248696a55b6f18d268b5a2f60)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This should have been tagged as a bugfix...

11 years agoBug 10367 - [3.12] update the rules and control file for wheezy
Robin Sheat [Wed, 29 May 2013 04:44:43 +0000 (16:44 +1200)]
Bug 10367 - [3.12] update the rules and control file for wheezy

This updates the control file to use tinymce rather than tinymce2, as
tinymce2 is deprecated and no longer in Debian.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This was written and tested by the packages maintainer, and the RM signed on it.

11 years agoBug 10261: Link to patron files missing from circ-menu.tt
Owen Leonard [Fri, 17 May 2013 16:06:25 +0000 (12:06 -0400)]
Bug 10261: Link to patron files missing from circ-menu.tt

The link to patron files doesn't appear on some pages. That's because
the link was added to circ-menu.inc but not circ-menu.tt. Each is used
by different patron-related pages. This patch adds the missing link.

To test, enable the EnableBorrowerFiles system preference and view
members/pay.pl or members.paycollect.pl. The "Files" tab should appear
in the left-hand sidebar menu. Other patron pages should show the same.

Edit: Corrected scope of template variables which shouldn't have been
copied directly from circ-menu.inc without changing scope.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
all tests pass
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1c3dd427fa26e4f84d14a81453e12b868936a3bf)

11 years agoBug 10288 - Fix a tiny typo on "Pending offline circulation actions"
Magnus Enger [Sun, 19 May 2013 16:56:00 +0000 (18:56 +0200)]
Bug 10288 - Fix a tiny typo on "Pending offline circulation actions"

To test:
- Apply the patch
- Go to <intranet>/cgi-bin/koha/circ/circulation-home.pl
- Verify that is says "There are no pending offline operations."
- Sign off

Or just have a look at the patch...

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

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10251: Fix typos in Patron Permissions Help
Nicole C. Engard [Sun, 19 May 2013 18:02:01 +0000 (14:02 -0400)]
Bug 10251: Fix typos in Patron Permissions Help

This is a string patch that fixes the typos in the patron
permission help file.

To test:

* go to a patron record
* click 'set permissions' under more
* click 'help'
* confirm that text is right

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

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 2774 - Path to theme is hard-coded in many places
Owen Leonard [Mon, 25 Mar 2013 16:21:24 +0000 (12:21 -0400)]
Bug 2774 - Path to theme is hard-coded in many places

Many templates have instances where the path to the prog template is
hard-coded. Now that interface and theme template variables are
available everywhere these paths should be corrected to use them.

Image paths corrected:

- 'Patron image missing' image on circulation pages
- 'Locked' icon on fund planning page
- Tag and subfield edit icons on the authority, biblio editor, and batch
  item modification pages (Clone tag, delete tag, clone subfield,
  delete subfield, move subfield)
- 'Loading' icon when importing frameworks

Audio file paths corrected:

- Sounds for circulation.pl and returns.pl

Paths to DataTables assets corrected on:

- Transfers to receive report
- Holds queue report
- Holds awaiting pickup report
- Patron detail page (moremember.pl)
- Patron circulation history
- Update child to adult patron page
- Process offline circulations
- Catalog by item type report
- Serials statistics wizard
- Serial claims page
- Koha news
- Notices
- Batch patron modifications

Path to progress bar assets corrected on:

- Process offline circulations page
- Progressbar include file
- Stage MARC imports
- Manage MARC imports
- Local cover image upload

Other image paths:

- "Approved" checkmark image on tags review page
- Table sort icons on lists page
- Feed icon on OPAC search result page
- "Loading" image for OPAC plain MARC view

Path to ratings JavaScript on OPAC detail and results pages

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Checked all the pages modified by this patch, no problems noted

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bfe6dc88d208e3622e3637665c62dcabf4e1d892)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This patch touches too many files, and was excluded (presumably) from 3.12 as was too close to the release.
As it touches too many files and looks good I'm pushing to stable, as it can be a source of future conflicts
for merging master patches on 3.12.x. The patches that introduce both the 'theme' and 'interface' template
variables date back to 04/2011 so it looks sound to me.

11 years agoBug 9508 follow-up : replacing tabs by spaces
Paul Poulain [Fri, 22 Mar 2013 16:43:23 +0000 (17:43 +0100)]
Bug 9508 follow-up : replacing tabs by spaces

This patch fixes tabs and replace them by spaces

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

11 years agoBug 9508: Standardize the dateformat value from C4::Auth
Jonathan Druart [Tue, 18 Dec 2012 14:09:22 +0000 (15:09 +0100)]
Bug 9508: Standardize the dateformat value from C4::Auth

- the dateformat value is send to all templates (from
  C4::Auth::get_template_and_user)
- remove all assignment of dateformat in all .pl files

- Remove "all" occurrences (those I found!) of dateformat_*
From now the only way to get the date format is a string comparaison
(dateformat == "metric")

Checked with the command:
  git grep "\(dateformat_us\|dateformat_metric\|dateformat_iso\)" | grep
  -v translator

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested all the datepickers I could find, looks good.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 537c66403855437d2ce52eeb758fc009c7105633)

11 years agoBug 6399 - tooltip for tags that says 'separate by comma'
Owen Leonard [Wed, 15 May 2013 12:45:32 +0000 (08:45 -0400)]
Bug 6399 - tooltip for tags that says 'separate by comma'

Some sites split tags on spaces, some on commas. Since Koha splits on a
comma, we should make that clear to the patron. This patch adds
additional text to the "New tag(s)" label.

To test, enable TagsEnabled, TagsInputOnDetail, and TagsInputOnList.
Click "Add tag" on both OPAC search results and an OPAC detail page.
Confirm that the revised label appears correctly.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass. There are some more places where we can
add tags to multiple records at once, I noted them on the bug.

http://bugs.koha-community.org/show_bug.cgi?id=10259

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

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Even if tha patch doesn't add a tooltip, as it is just a string change that clarifies the addition of tags it should be applied to stable.

11 years agoBug 10178 - Typos in plugins for 006 and 008 in MARC21
Bernardo Gonzalez Kriegel [Fri, 3 May 2013 01:18:27 +0000 (22:18 -0300)]
Bug 10178 - Typos in plugins for 006 and 008 in MARC21

Well, not only typos. There is also a NEW update for
006/8 Music on April 2013. And 3 missing values in 006.

Revised descriptions and labels, source LOC page.
Strings spell checked.

To test:
1) Apply the patch
2) Test that MARC21 006 and 008 value builders works
properly.

Small string changes.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
XML changes only, passes all tests.
Contains string changes, so should go into 3.14.

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

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Trivial string changes that didn't make it before string freeze. Patch applies cleanly on 3.12.x. It shouldn't go into older releases I guess.

11 years agoBug 10191: Close 2 option tags in unimarc_field_115a.tt and unimarc_field_116.tt
Mathieu Saby [Sat, 4 May 2013 09:31:24 +0000 (11:31 +0200)]
Bug 10191: Close 2 option tags in unimarc_field_115a.tt and unimarc_field_116.tt

This patch close 2 option tags in unimarc_field_115a.tt and unimarc_field_116.tt.

To test :
- in a UNIMARC Koha instance, edit a record
- open the plugin for 115a subfield
- check the "Form of release - visual projection, motion picture" option
  list is correct, especially the value "other film type"
- open the plugin for 116 field
- check the "Technique (prints) 2" option list is correct, especially
  the value "lithography"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I did not test this in Koha, but it's a simple change of one character
which I'm comfortable with signing off on.

I don't know if this counts as a string change or not, since the string
was previously mixed with a malformed tag.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and fixes an obvious problem in the HTML.
I checked the po files - currently the strings appear as:
"other film type/option> %s "

So in theory it's possible to translate them correctly even
if the standard templates now are not correct.
Probably has to wait for 3.14.

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

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10186: Fix a typo in subscription-add.tt : 2/years should be 2/year
Mathieu Saby [Sat, 4 May 2013 09:07:55 +0000 (11:07 +0200)]
Bug 10186: Fix a typo in subscription-add.tt : 2/years should be 2/year

In subscription-add.tt dropdown list for periodiciy, the description for 9 value should be "2/year" (2 issues each year)
At present, if the option value is selected, it is "2/years".
This patch supresses the "s" after "year".

To test :
- in a subscription, change periodicity to "2/year"
- save the subscription
- reopen it and check the value is labelled "2/year"

Signed-off-by: David Cook <dcook@prosentient.com.au>
Trivial change. Works as described.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit cf2f95f0607f5bc20f757a6de7effd93334576fa)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoIncrement version for 3.12.0 release v3.12.00
Jared Camins-Esakov [Sun, 19 May 2013 21:42:07 +0000 (17:42 -0400)]
Increment version for 3.12.0 release

11 years agoUpdate release notes for final 3.12.00 release
Jared Camins-Esakov [Sun, 19 May 2013 21:40:14 +0000 (17:40 -0400)]
Update release notes for final 3.12.00 release

11 years agoBug 10287: Remove 1px artifacts from budget admin page
Jared Camins-Esakov [Sun, 19 May 2013 15:41:09 +0000 (11:41 -0400)]
Bug 10287: Remove 1px artifacts from budget admin page

Changes follow the method used in bug 10183 and bug 9791.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 764fb175330b99a7dc12061bbcc96706d172567c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9824: Make it possible to apply/cancel switch
Katrin Fischer [Fri, 17 May 2013 19:12:05 +0000 (21:12 +0200)]
Bug 9824: Make it possible to apply/cancel switch

Using another existing string 'Apply filter' we are now
able to cancel the filter... and apply it... and cancel it
again... and so on.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7acdcb7e2aedf2ff202c009ce053de6dff54e840)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9824: Followup for removing filter
Marcel de Rooy [Fri, 17 May 2013 17:01:06 +0000 (19:01 +0200)]
Bug 9824: Followup for removing filter

Adds allbaskets parameter to GetBasketsInfosByBookseller. (Only used in booksellers.pl now)
Normally, all 'active' baskets are shown. With allbaskets=1 all baskets :)
In the template I had to rename a loop var supplier to supplier1 to resolve
name conflict between template vars.
In the template I added the string: Cancel filter.
Note that this string is already translated:
msgid "Cancel filter"
msgstr ""
Hope this helps.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Undoing the filter works and I checked that the string gets
translated with the po files in current master.
So this is almost perfect, only we can't apply the filters
again and the link remains 'cancel' when we already did.
Sending a follow-up trying to fix this.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 529434cab891a8b76b3792e12e359f8c8b171519)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10230: show correct matching record
Jared Camins-Esakov [Sat, 11 May 2013 20:07:43 +0000 (16:07 -0400)]
Bug 10230: show correct matching record

The correct matching record was not always shown on the manage staged
MARC page. This patch corrects the issue and provides the template with
the appropriate ID for the matched record regardless what type of record
it is.

To test:
1) Create a matching record for authorities. For MARC21, the following
   is a good choice:
   Matching rule code:  AUTHPER
   Description:         Personal name main entry
   Match threshold:     999
   Record type:         Authority record
   [Match point 1:]
    Search index:   mainmainentry
    Score:          1000
    Tag:            100
    Subfields:      a
2) Create a record that has the appropriate fields for being matched
   with that rule (if you don't already have one).
3) Save the authority record as MARC (Unicode/UTF-8).
4) Stage the file choosing your new matching rule.
5) Note that with these patches, you get a link to the existing
   authority and without them you could get any number of strange
   things.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. Additional tests done:
- staged bibliographic records and matched with different
  rules and actions. Undid the import.
- staged autohrity recods and matched with the example rule.
  Undid the import.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit a278407a476c67c334e1e76fc72c1871a7328af5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10230: Don't limit valid matches to bibs
Jared Camins-Esakov [Sat, 11 May 2013 19:19:58 +0000 (15:19 -0400)]
Bug 10230: Don't limit valid matches to bibs

The patch for bug 9523 added a JOIN to the biblio table when identifying
the best match so that if a matched record had been deleted it would
not hold up the import process. Unfortunately, this broke all authority
matching, since of course authorities don't appear in the biblio table.
This patch adds a join to auth_header as well, and decides which to
check based on the record type.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on third patch of this series.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 4f9174349c99574df0933f2b660938998580d8ba)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10230: no need to use SimpleSearch for matching auths
Jared Camins-Esakov [Sat, 11 May 2013 14:40:09 +0000 (10:40 -0400)]
Bug 10230: no need to use SimpleSearch for matching auths

When introducing QueryParser, I introduced a check for QueryParser at
too high a level, causing authority matching to try and use SimpleSearch
for authorities prematurely, when SearchAuthorities should be handling
it. This patch corrects the level of the check. This patch only moves
three lines, but thanks to the change in if level, it adjusts the
indentation quite a bit.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on third patch of this series.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2708db52778944f41b36379cc5f202a8ddea6a5a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10281: searching for a search domain fails
Jared Camins-Esakov [Sat, 18 May 2013 13:09:23 +0000 (09:09 -0400)]
Bug 10281: searching for a search domain fails

For reasons I cannot fathom, the split() in handling multi-branch
limits was not coming up with a valid search group code. Replacing
the split() with a substr() and creating the CGI parameter as a string
rather than as an arrayref fixes the problem. This problem may not
affect all installations, since I tested this exact feature just under
two months ago and it worked fine, and none of the relevant code has
been changed since then that I can see.

To test:
1) Create search group, and add at least one library to it, in
   /cgi-bin/koha/admin/branches.pl
2) Apply patch
3) Try doing a search limited to your search group, making sure that
   the search will match items that belong to a library in the search
   group
4) Sign off

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I have failed to recreate the problem on three different dev installs,
both on Ubuntu and Debian, but the current patch does not break
anything as far as I can tell, so I'm signing off.

I tested with two libraries in the same search domain, with each
library owning a different book by the same author. Searching for
the author in
- all libraries,
- individual libraries and
- the search domain that contains both libraries
all return the expected results.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
I couldn't reproduce the problem, but didn't find any regressions.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit cd281e488032c57d4a47c3913d5f887c3bca69d8)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9452: C4::Letters not Plack-compatible
Jared Camins-Esakov [Sun, 12 May 2013 18:22:54 +0000 (14:22 -0400)]
Bug 9452: C4::Letters not Plack-compatible

Prior to this patch, at more-or-less random intervals pages working
with notices will cease to function. To test:

1) Apply patch.
2) Try to edit some notices.
3) Trigger some notices.
4) If you were able to edit the notices and trigger the notices, sign
   off.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
I did a regression script without Plack:
- edit, add, delete and copy notice
- trigger checkout/checkin notice
- print issueslip
No problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 26a4b33e57d102acd5353d6a8a560995c2952429)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoFix incorrect entities in PO files
Jared Camins-Esakov [Sun, 19 May 2013 12:12:40 +0000 (08:12 -0400)]
Fix incorrect entities in PO files

There were numerous malformed HTML entities in the PO files for various
languages. No longer.
(cherry picked from commit f04b9ec3266211d9a777aefa686e0ea1e9fc0028)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoUpdate release notes for Koha 3.12.0 RC3 v3.12.00-rc3
Jared Camins-Esakov [Sat, 18 May 2013 16:10:11 +0000 (12:10 -0400)]
Update release notes for Koha 3.12.0 RC3

11 years agoMerge remote-tracking branch 'translate/3.12.0-translate' into 3.12-master
Jared Camins-Esakov [Sat, 18 May 2013 16:02:54 +0000 (12:02 -0400)]
Merge remote-tracking branch 'translate/3.12.0-translate' into 3.12-master

11 years agoTranslation update for 3.12.0
D Ruth Bavousett [Sat, 18 May 2013 15:55:29 +0000 (12:55 -0300)]
Translation update for 3.12.0

11 years agoBug 10270: Fix shebang
Jonathan Druart [Fri, 17 May 2013 14:54:43 +0000 (16:54 +0200)]
Bug 10270: Fix shebang

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 85b0f57e9980b4d2dec01a7e9b2342913388ac8a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10270: GetOrdersByBiblionumber needs better unit tests
Jonathan Druart [Fri, 17 May 2013 09:38:34 +0000 (11:38 +0200)]
Bug 10270: GetOrdersByBiblionumber needs better unit tests

prove t/db_dependent/Acquisition/GetOrdersByBiblionumber.t

Signed-off-by:Mathieu Saby <mathieu.saby@univ-rennes2.fr>
I made 2 tests :
$prove -v t/db_dependent/Acquisition/GetOrdersByBiblionumber.t
and
$prove -v t/db_dependent/Acquisition.t
The 2 tests are successful.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 96f8a31200c20f89c8658cc5db4762132e81964b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10259 - koha-*-zebra scripts are expected to run without warnings if no instance...
Tomas Cohen Arazi [Thu, 16 May 2013 14:11:52 +0000 (11:11 -0300)]
Bug 10259 - koha-*-zebra scripts are expected to run without warnings if no instance name passed

Commented out the code that checks for intance name parameters on the zebra service handling scripts.
It restores the original behaviour, while leaving error checking code.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f937d41dbfb5440a0451fbc9cf648339f1566bd3)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9824 - Hide basket with no expected items in basqket list by bookseller
Lyon3 Team [Thu, 21 Mar 2013 13:47:43 +0000 (14:47 +0100)]
Bug 9824 - Hide basket with no expected items in basqket list by bookseller

Before patch you will see in acqui/booksellers.pl all the baskets ever
created.
After the patch you will see in acqui/booksellers.pl only the basket
with expected items.

Test plan :
* Create a basket with some orders lines
You should see this basket in acqui/booksellers.pl
* receive or cancel all the line in this basket
This basket shouldn't appear any more in acqui/booksellers.pl

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit a0a6d6e64bca28b4d9bc668f614ed286b07327f9)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoAdd Rafal Kopaczka to the history
Jared Camins-Esakov [Fri, 17 May 2013 11:53:53 +0000 (07:53 -0400)]
Add Rafal Kopaczka to the history

Welcome, Rafal! You are the 211th developer with a patch in Koha.
(cherry picked from commit 3898e70fe55b9e56a474220223adcf205a12add1)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10266 - Statuses not appearing in the OPAC
Rafal Kopaczka [Wed, 15 May 2013 14:19:05 +0000 (16:19 +0200)]
Bug 10266 - Statuses not appearing in the OPAC

Simply revert order of 2 lines in Items.pm. Previous line write to
variable used in next line as function argument.

To Test:

Give an item a special restricted value, define one if you have to
in the authorised values.

Observe that, without this patch, statuses are not shown in the
OPAC in parentheses. My example was an item that had a restricted
value of "Library Staff Only"

It should have been shown under status on the detail page of the
OPAC, but was not.

Apply the patch, observe that restricted values are now shown
for your item, for example:
Available (Library Staff Only) in the status column.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and test plan.
Simple change fixing a display problem, no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 5c95148bb1852d4b26e64368b6d1013b60a5cf18)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoUpdate 3.12 release notes for Koha 3.12.0-rc2 v3.12.00-rc2
Jared Camins-Esakov [Thu, 16 May 2013 02:13:08 +0000 (22:13 -0400)]
Update 3.12 release notes for Koha 3.12.0-rc2

11 years agoMerge remote-tracking branch 'translate/3.12-RC' into 3.12-master
Jared Camins-Esakov [Thu, 16 May 2013 01:56:33 +0000 (21:56 -0400)]
Merge remote-tracking branch 'translate/3.12-RC' into 3.12-master

11 years agoBug 10030: QA Followup for trivial false warning detected while testing
Marcel de Rooy [Wed, 15 May 2013 14:06:49 +0000 (16:06 +0200)]
Bug 10030: QA Followup for trivial false warning detected while testing

Moving the warn line below the line that returns if amount<=0.
If amount<=0, a false warn is now raised because of the return after it.
We should only warn here if we do not return.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with fines.pl on overdue.
Before this patch:
Reducing fine for item 199709 borrower 23 from 44 to -1 - MaxFine reached.
This did not happen however because of the return.
After this change: no false warning.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 656aba3e1ff1a2eb69baf9bbab38cf4b37b38afe)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10030 - MaxFines checks against amount, not amount outstanding
Kyle M Hall [Thu, 11 Apr 2013 19:46:50 +0000 (15:46 -0400)]
Bug 10030 - MaxFines checks against amount, not amount outstanding

If a patron has over time accumulated fines greater than the amount
defined in MaxFine, the patron will never get more fines even if they
have previously paid off those fines.

This bug was introduced by the patch for Bug 7420.

Test Plan:
1) Create a patron
2) Create a fine of 10.00 for that patron
3) Pay off the fine
4) Set MaxFines to 5.00
5) Check out an item to the patron, backdate the due date
   so the item should generate fines.
6) Run fines.pl, observe that no fine was created
7) Apply the patch
8) Rerun fines.pl
9) Observe that the fine was created correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 9fc4c64140640df25b7a6519226d3d097bd9b72c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoLanguage update for 3.12-RC
D Ruth Bavousett [Thu, 16 May 2013 01:45:14 +0000 (22:45 -0300)]
Language update for 3.12-RC

11 years agoBug 10094 - koha-list should have a --disabled option switch v3.12.00-rc1
Tomas Cohen Arazi [Tue, 23 Apr 2013 13:14:37 +0000 (10:14 -0300)]
Bug 10094 - koha-list should have a --disabled option switch

This patch adds that (--disabled) option switch, Also revisits some of the code and docs.

To test:
- Apply the patch and create new packages (you might just drop the koha-list command somewhere)
- Create several instances (koha-create)
- Randomly set some as disabled, others enabled and enable email on some.
- Test all possible option switches combinations

Expected results:
- koha-list should abort with a proper message if mutually exclusive options selected (--email vs. --noemail, --enabled vs. --disabled)
- koha-list should show the exact instances you asked for

Regards
To+

P.S.: I wanted to add the --disabled option switch for the tab-completion work I'm doing, but as of bug 4876 I thought it would be ok to revisit the script to make it robust and clear.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Does what it says, and cleans up the script at the same time.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit de275ec128d3b26e953c35778e6a37e5b85273f5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10146 - koha-stop-zebra error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 14:08:35 +0000 (11:08 -0300)]
Bug 10146 - koha-stop-zebra error handling

koha-stop-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.

Regards
To+

Edit: Corrected the die message

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 898e178c6ff3a79bf991defb60aec8ff58f107c6)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10157 - koha-email-enable error handling
Tomas Cohen Arazi [Tue, 30 Apr 2013 13:05:44 +0000 (10:05 -0300)]
Bug 10157 - koha-email-enable error handling

koha-email-enable now
- Checks the instance exists.
- Checks if email is already enabled.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 1126dd8bf3e3f386acfc007bc6e3310cc5320100)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10159 - koha-rebuild-zebra error handling
Tomas Cohen Arazi [Tue, 30 Apr 2013 14:58:25 +0000 (11:58 -0300)]
Bug 10159 - koha-rebuild-zebra error handling

This patch makes koha-rebuild-zebra:
- Check for the existence of the instance
- Handle arbitrary amount of instance parameters
- Capture -a and -b (which made the script rebuild twice the chosen DB). It adds the extended version (--authorities and --biblios respectively) of the option switch. This makes the -a and -b switches work as "only do authorities" (or viceversa). They can be used concurrently, which is the default behaviour when no switch is provided.
- Handle -v (and --verbose) as koha-rebuild-zebra options, to ease the use for non-techie users.
- The rebuild_zebra.pl is wrapped inside an IF to return error values if we ever make rebuild_zebra.pl return error codes (this is pointed in the code).
- Added -h/--help switches and an 'usage' output :-D Please provide patches for any wording issues, or contact me to fix it.

To test:
- Apply the patch and create your packages (or just use the script from your branch)
- Run it in this scenarios / options
  - -h/--help to see the available option switches
  - Mix them with one or more instances, of which some could be fake
  - try -a/--authorities and -b/--biblios in all possible combinations
  - try -v/--verbose works

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 39d3b9088a34b464708e40d1fd20a954d4a6e702)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 6329 - patron categories should show which fields are required
Owen Leonard [Tue, 14 May 2013 19:09:14 +0000 (15:09 -0400)]
Bug 6329 - patron categories should show which fields are required

When entering a new patron category, required fields are not indicated
on the entry form. This patch adds the "required" class to the relevant
labels.

To test, add or edit a patron category. Confirm that the required fields
(category code, category type, description, and enrollment period) are
indicated as being required with a red label.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely.
Template changes only, but no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 85fd38e5969c083692fe0a5227c792c2ff07134d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10214 Add header to syspref po files
Frédéric Demians [Tue, 14 May 2013 11:01:56 +0000 (13:01 +0200)]
Bug 10214 Add header to syspref po files

With this patch, header is created when creating a new syspref .po file
for a new language (translate create), and is added if it doesn't
already exist when updating an existing language (translate update).

To test:

(1) Create a new language syspref file:

    ./translate create -p xx-XX

    Check that there is an header

(2) Update an existing syspref file without header:

    ./translate update fr-FR

    Check that fr-FR-pref.po has a header

(3) Update an existing syspref file with header:

    Modify fr-FR-pref.po. Add an email, or whatever.

    ./translate update fr-FR

    Check that fr-FR-pref.po has a header with the manual modification

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Also tested that updated pref files can still be installed correctly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 9ce862e451f56fdca7d368fd1a39e64e40fc678f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10108 - can't print more than one page of overdues
Owen Leonard [Fri, 10 May 2013 18:44:10 +0000 (14:44 -0400)]
Bug 10108 - can't print more than one page of overdues

Printing a report like overdues in Firefox results in a printout which
cuts off in the middle. I traced the cause to something in the YUI grid
system, although I'm not sure what specific definition is the cause.

This patch adds a "screen" parameter to the @import which loads the YUI
grid CSS file. This will disable YUI grid layouts in print views. The
main disadvantage to this, as far as I can tell, is that it will
"linearize" some layouts. For instance: the patron detail page
(moremember.pl) which on screen is divided into two columns. I think
this disadvantage is outweighed by the ability to make complete prints.

To test, apply the patch and clear your cache. Try printing various
reports from Firefox. Printouts should look correct and be complete.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
CSS only change, no strings involved.
Tested with a saved SQL report 'select * from borrowers'.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit fac9d5447abae5c2f3d9febd9ccaf42a4ed6030c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7593: Fix unit tests
Jonathan Druart [Mon, 13 May 2013 12:00:44 +0000 (14:00 +0200)]
Bug 7593: Fix unit tests

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 94e00ac835568d82222bd2214df0bf19cbe0f82b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9575 - Serious Holds Problem with IndependantBranches
Kyle M Hall [Tue, 12 Mar 2013 18:30:48 +0000 (14:30 -0400)]
Bug 9575 - Serious Holds Problem with IndependantBranches

If IndependantBranches is enabled, all holds for an item display the
currently logged in library no matter what, and modifying the holds will
set all pickup locations for all the holds to that logged in library!

Test plan:
 1) Disable IndependantBranches
 2) Place 3 holds on a record with 3 different pickup locations
 3) Enable IndependantBranches
 4) Refresh the holds page for that record, all the holds show now
    show a pickup location of the logged in branch
 5) Modify the order of the holds
 6) Disable IndependantBranches
 7) Refresh the holds, verify the holds all now have a pickup
    location of the logged in branch
 8) Apply the patch
 9) Repeat steps 1-3
10) Refresh the holds page for that record, all the holds should
    now show the correct pickup branch, but it cannot be changed
    as IndependantBranches is enabled.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
In my tests the above test plan only worked out if my user
had no superlibrarian permission. But then behaviour for
independentbranches off/on was all correct.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 98b96c88d7ee97aa194cf7d2f1f69f1c5cabbb96)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10233 - Toolbar background missing from staff client catalogue page
Owen Leonard [Mon, 13 May 2013 13:57:52 +0000 (09:57 -0400)]
Bug 10233 - Toolbar background missing from staff client catalogue page

The toolbar on the cataloging home page lacks the standard toolbar id,
resulting in an inconsistent appearance. This patch adds the correct id.

To test, apply the patch, clear your browser cache, and view the
cataloging home page (cataloguing/addbooks.pl). The toolbar should look
like other toolbars in Koha (for instance, members/members-home.pl).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, no string changed involved.
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 17519118767f3b5d7977125844fae589e0dc4f1a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10196 - items table partially hidden in marc view in ccsr
Owen Leonard [Fri, 10 May 2013 20:00:51 +0000 (16:00 -0400)]
Bug 10196 - items table partially hidden in marc view in ccsr

In the CCSR theme's OPAC MARC view the table of items is truncated
because the container div is styled with "overflow:hidden." I think the
complete display of information is more important than not seeing a
horizontal scrollbar, so this patch removes the style.

To test, apply the patch and clear your browser cache. View a MARC
detail page for a title which has holdings and confirm that the entire
table can be seen. Test other pages to make sure no unwanted layout
changes have resulted.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple CSS change, no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit a52bedaeac14c8f82073f60f0d8632d53b7792d1)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8840 - [SIGNED-OFF] Patch to solve false "All dependencies installed!"
Mark Tompsett [Mon, 17 Dec 2012 20:51:33 +0000 (15:51 -0500)]
Bug 8840 - [SIGNED-OFF] Patch to solve false "All dependencies installed!"

Reordered logic to accumulate MISSING_PATCHES variable and tweak
condition to be certain it was not failing.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, see Bugzilla for details.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 18b8f018c7f7fdcbac498ecea95d3da4baa0b8ff)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8840 - [SIGNED-OFF] ubuntu-pkg-check.sh fix and extend functionality
Tomas Cohen Arazi [Fri, 28 Sep 2012 17:11:55 +0000 (01:11 +0800)]
Bug 8840 - [SIGNED-OFF] ubuntu-pkg-check.sh fix and extend functionality

First, reworked it into a newer script with parameters:
   ubuntu-packages.sh -r
This will generate output identical to the old script, except
that it is fixed for non-english setups.
   ubuntu-packages.sh -h
This adds a brief help, which all scripts should have.
   ubuntu-packages.sh -ic
This helps handle a multi-arch problem by printing out a
relevant command for installing missing dependencies.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, see Bugzilla for details.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 748c6e7f89310a3092ef202ece4547356ad90a95)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10079 - HomeOrHoldingBranch should not control who can delete when IndependantBra...
Kyle M Hall [Fri, 19 Apr 2013 14:21:43 +0000 (10:21 -0400)]
Bug 10079 - HomeOrHoldingBranch should not control who can delete when IndependantBranches is enabled

Test Plan:
1) Enable IndependantBranches
2) Set HomeOrHoldingBranch to holding branch
3) Delete an item whose holding branch is your logged in branch, and
   whose home branch is not
4) Apply this patch
5) Repeat step 3, it should fail
6) Try to delete another items whose home branch is your logged in
   branch, and whose holding branch is a different branch. This
   deletetion should succeed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Change is logical, only homebranch should determine if the item
can be deleted.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f1d68112820483b8cc5e837f6ded6f9bebe83717)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10100: adds a class to OPAC news dates
Adrien Saurat [Tue, 23 Apr 2013 07:40:33 +0000 (09:40 +0200)]
Bug 10100: adds a class to OPAC news dates

Adds a "newsfooter" class to allow CSS modification
of the date appearing as a footer on each news.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds a class, checked po files to make sure change is string safe.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8901374b934c087b458195d9d1e7828f35aa74e0)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7593 : QA followup : restores deleted line in C4::Acquisition
Mathieu Saby [Tue, 30 Apr 2013 06:16:18 +0000 (08:16 +0200)]
Bug 7593 : QA followup : restores deleted line in C4::Acquisition

This patch restores the line exporting GetOrderNumber that I accidentally suppressed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Restores a line that was deleted by the first patch.
Was not sure if patches should be squashed.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 24f5525207c11401626f363faff90fa9436c1003)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7593: Move orders on the destination record when merging 2 records
Mathieu Saby [Wed, 13 Mar 2013 15:12:03 +0000 (16:12 +0100)]
Bug 7593: Move orders on the destination record when merging 2 records

Revised patch according to QA comments. No more dependent from bz 9780.

At present, merging records breaks the link order/record, except
if an item of the deleted record is used in the order.
This is a serious issue for libraries creating items on receipt.
This patch moves existing orders from deleted record to destination record.
It creates a new function Acquisitions::GetOrdersByBiblionumber,
that could be used by other patches later.

To test :
Check the problem :
1. Set syspref AcqCreateItem = Create an item when receiving an order
1. Create a basket with one order
2. Put the record used by this order in a list
3. Put an other record in the list
4. Merge the 2 records, keeping as a reference the record NOT used in the order
5. In the order, you will see for that order "Deleted bibliographic information..."
6. Apply the patch
7. Repeat steps 1-4
8. In the order, you will see the title/author of the kept record.
9. Set syspref AcqCreateItem = Create an item when placing an order
10. Repeat steps 1-4 (an item will be created)
11. In the oreder, you will see the title/author of the kept record
    (it is already the case at present. the patch should not alter this behavior)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan, test suite and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b1a52b29181137791784fe20313efe8bce98b1fa)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9680 - cart aligned right in CCSR
Owen Leonard [Fri, 10 May 2013 16:12:11 +0000 (12:12 -0400)]
Bug 9680 - cart aligned right in CCSR

The CCSR theme sets a min-width of 1000px for windows which are more
than 700px wide. This caused the cart popup window to be given a
min-width of 1000px, resulting in a broken layout with unnecessary
horizontal scrolling.

This patch adds a class to the cart template and to other pop-up window
templates to ensure that a large min-width is not enforced and to give
consistent padding to those pages.

To test, set your theme to 'CCSR' and view the following pop-up pages:

- The Cart. From the cart, trigger:
  - The "send" window
  - The "download" window
- From a view of a List's contents trigger:
 - The "send" window"
 - The "download" window

Each of these pages should look correct with no horizontal scrolling.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template and CSS changes only, but no string changes.
Save for inclusion in 3.12.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit db0fa0eacda5a448d9406a03fc92cdaff393ea52)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10054 - When SingleBranchMode is enabled, allow superlibrarians to set logged...
Kyle M Hall [Mon, 15 Apr 2013 13:09:05 +0000 (09:09 -0400)]
Bug 10054 - When SingleBranchMode is enabled, allow superlibrarians to set logged in library

Currently, when SingleBranchMode is enabled, nobody can change the
logged in library in Koha. To change it requires disable
SingleBranchMode, switching the library, and re-enabling it. It seems
reasonable to allow superlibrarians to switch the logged in library even
if SingleBranchMode is enabled.

Test Plan:
1) Apply this patch
3) Enable SingleBranchMode
4) Log in as a superlibrarian
5) Attempt to change the logged in branch
   This change should succeed
6) Log in as a non-superlibrarian account
7) Attempt to change the logged n branch
   This should not be allowed, as per Koha's current behavior

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I guess this doesn't do any harm even though the practical motivations
behind it, as described in the bug, seem otherwise solvable. If
SingleBranchMode is supposed to prevent librarians from switching their
logged in library why can they choose their library when they first log
in? Was SingleBranchMode supposed to only affect the OPAC originally? Or
should the login form be modified? This seems to be a band-aid on a
poorly-implemented feature.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works as decribed. As this only adds a check for a superlibrarian
it seems safe and should not interfere with normal staff accounts.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 218194fab0398e433651d5ba26634d79c63442f5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu
Owen Leonard [Thu, 9 May 2013 19:08:41 +0000 (15:08 -0400)]
Bug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu

The user should not be shown edit/delete links when clicking on a row in
additems which they cannot edit because of the IndependantBranches
setting. This patch adds a class to the row to exclude such rows in the
JavaScript onclick handler.

To test:

- Turn IndependantBranches on and edit items for a title which
  has holdings from various branches including your own.
- Click a row for an item which is held by your library. You should see
  the "Edit/Delete" links appear.
- Click a row for an item which is held by another library. No links
  should appear.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Changes to the templates include no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b36d3bc796fd1b0a4db32729c994287425f10326)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10134 - set XSLT usage ON as default, for new Koha installs
Magnus Enger [Wed, 8 May 2013 09:10:27 +0000 (11:10 +0200)]
Bug 10134 - set XSLT usage ON as default, for new Koha installs

Currently, new installs are created with XSLT display set to "off",
but XSLT seems to be the preferred way to display records, so
having the default be "on" instead seems to make sense. This patch
will of course only affect new installs.

To test:
- Apply the patch
- Run through the webinstaller on an empty database
- Log in to the staff client and search for "xslt" in system
  preferences
- Verify that XSLTDetailsDisplay, XSLTResultsDisplay,
  OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay are all set to
  "default"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passes test plan correctly.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes syspref.sql for new installations to use XSLT views
by default. No changes to existing installations, no
string changes.
Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit e7571a1a1c3054b738f4fd9f37c45750143544c5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9679 - can't place hold from cart in CCSR
Owen Leonard [Fri, 10 May 2013 13:50:51 +0000 (09:50 -0400)]
Bug 9679 - can't place hold from cart in CCSR

When the CCSR theme is enabled, selecting items in the cart and clicking
"place hold" triggers a JavaScript error and fails. This patch adds a
function missing from the CCSR version of basket.js.

To test, apply the patch and clear your browser cache.

- Enable the CCSR theme and put items into the OPAC cart.
- Open the cart, select one or more items, and click "place hold."

The cart should automatically close and the main window should redirect
to the holds screen showing your selections.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed patch fixes the problem described.
All tests and QA script pass, JavaScript only change.
No strings involved, save for inclusion in 3.12.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d0f93e67726ed242e1124d36ed00d1a4a3645701)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10201 [Follow-up] Old OPAC patron update system should be removed
Owen Leonard [Tue, 7 May 2013 16:11:23 +0000 (12:11 -0400)]
Bug 10201 [Follow-up] Old OPAC patron update system should be removed

The previous patch missed removal of one template, kohaerror.tt, which
was used only by opac-userupdate.pl. This patch removes it.

To test, apply the patch and search Koha source files for references to
kohaerror. There should be none.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass. Updating the German po files
with this patch applied no new strings appeared.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8aa2bb150ae384d4195bdcf178e82f495ede6a1b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10201 - Old OPAC patron update system should be removed
Owen Leonard [Mon, 6 May 2013 14:56:03 +0000 (10:56 -0400)]
Bug 10201 - Old OPAC patron update system should be removed

The old pages for viewing and updating patron details in the OPAC have
been superceded by the new script opac-memberentry.pl. This patch
removes he old scripts and templates and corrects links to them.

This patch also removes reference to opac-userupdate.tt from
opac-patron-image.pl  and replaces the authentication process with one
which uses check_cookie_auth, based on the example of opac-tags.pl.

To test, edit a patron record and set the "Gone no address" flag. Log in
to the OPAC with that account and view the patron details page. The
warning about out of date contact information should link to the new
update page.

Next, attempt to place a hold. You should see the same warning, and it
should also link to the new update page.

Test the display of patron images: Log in as a user who has an image
associated with their account and navigate to
/cgi-bin/koha/opac-patron-image.pl. Their patron image should display.

A search of Koha source files should return no results for the missing
scripts or templates.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 029c4b334de1d5c0727ee840a91f114072c52995)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10217 - Make sure direct links to detail views work when there is no session
Magnus Enger [Wed, 8 May 2013 10:03:48 +0000 (12:03 +0200)]
Bug 10217 - Make sure direct links to detail views work when there is no session

To reproduce:
- Make sure you do not have a session for the OPAC you will be testing
  with. Delete the CGISESSID session cookie if you have one.
- Go directly to a detail view, e.g.:
  /cgi-bin/koha/opac-detail.pl?biblionumber=1
- Observe the error "Can't use an undefined value as a HASH
  reference at /home/magnus/scripts/kohadev/opac/opac-detail.pl line 445."

To test:
- Apply the patch
- Reload the page with the error
- You should now see the detail view of the record, as usual

Thanks to Chris Cormack who suggested the fix for this!

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan, confirmed patch fixes the problem.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 51a1e8854830d72e42dbfe313a5082ccd5f48688)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9681: Increment version number
Jared Camins-Esakov [Wed, 8 May 2013 14:03:26 +0000 (10:03 -0400)]
Bug 9681: Increment version number

Database update for bug 9681 has been given version 3.11.00.301
(cherry picked from commit 5a9a82dcc3ebdb3b7f130edbfb8c6ef67f97eb68)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9681: Add some indexes in database
Paul Poulain [Mon, 6 May 2013 13:06:47 +0000 (15:06 +0200)]
Bug 9681: Add some indexes in database

Some table columns should have an index to speed SQL queries :
- statistics table has only one index (used to make heavy queries for reports)
- itemtype should have an index in items and biblioitems (this is used in circulation to check the number of existing issues of a specific item type)
- issue.branchcode and issue.issuingbranch

Test plan :
- Create a new database using kohastructure.pl
=> check there is no SQL error and that new indexes are present (mysql> show create table)
Apply update database on a master version
=> check there is no SQL error and that new indexes are present (mysql> show create table)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Indexes created as described. No errors.
Fixing small merge conflict.
Test presence of new indexes on all affected tables.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 68ff49bb7d982737c41a225cd697b8fb60d0b4ab)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10185: Add missing columns in update 3.09.00.025
Julian Maurice [Mon, 6 May 2013 06:43:50 +0000 (06:43 +0000)]
Bug 10185: Add missing columns in update 3.09.00.025

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL only changes fixing an important database update.

IMPORTANT: Patches must be backported to all versions containing
the database update 3.09.00.025.

I used the test plan provided by Julian with some additions:
1/ Do a fresh 3.8 install
2/ Do some reserves
3/ Check your old_reserves table is empty
4/ Update your sources to 3.10
5/ Run updatedatabase.pl
6/ Your reserves table is now empty!

I made sure I had item level and title level holds, also
suspended holds.

I repeated the test with entries in my old_reserves table
(cancelled and filled holds) to make sure this is also still
working correctly.

Before the patch we lost all suspended holds and when the
old_reserves table was empty also all holds in general.
After the patch the reserve_id is added but the other data
in both tables is not altered.

NOTE: Adding the reserve_id first to old_reserves and then
to reserves we are missing one id in between.
old_reserves: 1,2,3
reserves: 5,6
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 30d067400e6d15cd86d8b35daed4bb10438d0e2e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10185: Fix update 3.09.00.025
Julian Maurice [Fri, 3 May 2013 15:20:17 +0000 (17:20 +0200)]
Bug 10185: Fix update 3.09.00.025

It can remove all reserves from reserves table when there is no entries
in old_reserves.
This is due to @ai which is set to NULL in
  SET @ai = ( SELECT MAX( reserve_id ) FROM tmp_reserves )
and reserve_id > NULL returns no results in
  INSERT INTO reserves SELECT * FROM tmp_reserves WHERE reserve_id > @ai

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan and comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 37c52367b08f30514483b02a387cb5a463ea15d0)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10156 - Fix usr/bin/perl path for get_report_social_data.pl
David Cook [Wed, 8 May 2013 08:00:29 +0000 (18:00 +1000)]
Bug 10156 - Fix usr/bin/perl path for get_report_social_data.pl

Currently, the perl path for get_report_social_data.pl is "#!/bin/perl"
when it should be "#!/usr/bin/perl".

While I'm not entirely sure how to test this, rangi did mention:

23:47 (it wouldnt work on my debian install)
23:48  zsh: no such file or directory: /bin/perl

It's a pretty trivial change, so I'm not sure it needs much of a test
plan.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Before the patch "grep -r '#!/bin/perl' in the misc dir shows one file
with this line, and it is indeed get_report_social_data.pl. After the
patch there are no occurrences left.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2e103a018cedc1c57d1c0db8acad6f93ab4ca428)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8278: build the structure with to_json instead of manually.
Jonathan Druart [Mon, 22 Apr 2013 14:19:01 +0000 (16:19 +0200)]
Bug 8278: build the structure with to_json instead of manually.

Test plan:
Same as previously.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit bb1b15d93937677aa61dbee8fce8c19846acb4d8)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8278 [Follow-up] Replace YUI autocomplete in UNIMARC 210c plugin
Owen Leonard [Mon, 15 Apr 2013 19:09:24 +0000 (15:09 -0400)]
Bug 8278 [Follow-up] Replace YUI autocomplete in UNIMARC 210c plugin

This follow-up corrects the heading of the plugin pop-up window to match
the UNIMARC field it targets.

To test, trigger the plugin and confirm that the pop-up window refers to
210c.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Smple patch, fixes label. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit e75fd34e92c599da8daa7ab40ef0153acbf05bf6)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8278 : Follow up, fixing the permissions on cataloguing/ysearch.pl
Chris Cormack [Tue, 2 Apr 2013 06:48:34 +0000 (19:48 +1300)]
Bug 8278 : Follow up, fixing the permissions on cataloguing/ysearch.pl

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works. No errors.

Without patch and normal staff user, logged out
With patch, normal staff, valid output.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 588cc04571bd4eab1878c4abcac883ebe3ad060e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8278 - Replace YUI autocomplete in UNIMARC 210c plugin
Owen Leonard [Fri, 8 Mar 2013 17:56:24 +0000 (12:56 -0500)]
Bug 8278 - Replace YUI autocomplete in UNIMARC 210c plugin

This plugin, for pseudo-authority-control of publisher information,
used YUI autocomplete to pull existing publisher data from the
biblioitems table. Despite its name it is not UNIMARC-specific.
It assumes publisher name data is saved in biblioitems.

This patch converts the autocomplete to jQueryUI. The search
script has been amended to return valid JSON. The template has
been modified to enable the jQueryUI autocomplete and to add
structure more consistent with other popups.

To test, link the publisher name field in your MARC structure to
the unimarc_field_210c_bis.pl plugin. Open a MARC record for
editing and click the "tag editor" link to launch the plugin.
Type the first few letters of a publisher which exists in your
database. You should get an autocomplete menu of publishers
which match your search. Select one and click the "choose"
button to fill the field in the MARC editor.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: work as described. No errors.

Test: link 260b to plugin. Edit record and search first letters
of present editors. Menú appears and can select and fill value.

Why plugin 210c_bis talk about field 225a?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Plugin now works correctly for me, even when linked
to 260$b in a MARC21 installation. All tests and QA script
pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 626c27baf993b8a19a7cdace902c03ae26f23da5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10204 - Patron image no longer appears in the OPAC
Owen Leonard [Mon, 6 May 2013 16:29:01 +0000 (12:29 -0400)]
Bug 10204 - Patron image no longer appears in the OPAC

With the addition of opac-memberentry.pl to the OPAC we lost a way to
display the image associated with a patron's account. This patch adds
display of the patron image to opac-memberentry.pl now that
opac-userdetails.pl and opac-userupdate.pl are deprecated.

To test:

1. Log into the OPAC as a patron who has an image associated with their
   account. View the "my personal details" tab and confirm that the
   patron image appears with and without OPACPatronDetails enabled.

2. Log into the OPAC as a patron who has no image associated with their
   account. View the "my personal details" tab and confirm that the
   layout looks correct.

3. Turn off OPACpatronimages and confirm that the "my personal details"
   page looks correct.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with OpacPatronDetails and OpacPatronImags turned on/off
and it's working well.
Template only changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit afccbfcce7192c6e1fcd73f137135cb5289c3d3d)

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