]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoTransation updates for 3.12.2
Bernardo Gonzalez Kriegel [Mon, 22 Jul 2013 21:50:18 +0000 (18:50 -0300)]
Transation updates for 3.12.2

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 8911: DBRev 3.12.01.005
Tomas Cohen Arazi [Mon, 22 Jul 2013 14:59:31 +0000 (11:59 -0300)]
Bug 8911: DBRev 3.12.01.005

Advertise the users how to fix About Koha > Timeline for old instances.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 8911: make sure history.txt gets installed where history.txt can see it
Tomas Cohen Arazi [Tue, 2 Jul 2013 21:35:58 +0000 (18:35 -0300)]
Bug 8911: make sure history.txt gets installed where history.txt can see it

This patch makes Makefile.PL put the history.txt file in the right places
depending on the chosen setup layout, adds a reference to that place in
koha-conf.xml (and debian template version), and finally tweaks about.pl to
use it.

To test, apply the patch and verify that perl Makefile.PL runs fine, and
installing in
 - dev
 - single
 - standard
layouts works as expected. Then go to the about.pl page and see if Koha's
history shows there.

Then, build your packages and test on your newly created instances.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0fe3d053ffe0adc4fda4fdb660ed93203ecc02d8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fixed a trivial conflict in Makefile.PL (course reserves are not in 3.12)

11 years agoBug 10411: add cache control headers for static resources (Debian package)
Robin Sheat [Wed, 5 Jun 2013 05:50:29 +0000 (17:50 +1200)]
Bug 10411: add cache control headers for static resources (Debian package)

This adds caching directives to the static resources so that the browser
doesn't ask about them all the time.

By default, Debian apache doesn't have the required module (mod_expires)
enabled, and so this patch will have no effect. In order to enable this
function, run:

a2enmod expires

and restart apache.

Test Plan:
* Using firebug or equivalent, load a page.
* Note that none of the images, css, or js files have a Cache-Control or
  Expires header set.
* Add this patch, redeploy the package with it (or overwrite the
  apache-share.conf file) enable the 'expires' module, restart apache.
* Force-reload the page
* Note that the images, css, js now have Cache-Control and Expires set
  for 12 hours into the future.

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 be905428722522f1ace4e99d13ffcb5d11f65657)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10447: add 'ru' and 'uk' to Zebra indexing language list
Tomas Cohen Arazi [Tue, 11 Jun 2013 14:13:59 +0000 (11:13 -0300)]
Bug 10447: add 'ru' and 'uk' to Zebra indexing language list

This patch add the option to choose 'ru' and 'uk' during install for Zebra.
Should work for a tarball install, and make 'ru' and 'uk' available for using
with koha-create too.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Reran Makefile.pl and made sure the language options show up now.
Patch extends existing language code lists addings nb, ru and uk
where missing.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 782e3251c043d3f3671e1eeff7b195939afd5db2)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10507: improve warning about duplicate patron attribute value
Colin Campbell [Tue, 9 Jul 2013 10:18:49 +0000 (11:18 +0100)]
Bug 10507: improve warning about duplicate patron attribute value

If a warning about a duplicated patron attribute is returned,
the value was being passed back for display in the warning
message with the same name as the variable in errors

As the message is displayed in the context of errors
the error value 1 was being displayed not the value
duplicated as intended.

Pass the value to the template with a unique name.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I fixed another tiny typo while signing off: "is already in use" instead
of "is already is use."

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2614e07e1e2e6386b5f91e65f127940072e54d4d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10475 - Item form in acquisition not hiding subfields properly
Owen Leonard [Tue, 25 Jun 2013 16:46:04 +0000 (12:46 -0400)]
Bug 10475 - Item form in acquisition not hiding subfields properly

Subfields hidden in your ACQ framework leave a gap where they used to
be in the item entry form when adding an item to an order. This patch
makes the same change made by 7116 to services/itemrecorddisplay.tt to
correct the problem.

To test:

- Edit your ACQ framework and set some item subfields to hidden in the
  editor.
- Set your  AcqCreateItem system preference to "when placing an order."
- Add a title to an existing basket from an existing record.

The item entry form should display correctly with your hidden subfields
hidden. No whitespace should be left behind where the subfields were
hidden.

Also changed: Invalid "size" attributes on hidden form fields in
neworderempty.tt, stray </li>.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, passes all tests and QA script.
Thx Owen!

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5e1f8caf609aa58eabf6f353d12ec25e0e8e23a0)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10529: Remove hardcoded dollar from patron message
Colin Campbell [Thu, 4 Jul 2013 11:21:45 +0000 (12:21 +0100)]
Bug 10529: Remove hardcoded dollar from patron message

The message fields which are returned in the SIP
Screen message field in a Patron Information response
had the dollar symbol hardcoded.

It would be possible to get the symbol from currency
but omitting any symbol would be consistent with the UI
and avoid problems with devices using weird encodings
for local currency symbols (e.g. the many variations
of UK Pound sign)

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ced4ca4e2d39856b4f00411eaee406b569199c1f)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10490: DBrev 3.12.01.004
Tomas Cohen Arazi [Tue, 16 Jul 2013 18:16:28 +0000 (15:16 -0300)]
Bug 10490: DBrev 3.12.01.004

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10490: Overdue fines cap can't store decimal values
Katrin Fischer [Mon, 1 Jul 2013 19:58:57 +0000 (21:58 +0200)]
Bug 10490: Overdue fines cap can't store decimal values

When overduefinescap was added to the issuingrules the datatype
given was decimal. This translates in MySQL to decimal(10,0).
This doesn't allow you to store decimal values and therefore
values like 4.5 are saved as 5 in the database.

To test:

On a current installation:
1) Try to enter 4.5 as Overdue fines cap. Verify that the value
   is not correctly saved.
2) Apply patch and run database update.
3) Try adding/changing an issuing rule setting Overdue fines cap
   to 4.5 again.
4) Verify the value is saved correctly.

Create a new Koha installation from scratch:
1) Verify that the issuingrules table has been created correctly
   and that you can add/mofidy issuingrules correctly.

Because this bug can create data loss, the old database update
has also been changed to avoid this problem for people updating
at a later point in time. Checkout an older version of Koha
pre 3.09.00.027.

1) Run the database updates.
2) Verify again, that adding/modifying issuingrules works correctly.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 16c57940441aac62c1c90538f3c7b7cd386e6d92)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10560: add regression test
Galen Charlton [Fri, 12 Jul 2013 14:57:11 +0000 (14:57 +0000)]
Bug 10560: add regression test

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e2bb7af21666ca61f65fb3163d8449823f5cab4b)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10560: make it possible for default interface language to not be English
Robin Sheat [Fri, 30 Nov 2012 02:48:50 +0000 (15:48 +1300)]
Bug 10560: make it possible for default interface language to not be English

If you enable another translation, and disable English, then if you dont
have a cookie set, or your browser is not set to that language, you will
get English. So you can not disable English in either the staff client
or the OPAC.

This patch fixes the language selection to do the right thing.

To test you must have at least one other language installed besides
English. Apply the patch and disable the en translation. Koha should
fall back to one of the enabled translations.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I added a patch description and test plan, missing from the
original patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I have tested with various combinations of activated languages
and have found no regression. If the cookie is set, the right
language is shown accordingly. Else the first language in the
list seems to be picked. It did never fall back to English
in my tests, when English was explicitly deactivated.

Passes all tests and QA script.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 38f596d48e19c8f7890caea7a6eb59b6174cf5fa)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as advertised.

11 years agoBug 10535: by default sort funds by name
Fridolyn SOMERS [Wed, 3 Jul 2013 12:24:23 +0000 (14:24 +0200)]
Bug 10535: by default sort funds by name

In parcels.pl, and other acquisition pages, the funds are not sorted
by name in combo-box.  With a great number of funds, it is difficult
to find one.

This patch adds a default value to $orderby arg of C4::Budgets::GetBudgets.

Test plan :
- Create a new fund with a name beginning with 'z' and set you as owner.
- Create a new fund with a name beginning with 'a' and set you as owner.
- Go to a vendor and click "Receive shipments"
- Look at fund combobox
=> Funds are sorted by name

Signed-off-by: Silvia Simonetti <s.simonetti@cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
When testing make sure your funds would sort the other way
around when sorting by code instead of description.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit aa6cdb60a9ab2581ffef08796a349242d3d2ff66)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agobug 10548: fix count of missing required dependencies by koha_perl_deps.pl
Mark Tompsett [Sat, 6 Jul 2013 19:50:54 +0000 (15:50 -0400)]
bug 10548: fix count of missing required dependencies by koha_perl_deps.pl

To test:

[1] ./koha_perl_deps.pl -m -u

If you have nothing missing, uninstall an optional component.

[2] ./koha_perl_deps.pl -m -u

You should get a number missing of at least 1.

[3] ./koha_perl_deps.pl -m -u -r

You should get the same number, even though the output is less.

[4] Apply patch

[5] ./koha_perl_deps.pl -m -u

Same results as in step 2.

[6] ./koha_perl_deps.pl -m -u -r

The number should differ from the results in step 3.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0134341d9a9883013b7eee3bdc84aa339e618bcc)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10496 - CCSR theme OPAC tabs to not show correct active state
Owen Leonard [Fri, 28 Jun 2013 18:11:48 +0000 (14:11 -0400)]
Bug 10496 - CCSR theme OPAC tabs to not show correct active state

When jQueryUI was updated in the CCSR theme the corresponding CSS
changes were not copied over at the same time, causing style problems
with jQueryUI widgets. This patch makes the necessary changes.

To test, apply the patch, clear your browser cache, and view any page
which uses jQueryUI tabs (advanced search, bibliographic detail page).
Tabs should look correct and correctly show which tab is active.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
CSS changes only.
Confirmed problem in CCSR OPAC templates.
Tested advanced search and detail pages in CCSR and prog.
In order to fully test advanced search I added location and
collection to AdvancedSearchTypes.
Also tested the branch tooltip as I spotted some CSS added for that.

Works beautifully, no problems found.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7010fd1d29fec8ba3b6a212943cae573b056d3f4)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 4907: make 'Organize by' filter in suggestions reflect selected option
Katrin Fischer [Mon, 1 Jul 2013 21:44:39 +0000 (23:44 +0200)]
Bug 4907: make 'Organize by' filter in suggestions reflect selected option

When using the 'Organize by' option to change the display of the
suggestions, the option is applied, but the pull down always jumps
back to the first entry 'Status'.

This patch fixes that.

To test:
- Try out all settings and verify that after the page reloads the selected
  option is applied to your suggestions and the pull down shows
  the option you selected.

Note: Until bug 10519 is properly fixed the tabs will not show
the correct descriptions, but the URL will show you the selected
option as parameter: displayby=acceptedby

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 60a4dffbb197fe92e7483b9e0dfcc19bc9b51664)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 5858 - Advertise the updated framework to upgrading users
Tomas Cohen Arazi [Tue, 16 Jul 2013 14:08:41 +0000 (11:08 -0300)]
Bug 5858 - Advertise the updated framework to upgrading users

Just that.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 5858: Followup for INSERT IGNOREs in marc21_framework_DEFAULT.sql
Marcel de Rooy [Sun, 7 Jul 2013 12:40:19 +0000 (14:40 +0200)]
Bug 5858: Followup for INSERT IGNOREs in marc21_framework_DEFAULT.sql

Changes 8 INSERTs into INSERT IGNOREs.
This allows current installs to benefit easier from the new tags/subfields.
Note that running with --force will not achieve the same! The multi-value
inserts will still be aborted, though execution continues.

Test plan:
Run the file or do a new install.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Ran the file on a current install manually.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bf9eccfeb8069c1b258916c1916138b6317122da)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 5858: update default MARC21 framework to April 2013 revision
Bernardo Gonzalez Kriegel [Wed, 20 Mar 2013 00:25:20 +0000 (21:25 -0300)]
Bug 5858: update default MARC21 framework to April 2013 revision

Applies to new installs, although with the follow-up
patch, users can run the installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
script through the mysql client to add new tag and
subfield entries.

To test:
1) Delete MARC21 default framework
2) Apply patch
3) Test that new default framework loads without problem

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Run this file with and without this patch.
This patch adds 24 tags (338 vs 314) and 323 subfields (3951 vs 3628).
Verified that last QA comments were incorporated.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 45669b2566c889c7a73251cdb132c81cf5127117)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10289: (follow-up) don't set cardnumber for test patron
Galen Charlton [Mon, 8 Jul 2013 14:29:32 +0000 (14:29 +0000)]
Bug 10289: (follow-up) don't set cardnumber for test patron

Since the patron barcode is nullable, and since the tests using
the test patron don't care what the barcode is, don't set it.  This
avoids the tests failing if the test database happens to already
have a patron record with the hard-coded barcode that used
to be supplied.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7957dd2a06cd20997f50f49aa1b77e24589ae71c)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10289: (follow-up) wrap tests in transaction
Galen Charlton [Mon, 8 Jul 2013 14:27:14 +0000 (14:27 +0000)]
Bug 10289: (follow-up) wrap tests in transaction

Applying new standard method for handling tear-down
of test data.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 47cf3ec24ded468ca4b7b79c8b000b1bdb13d1a8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10289: UT: Reserves.t needs to create its own data
Jonathan Druart [Mon, 20 May 2013 14:37:10 +0000 (16:37 +0200)]
Bug 10289: UT: Reserves.t needs to create its own data

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

And after, it should produce:
  t/db_dependent/Reserves.t .. 1/4 #
  # Creating biblio instance for testing.
  # Creating item instance for testing.
  # Deleting item testing instance.
  # Deleting biblio testing instance.
  # Deleting borrower.
  t/db_dependent/Reserves.t .. ok
  All tests successful.
  Files=1, Tests=4,  1 wallclock secs ( 0.02 usr  0.01 sys +  0.39 cusr  0.02 csys =  0.44 CPU)
  Result: PASS

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6e6c7608b7d9b13d3af8d2115659ef142adb1b01)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9519: DBRev 3.12.01.002
Tomas Cohen Arazi [Tue, 16 Jul 2013 13:50:23 +0000 (10:50 -0300)]
Bug 9519: DBRev 3.12.01.002

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9519: fix code for Italian language search limiter
Sonia LEMAIRE [Wed, 3 Jul 2013 13:53:49 +0000 (15:53 +0200)]
Bug 9519: fix code for Italian language search limiter

'ind' rather than 'ita' was set as the ISO639-2 language
code for Italian in the fr-FR, it-IT, pl-PL, ru-RU, and uk-UA
installation SQL.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked nb-NO and de-DE - language code there had already
been corrected.

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

Conflicts:

installer/data/mysql/updatedatabase.pl

Trivial merge conflict in the usual suspect, updatedatabase.pl

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10384: fall back to normal authentication if LDAP server is not available
Fridolyn SOMERS [Fri, 31 May 2013 08:17:08 +0000 (10:17 +0200)]
Bug 10384: fall back to normal authentication if LDAP server is not available

This fixes a bug where, assuming LDAP authentication is enabled, if a user
tries to log in while the LDAP server is down, the following fatal error
is displayed:

Can't call method "bind" on an undefined value at C4/Auth_with_ldap.pm line 134, <DATA> line 558.

This patch catches this error to allow normal authentication when LDAP connexion fails.

Test plan :
- Configure LDAP connexion with a host not having LDAP. ie :
 <useldapserver>1</useldapserver>
 <ldapserver id="ldapserver">
    <hostname>localhost</hostname>
    <base>dc=test,dc=com</base>
    <user>cn=Manager,dc=test,dc=com</user>
    <pass>passwd</pass>
    <replicate>0</replicate>
    <update>0</update>
    <auth_by_bind>0</auth_by_bind>
    <mapping>
      <firstname    is="givenname"      ></firstname>
      <surname      is="sn"             ></surname>
      <branchcode   is="branch"         >MAIN</branchcode>
      <userid       is="uid"            ></userid>
      <password     is="userpassword"   ></password>
      <email        is="mail"           ></email>
      <categorycode is="employeetype"   >PT</categorycode>
    </mapping>
 </ldapserver>
- Try to connect with mysql user (defined in koha-conf.xml)
- Try to connect with a user defined in borrowers
You may try to connect with working LDAP connexion

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 96ac578960cb4f2c5a964b3ac7fa4f9ba676b95d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9533: batch item modification form now shows default field values only by request
Kyle M Hall [Wed, 17 Apr 2013 13:33:55 +0000 (09:33 -0400)]
Bug 9533: batch item modification form now shows default field values only by request

This patch makes the pre-population of the fields for the batch
item editor with the default values from the default framework
optional and off by default.

Test Plan:
1) Apply patch
2) Add default values for cost and replacement cost to the
   default framework.
3) Browse to Tools / Batch item modification
4) Choose a file, or entire some barcodes in the text area
5) Ensure that the 'Populate fields with default values from default
   framework' is *not* checked
6) Click 'Continue'
7) Observe that the fields for cost and replacement cost are blank
8) Click the 'back' button on your browser
9) Check the checkbox to enable the default value
10) Click 'Continue'
11) Observe that the fields for cost and replacement cost now contain
    the default values you assigned them in the default MARC framework

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Switch works correctly, all tests and QA script pass.

Note: there is a bug with default values for all non text input
fields. Default values won't be applied for those fields as the
pull downs are not preselected correctly with the default values
defined in the framework.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2d32ab38148f7d75412a36e928dea799717bc5fb)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9113: fix handling of certain characters by item batch modification tool
Fridolyn SOMERS [Wed, 26 Jun 2013 15:52:40 +0000 (17:52 +0200)]
Bug 9113: fix handling of certain characters by item batch modification tool

If you're using the batch modification tool and entering a call number
like "E+ 123 ABC", the tool removes the + and puts a space in its place,
e.g., "E  123 ABC"

This is because the form is posted via Ajax by background-job-progressbar.js.
Values are URI-encoded using escape(), but this method does not escape some
characters: * @ - _ + . /

Also, "+" is considered as a space in a URI.

This patch replaces escape() by encodeURIComponent() which encodes every character.

Test plan :
Perform an items batch modification by setting '* @ - _ + . /' in a field
(notes for example) and see that all characters are saved correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0397e7ea64c208c140d7178ed34c3bd4b266fcfb)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 5894: Display all titles when confirming copy of items from cart to list
Marc Veron [Fri, 14 Jun 2013 14:37:23 +0000 (16:37 +0200)]
Bug 5894: Display all titles when confirming copy of items from cart to list

Adds missing code that splits biblios before calling template.

To test:
- Add some items to cart
- Open cart, select some or all items
- Add to list; with patch, following window shold show something
  like "Add 3 items to a list:", followed by list of items

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bed99a851646fd0c7a4c906dd9dfe60c485b40c6)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10346 - "Add multiple copies" should be labelled "Add multiple items"
Owen Leonard [Wed, 5 Jun 2013 18:03:51 +0000 (14:03 -0400)]
Bug 10346 - "Add multiple copies" should be labelled "Add multiple items"

The Koha interface standardizes on the term "item" instead of "copy," so
the "Add multiple copies" button would be more correctly labeled "Add
multiple items."

To test, view the add item screen for an existing or new record. You
should see a button labeled "Add multiple items."

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 79df5211d6faff8ab31b46c815ed50c70093a057)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10428: undefined check in add additem.pl
Fridolyn SOMERS [Fri, 7 Jun 2013 08:17:54 +0000 (10:17 +0200)]
Bug 10428: undefined check in add additem.pl

In additem.pl, in the code that generates item form you find:

@values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)->subfield($subtag)));

This patch adds the check of $itemrecord->field($tag) undef.
I did not found a way to test it because item tag is always defined
when editing an item, but it would be safer/prettier to add this check.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e31b158245f4eff36decebf30c8a87c8cfebe472)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10029 - CAS authentication fails in OPAC reserve
Fridolyn SOMERS [Thu, 11 Apr 2013 14:46:23 +0000 (16:46 +0200)]
Bug 10029 - CAS authentication fails in OPAC reserve

If OPAC reserve page is accessed without being logged-in, login form is displayed as well as a CAS authentication link (if enabled). A click on this link will lead to CAS server but one comming back to Koha, page shows an error : "ERROR: No biblionumber received".
This is because CAS link only contains the query path "/cgi-bin/koha/opac-reserve.pl", not the query parameters.

This patch adds query parameters to URI sent to CAS.

Test plan :
- Enable CAS
- Go to opac without been logged-in
- Try to place hold on a record
=> You get to /cgi-bin/koha/opac-reserve.pl?biblionumber=XXX showing authentication page
=> Check that CAS link contains query param "biblionumber"
- Click on CAS link and log in
=> Check you return well logged-in to reserve page with biblionumber param

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I have followed the test plan as far as I could and the links
contain the biblionumber now, which they didn't before.
I couldn't check the CAS login, but my normal login worked
as expected.
All tests and the QA script pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 974ab561ef00e76e7329f61b016b5d6b3103dde7)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10510 - OPAC's renew selected link has glitchy icon
Owen Leonard [Wed, 26 Jun 2013 16:54:15 +0000 (12:54 -0400)]
Bug 10510 - OPAC's renew selected link has glitchy icon

The "renew selected" link on the list of a user's checkouts looks bad
because the next icon in the sprite shows through. This patch modifies
the sprite to give it proper spacing and corrects the CSS to accommodate
the change.

To test, apply the patch, clear your browser cache, and view the
following pages to confirm that the change works:

- With TagsEnabled and TagsInputOnList enabled, view a search results
  page when logged in and when not logged in. Tag links should be
  styled correctly.

- With OpacBrowseResults enabled, open the detail page for any record
  and click the "browse shelf" link. The "forward" and "back" arrows
  should be styled correctly.

- With OpacRenewalAllowed enabled, log in to the OPAC and view your
  checked out items. The "renew selected" and "renew all" links should
  look correct.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Note: this will fix only the prog theme, but not the ccsr theme.
And it works perfectly.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1a1658f020e482abdd35fc8afc04cfcbce91e046)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10497 - star ratings not showing right in ccsr detail
Owen Leonard [Fri, 28 Jun 2013 18:21:03 +0000 (14:21 -0400)]
Bug 10497 - star ratings not showing right in ccsr detail

Star ratings do not appear correctly in the CCSR theme because it lacks
the image sprite used to display them. This patch adds the required
file.

To test, apply the patch and view a search results set which includes
titles which have an existing rating. Ratings should appear correctly.

View a detail page for an title which has a rating, and add a rating to
a title which has no rating. Ratings should look correct and work
correctly.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass - including leaving a rating on the newly visible stars

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
In order to test this, make sure you have set OpacStarRatings set
to 'results and details'.

The star images show up in OPAC results with the correct amount
of stars after applying the patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2fccb14a806e9aad18cc9f75df39e09bd64830dd)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 6553 - Parentheses in Corporate author break tracings
Liz Rea [Thu, 9 May 2013 21:32:17 +0000 (09:32 +1200)]
Bug 6553 - Parentheses in Corporate author break tracings

To test:

If an author's name includes parentheses or other escape-characters, the tracing links
produced in the OPAC fail in XSLT mode.  This patch wraps the author names
in double-quotes, providing the necessary escapement.

Test plan:
- Create a new framework, delete Thesaurus from 100 and other fields
- Create a new record in this framework (or change an existing record to this framework)
- Add 100$a - use parentheses
- Check the search links in OPAC detail pages

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
XSLT change adding quotes. Search now matches search in the intranet.
Passes all tests.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 41409f500edf495db114b2277f4916e5a737a0aa)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10484: serials-edit.pl not checking for barcode field before checking for barcode...
Kyle M Hall [Mon, 17 Jun 2013 16:28:13 +0000 (12:28 -0400)]
Bug 10484: serials-edit.pl not checking for barcode field before checking for barcode subfield

The script serials-edit.pl is not checking for the existence of the
barcode field before checking for barcode subfield for autoBarcode =
incremental. If the barcode field doesn't exist, the script dies with
errors.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script.
Checked that adding items on serial receive still works.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9af08e4e2d2091de489633b3f1c4fb03fcf323cd)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10494: remove spurious warnings from the KohaBranchName plugin
Galen Charlton [Wed, 19 Jun 2013 15:52:56 +0000 (08:52 -0700)]
Bug 10494: remove spurious warnings from the KohaBranchName plugin

The KohaBranchName plugin now returns an empty string if
given a NULL (undefined) library code or a library code that
is not present in the database (e.g., the '__ANY__' placeholder
that purchase suggestions can use).

To test:

[1] Create a purchase suggestion, setting the library
    to 'Any'.  Create a second one setting the library to
    a specific one.
[2] Go to the suggestions overview page in the staff interface.
    When you do so, the Apache logs should contain a warning
    that looks like this:

[Wed Jun 19 07:13:06 2013] [error] [client 192.168.1.10] [Wed Jun 19 07:13:06 2013] suggestion.pl: Use of uninitialized value in concatenation (.) or string at /home/koha/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt line 487., referer: http://koha-staff.metaquarry/cgi-bin/koha/acqui/acqui-home.pl

[3] Apply the patch.
[4] Refresh the suggestions overview page.  This time, there should be
    no new warning logged.
[5] Verify that the library names for the two pending suggestions
    created in step 1 are displayed correctly.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. Also adds new tests!

Note: For the test plan to work you have to add the suggestion
from the intranet, as Any is not an available option in OPAC.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ad2c1b3b8f20b3060c9a3a35c21a0757c685cbec)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10494: test cases for the KohaBranchName plugin
Galen Charlton [Wed, 19 Jun 2013 15:47:34 +0000 (08:47 -0700)]
Bug 10494: test cases for the KohaBranchName plugin

To test, in a test database that has the sample branches
loaded, run

prove -v t/db_dependent/Koha_template_plugin_KohaBranchName.t

Note that this includes regression tests for the issues
reported in bug 10494; these won't pass without applying
the patch that fixes them.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 96320a786bac92418b08b5af4d2b68746627482b)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 8884: (follow-up) rearrange placement of the top-bar div in CCSR
Galen Charlton [Fri, 14 Jun 2013 22:55:02 +0000 (15:55 -0700)]
Bug 8884: (follow-up) rearrange placement of the top-bar div in CCSR

This patch makes it easier to avoid having the top bar
overlap other OPAC page content (particularly custom
header content set via the opacheader system preference).

This is done by moving the top-nav div outside of the
main doc3 div and adjusting the CSS accordingly.  Yes,
this does end up having top-nav.inc be included from
opac-bottom.inc, but it would require touching rather
more templates to have it be included immediately after
the <body> tag.

This patch also removes a duplicate instance of the
cmspan span.

To test:

[1] Change to the CCSR OPAC theme.
[2] Before applying the patch, open a set of OPAC
    pages (e.g., main page, user page, search results, bib
    details) in your web browser.
[3] Apply the patch, and open the same OPAC pages in separate
    tabs.  Comparing the pre- and post- version of each page
    to verify that the placement
[4] Add an OpAC header using the opacheader system preference.
[5] Verify that the header is displayed without overlapping
    the top bar.

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 33c12cf39588aa022eacaa0bca403c373a6bf8d5)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 8884: opacheader is not in the header on CCSR
Jared Camins-Esakov [Mon, 20 May 2013 16:55:17 +0000 (12:55 -0400)]
Bug 8884: opacheader is not in the header on CCSR

In CCSR the opacheader preference isn't really in the header it's to the
right of the search box (see attached). I'm okay with a customizable
region over there, but we should have a new preference for that and
header should be above the search box as it implies.

To test:
1) Put something in the OpacHeader syspref. Preferably something large
   and header-like for maximum effect.
2) Select CCSR theme.
3) View OPAC. Notice placement of "header" content.
4) Apply patch.
5) View OPAC. Notice placement of "header" content.
6) Sign off.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised with one caveat; the content of
opacheader is by default underneath the div "top-bar". A couple breaks
in my OpacHeader test made it visible, so I'm going to assume this is a
styling issue and not a bug as such.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 905292b6328bbc847b1b932fc15dfef9e9845295)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10386: improvements to VirtualShelves.t
Marcel de Rooy [Mon, 3 Jun 2013 13:27:50 +0000 (15:27 +0200)]
Bug 10386: improvements to VirtualShelves.t

Most important: Does no longer delete all shelves!
Checks if there are ten borrowers for testing. But even works without them :)
When creating or modifying lists, takes name clashes into consideration.

Small change to _CheckShelfName in VirtualShelves module. Making it possible to
check a name for a list whose owner has been set to NULL. Note that a test
like field=? with undef for placeholder will not work in MySql.

Test plan:
How do you test a test? Well, you could run it on various databases..
But for real hacking, you could also add some debug lines.
I tested this by forcing 10 undefs in @borrowernumbers.
And by overwriting the return value of randomname with an existing name.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 93e87ca0b61611fc35238bf13eb226f477cf9c4e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10336: HoldsQueue.t needs to create its own data
Jonathan Druart [Fri, 24 May 2013 14:18:59 +0000 (16:18 +0200)]
Bug 10336: HoldsQueue.t needs to create its own data

After applying this patch and the patch submitted in bug 10495, you can
run prove t/db_dependent/HoldsQueue.t and admire that all tests pass.

This patch creates a borrower and uses Koha routines instead of directly
updating the database.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bfbc646fdd9ca4b90a0bc2751d0faa95d9e93ba1)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agobug 10495: set precondition for HoldsQueue test
Galen Charlton [Wed, 19 Jun 2013 17:30:58 +0000 (10:30 -0700)]
bug 10495: set precondition for HoldsQueue test

t/db_dependent/HoldsQueue.t assumed, but did not check,
that the AutomaticItemReturns system preference was off
at the beginning of the test un.  This patch makes sure
that that assumption is met.

To test:

[1] Make sure that at least one item is on loan (this is
    another assumption that the test case makes, one
    that should be corrected with the work proposed
    for bug 10336.
[2] Turn the AutomaticItemReturn system preference on.
[3] Run the test:

prove -v t/db_dependent/HoldsQueue.t

[4] Tests 4 and 6 should fail.
[5] Apply the patch.
[6] Run the test case again; this time, all tests should pass.

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 4e51ec5aae50c878bbdca6994361b12d7ba20d0a)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 7110: Renewal messages no longer displays in OPAC if OpacRenewalAllowed is disabled
Owen Leonard [Tue, 27 Nov 2012 16:16:14 +0000 (11:16 -0500)]
Bug 7110: Renewal messages no longer displays in OPAC if OpacRenewalAllowed is disabled

Prior to this patch, if a patron has fines which exceed the limit set by
OPACFineNoRenewals but OPAC renewals are disallowed by OpacRenewalAllowed,
a message was displayed in their OPAC summary like this:

"Please note: You currently owe XXX in fines. Please pay your fines if you wish
to renew your books."

Information about outstanding fines in this case has no bearing on
how the user sees his summary of checkouts; since the user cannot
renew the loans from the OPAC regardless of their fine balance if
OpacRenewalAllowed is not enabled, this patch removes the message.

To test, try various combinations of OpacRenewalAllowed and
OPACFineNoRenewals with a patron who has outstanding fines:

- OpacRenewalAllowed ON and OPACFineNoRenewals ON (set to be triggered
  by the test patron's fines): Logging in to the OPAC the patron should
  see a warning on opac-user.pl about not being able to renew items
  because of fines.

- OpacRenewalAllowed ON and OPACFineNoRenewals OFF (threshold high
  enough not to trigger a block): No warning appears.

- OpacRenewalAllowed OFF and OPACFineNoRenewals ON: No warning appears.

- OpacRenewalAllowed OFF and OPACFineNoRenewals OFF: No warning appears.

If OpacRenewalAllowed is diabled and a patron's fines exceed the limit
set by OPACFineNoRenewals they should see no message.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-ql.pl and perlcritic

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 29edd3797a7c950664ebc3be272ad4dca2575a80)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10590 - parameterise the limit option
Robin Sheat [Mon, 15 Jul 2013 14:06:40 +0000 (02:06 +1200)]
Bug 10590 - parameterise the limit option

The limit option was previously substituted directly into the query. The
previous patch on bug 10590 filters it on input, but there's no reason
not to have it made to work properly in the query for added safety.

To test:

[1] Go to the top checkouts report (http://OPAC/cgi-bin/koha/opac-topissues.pl)
[2] Run the report several times, varying the filters on
    number of results and item type.
[3] Verify the the list of top checkouts appears to be correct.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 89cf013a6fadcb1347151798f3fdab0d8c75cd15)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10590 - in opac-topissues limit param is not protected
Fridolyn SOMERS [Mon, 15 Jul 2013 11:00:18 +0000 (13:00 +0200)]
Bug 10590 - in opac-topissues limit param is not protected

In opac-topissues page, the limit URL argument is directly added to SQL query.

This patch adds protections : limit must only contain digits and must be lower than 100.

Test plan :
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=10&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=9999&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 100 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=WHERE&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 57866d6b67c3f8b29290150f21c71395315a73fe)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10534 : Update of italian SQL files [Only for 3.12] This update for italian SQL...
Silvia Simonetti [Wed, 3 Jul 2013 15:33:11 +0000 (17:33 +0200)]
Bug 10534 : Update of italian SQL files [Only for 3.12] This update for italian SQL files doesn't cover Marc21 and Unimarc setup.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I tested the web installer in Italian. No errors reported.
I also checked some of the created values and all looked fine.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Some strings remain untranslated. Will welcome any folowup

11 years agoBug 10524 - dependency updates
Robin Sheat [Mon, 1 Jul 2013 15:06:09 +0000 (03:06 +1200)]
Bug 10524 - dependency updates

Include liblibrary-callnumber-lc-perl

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10488: Followup replacing DELETEs by more restricted INSERTs
Marcel de Rooy [Mon, 1 Jul 2013 11:37:39 +0000 (13:37 +0200)]
Bug 10488: Followup replacing DELETEs by more restricted INSERTs

Instead of inserting followed by deleting, this patch combines the two where
clauses of both sql statements, meanwhile leaving the separation intact.

As suggested by Galen, removed all 162's from the non-default types.
The 162 calls for a new authority type. We can add that later on.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Ran this .sql script after deleting all auth records.
The former version had 9 types, 1148 tags and 11621 subfields.
This one has 9 types, 1140 tags and 11597 subfields.
That is expected: 8 tags 162 less and 8x3 subfields less.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 14babcecf681874e4a75eff0a5ba2d869f1966bf)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10488 - New MARC21 authority tags and subfields should be propagated to non-defau...
Bernardo Gonzalez Kriegel [Thu, 27 Jun 2013 01:27:14 +0000 (22:27 -0300)]
Bug 10488 - New MARC21 authority tags and subfields should be propagated to non-default frameworks

As proposed by the report creator, this patch
rewites authorities_normal_marc21.sql
using default authority framework to build all
current authtypes, then deleting irrelevant tags.

It also updates default authority framework
to last update (April 2013) adding new or
updated tags/subtags.

All new tags/subtags from Bug 9826 and this
one are included in all authtypes.

Deleted tags reflect current situation except
for 7XX tags thatl must be present for all authtypes.

Only for new installs

To test:
1) Apply patch
2) Delete all authtypes
exec in database
    delete from auth_types;
    delete from auth_tag_structure;
    delete from auth_subfield_structure;
3) Insert new auth framework
4) Verify absent tags. This can be done running

    select tagfield as from auth_tag_structure
    where authtypecode ='' and tagfield not in
    (select tagfield from auth_tag_structure
    where authtypecode = 'AUTH_TYPE')

for each authtype ( UNIF_TITLE, TOPIC_TERM, etc.)
The attached PDF could be used as a reference,
all that is white or green for each authtype must be
in the list (except for white 7XX tags)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 61103a1f82dc0efd98a4629b0c650fa020ba73c8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10317: improve display when order receiving page is given an invalid invoiceid
Jonathan Druart [Thu, 23 May 2013 14:42:38 +0000 (16:42 +0200)]
Bug 10317: improve display when order receiving page is given an invalid invoiceid

This patch fixes some things on the order receiving/parcel page.

1/ Removes dead code
2/ Displays an error message if invoiceid is unset or does not refer to an
invoice
3/ Fixes a bug in the note ("change note" and "add note" links)

Test plan:
1/ Try to call the invoice page with an existing invoiceid and check
that order results are consistent.
2/ Try without invoiceid or a bad invoiceid and check that an error
message is displayed.
3/ Add and change notes.

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely for all tests done.
- parcel.pl with invalid invoicenumber gives a nice error message
- parcel.pl with a valid invoicenumber looks normal
- changing and editing order notes works well

Passes QA script.

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

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10474: Translate some English strings in German sample notices
Katrin Fischer [Sun, 16 Jun 2013 07:09:33 +0000 (09:09 +0200)]
Bug 10474: Translate some English strings in German sample notices

This translates 2 strings missed doing the initial translation in
ISSUESLIP.

To test:
- Run the web installer in German.
Altnernatively:
- Truncate your letters table and run the SQL against the database.

Check that the notices were added correctly, especially ISSUESLIP.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit aecb163f69b238314bbd67215ce2d8950aeab060)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10431 - Redundant mappings removed
Tomas Cohen Arazi [Mon, 24 Jun 2013 17:40:36 +0000 (14:40 -0300)]
Bug 10431 - Redundant mappings removed

There were 5 redundant mappings left in the file. They are removed.
Its almost a QA followup as everything went fine anyway.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 82e1b227943393c33dbec903a7287c49b593424c)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10431 - Spanish Zebra character sorting file
Tomas Cohen Arazi [Tue, 11 Jun 2013 13:46:36 +0000 (10:46 -0300)]
Bug 10431 - Spanish Zebra character sorting file

This patch provides a definition file for Spanish (es) character
sorting in Zebra. It is based on the ideas from Hugo Agud <hagud@orex.es>
and Pablo Bianchi <pablo.bianchi@gmail.com>.

Makefile.PL is fixed to notice the existence of the 'es' language. The
docs for koha-create are touched too.

To test:
Tarball
=======
- Go through the install process, choosing 'es' for the Zebra's language step
- Koha should work as usual.
- Running this should show the lang definition is properly set.
$ grep -R "lang_defs/es" /etc/koha/*
(stuff like zebradb/zebra-biblios-dom.cfg:profilePath:...etc/koha/zebra/lang_defs/es... should show)
- This file should be present:
 /etc/koha/zebradb/lang_defs/es/sort-string-utf.chr

Packages
========
- Build your own package, it shouldn't break the packaging
- Try the new package, using koha-create to set an instance using --lang 'es'

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 343c93ea4358d7b78dec25dfbcca525eabbfa6bf)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10379 - Followup: add koha-rebuild-zebra -q to the man page
Magnus Enger [Tue, 25 Jun 2013 06:39:23 +0000 (08:39 +0200)]
Bug 10379 - Followup: add koha-rebuild-zebra -q to the man page

The first patch on this bug forgot to add the new -q option to
koha-rebuild-zebra to the man page for that command. This patch
fixes it.

To test, run something like these commands:

$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
  debian/docs/koha-rebuild-zebra.xml
$ man -l koha-rebuild-zebra.8
This should display the man page. (Remember to remove koha-rebuild-zebra.8
when you are done :-)

$ prove xt/verify-debian-docbook.t
All tests should pass.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 114ad0015b209404b30289397646cb2f21d4aa54)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10379: silence zebra rebuild cron when no instances are enabled
Robin Sheat [Thu, 30 May 2013 04:12:13 +0000 (16:12 +1200)]
Bug 10379: silence zebra rebuild cron when no instances are enabled

This adds a -q option to koha-rebuild-zebra that prevents it outputting
help if no instances are provided on the command line. This means that
if you've just installed the package, you won't get messages from cron
telling you how to use the script.

Test plan:
* install koha-common 3.12 or master onto a system with no enabled
  instances.
* note that you or the sysadmin will start getting emails every 5
  minutes.
* replace /etc/cron.d/koha-common and /usr/sbin/koha-rebuild-zebra with
  the versions from this patch.
* note that the emails stop flowing.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
"sudo koha-rebuild-zebra -q" gives no output, as expected.
Followed the test plan, all looks good.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c31e553a72d40bf0b1c099284ecbb4b95833e186)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9890: fix plugin handling by koha-create and koha-create-dirs
Tomas Cohen Arazi [Mon, 27 May 2013 15:17:15 +0000 (12:17 -0300)]
Bug 9890: fix plugin handling by koha-create and koha-create-dirs

1) koha-create: fill in __PLUGINS_DIR__
2) koha-create-dirs: create the directory, set permissions (writeable by the koha user)

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 061eb659267925388d1902987efaf275e536f953)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9826 - Missing fields in MARC21 authority framework
Bernardo Gonzalez Kriegel [Thu, 14 Mar 2013 21:37:05 +0000 (18:37 -0300)]
Bug 9826 - Missing fields in MARC21 authority framework

This patch updates MARC21 authority framework adding
missing tags/subtags up to Update No. 15 (September 2012)

Missing tags and corresponding subtags only added to
default authority framework.

For present authtypes only missing subtags are added.

Also updates a few legends to match those from LOC.

No deletions except for a few not relevant tags in
present authtypes without subfields.

Only to new installs.

To test:
1) Delete present authority frameworks
2) Load new frameworks. On default there are
many new tags/subtags. On present authtypes
only a few new/renamed subtags.

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 12874c4cf71c199cc2d383cf26bdcca89220b6bf)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9541: make OPAC login page respect OPAC_CSS_OVERRIDE
Kyle M Hall [Tue, 19 Feb 2013 16:41:59 +0000 (11:41 -0500)]
Bug 9541: make OPAC login page respect OPAC_CSS_OVERRIDE

When clicking the login link for opac-user.pl in a multiple branch
scenario the environment variable for OPAC_CSS_OVERRIDE was ignored from
the koha-conf.xml file.  It seems like is is working on every page in
the opac except for the login page.

Test Plan:
1) Set up a Koha server with 2 separate catalog configurations
   ( e.g. opac1.kohatest, opac2.kohatest )
2) Set the OPAC_CSS_OVERRIDE directive for separate css files
   in each opac
3) Browse to the opac login page, note the css is not applied
4) Apply this patch
5) Reload the page, note the css is now applied

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 71b79d59908cd85130afd8600eff0f93fc79b8a9)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9665: QA follow up fixing tabs
Chris Cormack [Thu, 13 Jun 2013 08:36:36 +0000 (20:36 +1200)]
Bug 9665: QA follow up fixing tabs

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

11 years agoBug 9665: add RIS and BIBTEXT bibliographic record export to staff interface
Owen Leonard [Fri, 31 May 2013 15:03:56 +0000 (11:03 -0400)]
Bug 9665: add RIS and BIBTEXT bibliographic record export to staff interface

The OPAC offers RIS and BIBTEX as choices for bibliographic downloads,
but the staff client was missing these options. This patch adds them.

To test, view a record in the staff client (detail.pl, MARCdetail.pl,
etc.) and click the "Save..." toolbar button. BIBTEX and RIS should be
available and functional.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4b9a6d803f7ad11a4e077140820bfeda0d4d196a)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Nice fix, works as expected.

11 years agoBug 10396: remove unnecessary date-picker widgets from Catalog statistics form
Sophie Meynieux [Mon, 10 Jun 2013 13:32:57 +0000 (15:32 +0200)]
Bug 10396: remove unnecessary date-picker widgets from Catalog statistics form

In particular, removed it from the call number and publication year
input fields.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d7bfba8a106fbb00331e16dbc0943226bad24668)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as expected, simple patch

11 years agoBug 10439: fix bug preventing the library for a notice from being changed
Jonathan Druart [Mon, 10 Jun 2013 12:05:32 +0000 (14:05 +0200)]
Bug 10439: fix bug preventing the library for a notice from being changed

2 javascript functions should be apply only in a specific case, not for all
views.

Test plan:

- Switch on the IndependentBranches pref and log
  in as a superlibrarian.
- Try to change the library for a notice. Before the patch,
  no change is applied.
- Try to create a new notice, changing the library from
  default in the process.  Before the patch, the notice
  is not created.

The bug can also be reproduced when IndependentBranches is
off, in which case the staff user need not be a superlibrarian.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 77a5e3e365a50b02c9f224d731e05de90fc667c9)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Test plan works as advertised.

11 years agoBug 10464: Patron search on placing a hold now supports autocomplete
Tomas Cohen Arazi [Thu, 13 Jun 2013 17:20:43 +0000 (14:20 -0300)]
Bug 10464: Patron search on placing a hold now supports autocomplete

The patron search box for placing a hold request on a bib in the
staff interface now supports autocomplete if the CircAutocompl
system preference is enabled.

This patch grabs the autocomplete handling javascript stuff from patron-search-box.inc
and puts an adjusted version on reserve/request.tt.  It sets form and input
IDs to match those configured in the autocomplete call, adjusted where needed to
avoid name collisions with the patron-search-box.inc that is present everywhere.

This patch also doubles the width of the patron search input field.

To test:
- On a biblio record, go to the Holds tab, mine looks like
  /cgi-bin/koha/reserve/request.pl?biblionumber=2
- A search box is shown for patron searching.
- Search for a patron: it works as usual.
- Make sure CircAutocompl is "Don't try"
- Apply the patch
- Click the Holds tab again, and do the same search: functionality should remain intact.
- Change CircAutocompl to "Try"
- Click the Holds tab again
- Autocomplete should show you the possible options, and once you choose one result,
  it should work as usual.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Adding a nice new autocomplete feature.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit dc94a9bef79dc6d186fe93d82dac10cab0468d24)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 766: remove CGI::scrolling_list from request.pl
Colin Campbell [Thu, 30 May 2013 17:23:55 +0000 (18:23 +0100)]
Bug 766: remove CGI::scrolling_list from request.pl

Let the template take care of generating the display.
Lets at least part of request.pl be more succinct.

To test, place a hold and search for the patron using a partial name.
You should get a dropdown select list of patrons and be able to select
the patron to hold for from there.

The functionality should remain unimpaired after this patch is applied.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7668e19c9593da570cffb5cd4640fe175d739328)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10141: improve editing of MARC21 bib 008/18-21 and 008/24-27
Bernardo Gonzalez Kriegel [Thu, 2 May 2013 11:13:05 +0000 (08:13 -0300)]
Bug 10141: improve editing of MARC21 bib 008/18-21 and 008/24-27

This patch changes the MARC21 008 editing form to create dropdowns
for each of the 008/18-21 (Illustrations) and 008/24-27 (Nature of contents)
positions.

To test:
1) Edit or add a new bibliographic record
2) Click on field 008 value builder, positions 18-21 and 24-27 only
show an input text box
3) Apply the patch
4) Reload value_builder page, now each position (18-21,24-27) has
its own dropdown.  Note that it may be necessary to clear
the browser cache for the change to be visible.

Similar changes could be made for the 006 value builder.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6792ddd0e3606704eaa72bda2a39d5686129c70a)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works great, nice improvement

11 years agoBug 10466: fix glitch in OPAC display of titles saved to list
David Cook [Fri, 14 Jun 2013 03:03:19 +0000 (13:03 +1000)]
Bug 10466: fix glitch in OPAC display of titles saved to list

When displaying (in the OPAC) the set of records saved to a list,
an apparently random number (typically 33 or 34) is sometimes
displayed at the end of the publication description.  In particular,
this can occur when XSLT is *not* being used to display search results;
this patch corrects the problem.

Now for the technical details:

This patch checks to see if "size" is undefined. If it is, we add a
blank (i.e. "") value to it in place of undef.

If we do not do this, calling "itemloo.size" will return the size
of the "itemloo" hash, rather than the value for the "size" key.

This is because "size" is a virtual method in Template Toolkit. It's
uncertain why the value is retrieved for the "size" key when there is
a defined value and why TT doesn't use the method instead, and that
it uses "size" as a method only if there is either no "size" key or
if the value tied to the "size" key is null/undef. This might be a
feature or it might be a bug in TT...

In the meantime, we will check to see if it's undefined. If it is,
we'll give it a value.

This bug has been identified in the opac-search.pl, search.pl and
addbooks.pl pages before. To address it, we're currently checking
if there is a "size" key, and if not...we're adding one with a blank
value.

This patch takes up that same idea, although I think it might be better
to rename the variable before passing it to TT in case the behaviour
of TT changes in the future in regards to how it handles virtual
methods.

N.B. Obviously, this only affects users not using XSLTs.

--

Test Plan:

Before applying the patch:

0) Make sure you have opac search result XSLT turned off

1) Find bib records that do not have a 300$c (Dimensions) value.
2) Find bib records that do have a 300$c (Dimensions) value.

(N.B. These values should be stored in the `size` column of biblioitems).

3) Add items from both sets of records to a List
4) Note that records without a 300$c will display a number at the end
of the "Publication" description/string. It should be something like
33 or 34 in most cases.
5) Note that records with a 300$c don't display this number. They just
show the value from 300$c.

Apply the patch.

6) Clear your cache, refresh the page, etc.
7) Note that the number (e.g. 33 or 34) has disappeared from the end
of the "Publication" description/string.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Added a small comment at the end of this one line.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ceada35e008e6a60b62f384ec386e80b03fe0130)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10245: add CSS classes to OPAC detail items table header
Chris Hall [Wed, 15 May 2013 07:30:57 +0000 (19:30 +1200)]
Bug 10245: add CSS classes to OPAC detail items table header

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Classes now appear on <th> as well for easy styling.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, template changes only. Adds classes and id's to table
headers, makes no other changes.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit da6f70c697bd445c7f37bf3cd698021c0bf14e90)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Some table headers are missing classes and ids still...

11 years agoBug 10425: tweaks to text of help for local use system preference
Galen Charlton [Fri, 14 Jun 2013 15:30:35 +0000 (08:30 -0700)]
Bug 10425: tweaks to text of help for local use system preference

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c02b57bd5cacc3fbe981f5d8331c7cfe8aa178a7)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10425 - Help page missing for Local Use preferences
Fridolyn SOMERS [Thu, 6 Jun 2013 08:57:29 +0000 (10:57 +0200)]
Bug 10425 - Help page missing for Local Use preferences

When viewing Local Use system preferences tab, the help button will lead to an error page.
This is because Local Use tab uses not the same script has other tabs : systempreferences.pl.

This patch adds help/systemprefences.tt

Test plan :
- Go to Local Use preferences : /cgi-bin/koha/admin/systempreferences.pl
- Click on Help link (at right top)
- See you get the same page as other preferences tab help

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0e0a1a61a62473de7ae92bde9d0f3617c34ba325)

11 years agoBug 10315 - Use easier readable font for generated passwords
Owen Leonard [Thu, 23 May 2013 16:44:58 +0000 (12:44 -0400)]
Bug 10315 - Use easier readable font for generated passwords

The text inputs on the change password form are not very big, and the
default sans-serif font isn't always good for showing unambiguous
characters. This patch sets a larger, monospace font for those fields.

To test, apply the patch, clear your browser cache, and open the patron
change password form (members/member-password.pl). The inputs should be
more readable, especially the password fields when you click to fill
with a randomly generated password.

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 1a15b26e65fb57c622ed11cb0c7459516e6e023c)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10444: Fix prevent the default action on click
Jonathan Druart [Thu, 13 Jun 2013 09:11:07 +0000 (11:11 +0200)]
Bug 10444: Fix prevent the default action on click

In particular, clicking the [+] and [-] links on the
OPAC advanced search page will no longer scroll
the page back to the top.

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 6e6ed4306521f4e8966c4b40f23ce2d539476d1a)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10444 - (CCSR followup) In advanced search(more), [+] and [-] should behave like...
Tomas Cohen Arazi [Tue, 11 Jun 2013 14:49:06 +0000 (11:49 -0300)]
Bug 10444 - (CCSR followup) In advanced search(more), [+] and [-] should behave like links on hover

Same fix for CCSR.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
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 0fc32a427427dbb27c5c33728b62d5135dc209df)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10444 - In advanced search(more), [+] and [-] should behave like links on hover
Tomas Cohen Arazi [Tue, 11 Jun 2013 12:54:13 +0000 (09:54 -0300)]
Bug 10444 - In advanced search(more), [+] and [-] should behave like links on hover

This patch add href="#" to the [+] and [-] links for adding and removing
search terms. It also defines its style so it doesn't show underlined.

To test:
- Browse your OPAC to "Advanced Search" and then "More options".
- The [+] and [-] don't change the cursor on hover
- Apply the patch, reload and see the cursor changes
- Functionality should remain unchanged

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
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 5b53b59fe47e01d3427fda89d444246a7968688e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10458: Remove obsolete Z3950 module and test
Marcel de Rooy [Thu, 13 Jun 2013 08:20:27 +0000 (10:20 +0200)]
Bug 10458: Remove obsolete Z3950 module and test

Are not used. Contain several FIXMEs.
Removing them makes life easier.

Test plan:
Actually, you cannot test this.
But for confidence: do a Z3950 search in cataloguing and acquisition.

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 63ba05183e627bbe7278b9064d22e93d39b65461)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10458: t/Z3950.t should be removed too
Jonathan Druart [Fri, 14 Jun 2013 12:48:46 +0000 (14:48 +0200)]
Bug 10458: t/Z3950.t should be removed too

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit cab50698f57c88670241d88028afebd3eb5b5dd8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10443: DBRev 3.12.01.001 - make sure borrower_files exists
Tomas Cohen Arazi [Fri, 28 Jun 2013 14:48:04 +0000 (11:48 -0300)]
Bug 10443: DBRev 3.12.01.001 - make sure borrower_files exists

This schema update ensures that the borrower_files table
will exist for libraries who first installed Koha at 3.10.x.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10443: (follow-up) make sure borrower_files has FK constraint
Galen Charlton [Fri, 14 Jun 2013 14:48:24 +0000 (07:48 -0700)]
Bug 10443: (follow-up) make sure borrower_files has FK constraint

This follows the example of the DBrev that introduced
this table.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 43b17feed6ce64bdff6b31918e40170f6681e397)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10443 - Table borrower_files does not exists in kohastructure.sql file
Juan Romay Sieira [Tue, 11 Jun 2013 09:36:48 +0000 (11:36 +0200)]
Bug 10443 - Table borrower_files does not exists in kohastructure.sql file

As a consequence, the borrower_files table would not exist
in Koha databases that were installed starting at 3.10.0
or later.

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 2e86612a15c228357223beaf996f4b3350334b2e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10297 - categorycode and branchcode should be required when adding patrons
Owen Leonard [Mon, 10 Jun 2013 15:14:41 +0000 (11:14 -0400)]
Bug 10297 - categorycode and branchcode should be required when adding patrons

categorycode and branchcode should show as required under all
circumstances, not just when they are included in the
BorrowerMandatoryField system preference. This patch adds the correct
classes and hints to those fields.

To test, view the patron entry form for a new or existing patron.
Category and Library should show that they are required.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 81bfae93649a2f1a93f4722d052fc529c6495d71)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Logical addition

11 years agobug 9370: improve splitting of LC call numbers for labels
Galen Charlton [Wed, 9 Jan 2013 01:32:47 +0000 (17:32 -0800)]
bug 9370: improve splitting of LC call numbers for labels

Use the Perl module Library::CallNumber::LC to parse and split
LC call numbers when generating spine labels.

For example, QH541.15.C6 C25 2012 should be split as follows:

QH
541.15
.C6
C25
2012

To test, create an item with call number QH541.15.C6 C25 2012
and classification source LC, then create a spine label for that
item using a layout of type 'biblio' that has the split call numbers
option enabled.  The call number should be split as indicated above.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit edb8bddff074769a95744b6a7fa59eff61e0cfc1)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agobug 9370: add invalid call number to LC splitting test cases
Galen Charlton [Wed, 9 Jan 2013 01:28:40 +0000 (17:28 -0800)]
bug 9370: add invalid call number to LC splitting test cases

'123 ABC FOO BAR' is intentionally *not* a valid LC call number,
but in order to preserve legacy behavior, it should be split on
whitespace.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a5e9e15663289489e0baafff73d7bed20434b8ec)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agobug 9370: test case for splitting LC call number
Galen Charlton [Wed, 9 Jan 2013 01:18:30 +0000 (17:18 -0800)]
bug 9370: test case for splitting LC call number

QH541.15.C6 C25 2012 should be split as follows:

QH
541.15
.C6
C25
2012

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ecf6721060607b621c58f234ab5a5f43e30b1d98)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agobug 6281: add Library::CallNumber::LC as a required Perl dependency
Galen Charlton [Fri, 17 Aug 2012 15:49:45 +0000 (11:49 -0400)]
bug 6281: add Library::CallNumber::LC as a required Perl dependency

This module is currently packaged by Debian for Wheezy and by
Ubuntu for Precise and Quantal.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f1c45784dc5dfa431ef68e5d38a14b6fb93c904d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agobug 6281: introduce LC::CallNumber::LC for sorting LC call numbers
Galen Charlton [Fri, 17 Aug 2012 15:23:47 +0000 (11:23 -0400)]
bug 6281: introduce LC::CallNumber::LC for sorting LC call numbers

This replaces the previous hand-coded normalizer.  Because
LC::CallNumber::LC appears to reject strings that aren't valid
LC call numbers, significant changes to the test cases were
made as well -- however, the one that really counts is the
last one which verifies the sorting.

To recalculate the call number sort key for each item, it is necessary
to run misc/maintenance/touch_all_items.pl

To test, create item records with the following call numbers, setting
the classification sort to 'lcc':

QC100 .U57 NO. 555 1986
QC145 .A57 V.12 1980
QC145.45 .H4 D65 1998
QC995 .E29 1997

Next, make a report of them in the inventory tool.  The items should be sorted
in the above order.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bc87274c66a50712dccb15656001d97f2a36fba5)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agobug 6281: add test case for sorting LC call numbers correctly
Galen Charlton [Fri, 17 Aug 2012 15:17:03 +0000 (11:17 -0400)]
bug 6281: add test case for sorting LC call numbers correctly

My thanks to Michael Flanagan of UCAR for providing some of
these examples.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 87ab820a20e1ef935d4d29c6fed313e9723fcb64)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoUpdate release notes for 3.12.1 release v3.12.01
Tomas Cohen Arazi [Sat, 22 Jun 2013 18:35:14 +0000 (15:35 -0300)]
Update release notes for 3.12.1 release

11 years agoIncrement version for 3.12.1 release
Tomas Cohen Arazi [Sat, 22 Jun 2013 16:27:02 +0000 (13:27 -0300)]
Increment version for 3.12.1 release

11 years agoTranslation updates for 3.12.1
Bernardo Gonzalez Kriegel [Sat, 22 Jun 2013 14:17:15 +0000 (11:17 -0300)]
Translation updates for 3.12.1

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10406: Remove div and more obsolete CSS related to YUI autocomplete
Tomas Cohen Arazi [Tue, 11 Jun 2013 18:25:38 +0000 (15:25 -0300)]
Bug 10406: Remove div and more obsolete CSS related to YUI autocomplete

To test:

- Apply, then test the patron search form

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6d9d5581ab7bb458dcca3dcb19c7f5929fa7ea50)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10311 - Holds queue ignores item-level holds where only one items exists
Kyle M Hall [Wed, 22 May 2013 13:52:40 +0000 (09:52 -0400)]
Bug 10311 - Holds queue ignores item-level holds where only one items exists

If a record has only one item, and that item has one item-level hold on
it, that hold will not show in the holds queue.

Test Plan:
1) Create 1 record with 1 item at BranchA
2) Create an item-level hold for that item, for pickup at BranchA by a
   patron of BranchA
3) Run build_holds_queue.pl
4) View the holds queue for BranchA
5) Note the hold is not in there
6) Apply this patch
7) Re-run build_holds_queue.pl
8) View the holds queue again
9) Not that the hold is now there

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>
(cherry picked from commit acd4b21c91f4b06a6e19cafb4b9a6dd2817ad8e9)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10406 - Remove obsolete CSS related to YUI autocomplete
Owen Leonard [Tue, 9 Apr 2013 17:46:14 +0000 (13:46 -0400)]
Bug 10406 - Remove obsolete CSS related to YUI autocomplete

staff-global.css contains CSS which related to the old YUI autocomplete
widget. Since this has been replaced with jQueryUI the CSS is now unused
and can be removed.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit e0dc603d8ff3a7fcaade0cf29aa9be11066b06f3)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10250: Fix typos in guided reports help file
Nicole C. Engard [Sun, 19 May 2013 17:56:50 +0000 (13:56 -0400)]
Bug 10250: Fix typos in guided reports help file

This is a string patch that fixes typos in the guided reports
help file.

To test:

* Go to the guided reports page
* Click help
* Confirm text is right

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 96363fa1c3db4398890ece41e7cc19003c0c5133)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Trivial string patch.

11 years agoBug 10296: UT: t/data/db_schemas not needed
Jonathan Druart [Tue, 21 May 2013 12:54:36 +0000 (14:54 +0200)]
Bug 10296: UT: t/data/db_schemas not needed

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
These were added with the intention of writing some
schema verification test cases, but if that idea
gets picked up again in the future, fresher copies
of kohastructure.sql can be obtained from Git.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d2ee2b5cf34aa73bba23d2d54c32588f8acaa4e5)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 10221 - hold expiration doesn't show on patron's list of holds
Owen Leonard [Mon, 13 May 2013 18:26:17 +0000 (14:26 -0400)]
Bug 10221 - hold expiration doesn't show on patron's list of holds

When viewing the list of a patron's holds on the circulation page or the
patron detail page the table of holds doesn't display the holds
expiration date, if present. This patch adds display of the hold
expiration date.

To test, place a hold for a patron and set an expiration date for it.
View the patron's existing holds on both circulation.pl and
moremember.pl. The expiration date you chose should appear in the table
of information about existing holds.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
works great

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 225a7007052e9027f6fa1c141c6a3494224c1af8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as expected, I consider this an usability bugfix.

11 years agoBug 10354 - Don't show optgroup Libraries when no search groups are defined
Owen Leonard [Fri, 31 May 2013 13:54:34 +0000 (09:54 -0400)]
Bug 10354 - Don't show optgroup Libraries when no search groups are defined

In the OPAC, if there are no search groups defined, there's no reason to
embed library choices inside an <optgroup>. <optgroup> should only be
used to differentiate the list of individual libraries from search
groups. This patch removes the <optgroup> when no search groups are
enabled.

To test, apply the patch and:

- Enable OpacAddMastheadLibraryPulldown.
- Create a library search group in Administration ->
  Libraries and Groups and enable it by checking the "show in search
  pulldown" box.
- View the library pulldown in the OPAC search bar. Libraries and groups
  should be separated into <optgroup>s.
- Disable your library search group and refresh the OPAC page. The
  pulldown of libraries should now display libraries with no <optgroup>.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 545ed7a0b6f7cffc7a5cc904963b7bdcf75038fc)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
11 years agoBug 9300 - filtering Export (MARC) data by accession date does not work
Jesse Weaver [Mon, 3 Jun 2013 19:22:57 +0000 (13:22 -0600)]
Bug 9300 - filtering Export (MARC) data by accession date does not work

Small typo in query construction, fixed.

To test:
1) Try filtering a MARC export using "Start date"
2) Notice the lack of filtering
3) Apply patch
4) Try export again, records are filtered by dateaccessioned

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 5cf5da12ef8667513d2f6fb494c6997cbe82899b)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
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>