]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoBug 10514: improve visibility of Add item link on new order form
Owen Leonard [Thu, 11 Jul 2013 14:28:55 +0000 (10:28 -0400)]
Bug 10514: improve visibility of Add item link on new order form

This patch converts the "Add" and "Clear" links
to the standard "submit/cancel" format inside a fieldset. This gives
them a little more visual weight.

Based on the changes made by Liz Rea and Jonathan Druart.

To test:

- create a basket
- add a record to it
- scroll down - the link to add item and cancel should both be more
  prominent now.
- Click "Add item" - it should add an item.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
I still feel weird about the button, but as two people have said they'd rather have the button, I'm alright with it I guess.
Really what I want is people to notice it's there and click it at the appropriate time. I hope this will help that issue.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Leaves the translation problems, but that needs more work and is
out of the scope of this bug.
Tested Add and Update functionality works correctly.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 275f405c8b3920634907e5e1f2ef8ccecf497868)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 606a25bc41047291e4b11390b97caf5d9f01ae65)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 606a25bc41047291e4b11390b97caf5d9f01ae65)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit f3611a8030983e70a154e7b60ba418bae65f0af1)

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>
(cherry picked from commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 5b93649f79e6011e316055bb48c367f829c3966f)

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

Conflicts:

installer/data/mysql/updatedatabase.pl

Solved

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 47df7c9641321b70cd132790d4cfeab500bc34be)

Conflicts:
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 2727ca9512ad9e06fbba9a3c299dbdd78289da7c)

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>
(cherry picked from commit a8ed0e52c65f3fed53108fc1cbe9b860e63f98b5)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a8ed0e52c65f3fed53108fc1cbe9b860e63f98b5)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 4cae5281851983d59fb6a463aebc868398e6f2ba)

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.
(cherry picked from commit 8f0ce3c1a0e43e6fb8b7bae56e4d658bfc315631)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 8f0ce3c1a0e43e6fb8b7bae56e4d658bfc315631)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e510a73acf53f76f73168466ee80f5f98d2c8e82)

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>
(cherry picked from commit f56768adba9fb1d39861e04796fac2be8cfdf914)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit f56768adba9fb1d39861e04796fac2be8cfdf914)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 58f7b60bf3d718a9d76e87632086adbc734a1117)

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

Conflicts:

installer/data/mysql/updatedatabase.pl

Solved merge conflict

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 645e80d58783aed46f368e36156ea69e2a34779e)

Conflicts:
installer/data/mysql/updatedatabase.pl

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 1140e9c46af8522373ec51fc6282bfc7c4936540)

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>
(cherry picked from commit 85130dafc515363eba8f44973291a7af893a8b52)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 85130dafc515363eba8f44973291a7af893a8b52)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e29a98f8166df4cad0cb6ea12bd06a39e52a4d47)

11 years agoBug 10088: FIX adding an order from a staged file.
Jonathan Druart [Thu, 25 Apr 2013 07:47:53 +0000 (09:47 +0200)]
Bug 10088: FIX adding an order from a staged file.

Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay
routine. The existence of $defaulvalue hashref should be tested before
getting to the branchcode key.

Test plan:
Before applying the patch, an error occurred when you try to create an
order from a staged file.
After applying the patch, the error does not appear anymore.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f2e44716f60578b9663862d7b2ba3b16f7067143)

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

Conflicts:
C4/Items.pm
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 424a73e889edf5d8e90150ed504fa802953d8194)

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>
(cherry picked from commit 3865b14a57c4e0d4547980acf67060eac181161f)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 3865b14a57c4e0d4547980acf67060eac181161f)

Conflicts:
tools/batchMod.pl
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 2db1c2b208c53a59bd896af426455122b7b738e5)

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>
(cherry picked from commit dbd52acf2958bca6b126a35a47d03b6d4d4d541d)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit dbd52acf2958bca6b126a35a47d03b6d4d4d541d)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 70cc750a5f96ca72c07f359006730ff92f9ff5b5)

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>
(cherry picked from commit 7c92496cf7f7ee1016b934a8e01e995b680f9761)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 7c92496cf7f7ee1016b934a8e01e995b680f9761)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e94b493fc7f6217a92d91f78ce6849d73fd8c6e8)

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>
(cherry picked from commit 54d414ee2d16a2969c91e5a83cb8c66858fed03c)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 54d414ee2d16a2969c91e5a83cb8c66858fed03c)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 3390a6efc74714f6ebd577d06f344acbff001357)

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>
(cherry picked from commit 2dff5177f2d7c542175b28adf1832e201c0ae864)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2dff5177f2d7c542175b28adf1832e201c0ae864)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit bd199ff98c8c34bd6587f12bc3a844827ed07aa9)

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>
(cherry picked from commit 2898cf57e5c3b9c6fd8f4fe8f0d5c180ab28fc06)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2898cf57e5c3b9c6fd8f4fe8f0d5c180ab28fc06)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 452d6eed5880eb40bbee79c9f0938fbbd1fb3d26)

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>
(cherry picked from commit 1d9ac2b10a96800d301524978f00ee393b5bb75e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1d9ac2b10a96800d301524978f00ee393b5bb75e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit d9c39688bcc5f4064763d8e2a6958c94066dbdd8)

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>
(cherry picked from commit a97b62379f82a94157916959109c7c1a75582d8a)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a97b62379f82a94157916959109c7c1a75582d8a)

Fixed minor conflicts:
C4/VirtualShelves.pm
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 5e9db705a5466ff508d45a9bbfcabd9744efa53f)

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>
(cherry picked from commit e26655fe03c2f5181d6a820f40e38a7cebb46e05)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Missed this one from previous release
(cherry picked from commit e26655fe03c2f5181d6a820f40e38a7cebb46e05)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 2b2457329467e5a30a748903eb60390f1cafd51d)

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.
(cherry picked from commit e918450e6ad6e661474479f8890f6b141fe4e15a)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Missed this one from previous release
(cherry picked from commit e918450e6ad6e661474479f8890f6b141fe4e15a)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit a16542961f60f5a77d0af86d605a890a5b23782d)

11 years agobump up version numbers for 3.8.16 release v3.08.16
Galen Charlton [Mon, 29 Jul 2013 17:23:38 +0000 (17:23 +0000)]
bump up version numbers for 3.8.16 release

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agorelease notes for 3.8.16
Galen Charlton [Mon, 29 Jul 2013 17:23:17 +0000 (17:23 +0000)]
release notes for 3.8.16

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

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

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

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

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

To test (in conjunction with the previous patch):

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

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

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

To test:

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

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

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agokoha 3.8.15 release v3.08.15
Chris Hall [Tue, 23 Jul 2013 08:14:28 +0000 (20:14 +1200)]
koha 3.8.15 release

11 years agoRelease notes for 3.8.15
Chris Hall [Tue, 23 Jul 2013 07:54:06 +0000 (19:54 +1200)]
Release notes for 3.8.15

11 years agoTranslation updates for 3.8.15
Bernardo Gonzalez Kriegel [Mon, 22 Jul 2013 22:17:43 +0000 (19:17 -0300)]
Translation updates for 3.8.15

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>
(cherry picked from commit 6643a41c97b3a9b4129f0dd7d1fa854f2f93fb14)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 6643a41c97b3a9b4129f0dd7d1fa854f2f93fb14)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e5bfa466362579fb24009c22ee756f3b9b731140)

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>
(cherry picked from commit cc9b3522b192b8510a4846cd7a4b3aca3e8a0a07)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit cc9b3522b192b8510a4846cd7a4b3aca3e8a0a07)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry oicked from commit 22341e5fe36e54523464b633de6a500bc706e248)

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

Solved Conflicts in C4/Auth.pm

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit b9687ad6a6f638bc25fb2cad12fa5da73c10e714)

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

Solved Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a2e89edf43b2946da0986a5c83b04a60dea04061)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit d2a284da136cdf72cb201d0efd049507f66393e7)

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>
(cherry picked from commit ab3163564e91921222c153897f786551fe59647e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit ab3163564e91921222c153897f786551fe59647e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit dd574b1b705b545eba115371d37ac4545ad0bdf3)

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>
(cherry picked from commit b88f16a4e99d533753e3d707239e94da019ce303)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit b88f16a4e99d533753e3d707239e94da019ce303)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit ccbc3226646c3c3b68b2ecffc84689a0f66a7ace)

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>
(cherry picked from commit a7d116e2fe39a17dd076e1dc805239622b410418)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a7d116e2fe39a17dd076e1dc805239622b410418)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 0cb17b47f67f1d91221841e70f8430bdca5642a8)

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>
(cherry picked from commit 2e77edf8dfa0350a6e20805e7fa39b97608c804e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2e77edf8dfa0350a6e20805e7fa39b97608c804e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit f5ee81028dda33027daf3c921b38bf06218f9dfa)

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>
(cherry picked from commit 5867909f8866b4e68340b88817bfb95f51bc3c9e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 5867909f8866b4e68340b88817bfb95f51bc3c9e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit c0cb1f8b0e8aa53707447ee7c27fd15fc0a7b80c)

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>
(cherry picked from commit 1133c328b31cf9e8138de85ef266a6557757bab4)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1133c328b31cf9e8138de85ef266a6557757bab4)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 4339d827792c7063066e873b2280b39d70e8f590)

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)
(cherry picked from commit ff9638d8151258eec1ee1bb67196845eb1dabd18)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit ff9638d8151258eec1ee1bb67196845eb1dabd18)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit ccc0691f7f1fd4dfc8e98c30ffc5117508aaed43)

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>
(cherry picked from commit d5f9a3ec5c6f86c9678e6df39bbd2ac69fc77c95)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d5f9a3ec5c6f86c9678e6df39bbd2ac69fc77c95)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit bc51544b4642496271f211121f8f8cebf6d16155)

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>
(cherry picked from commit 1dbd1d938aabb72021cd8157e111d3f7555fff9d)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1dbd1d938aabb72021cd8157e111d3f7555fff9d)

Conflicts:
C4/Z3950.pm

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit b98c4419150ceeee367f8ef1a07953494c8d7455)

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

Solved Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 545504e6041809b2ec5d435f9a8660428ec60e52)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 343423b2b6806f824838a4cdb343cecbf1960f4e)

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>
(cherry picked from commit 10f5822daabf34ede50b2b35b5e02324482af9ac)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 10f5822daabf34ede50b2b35b5e02324482af9ac)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 56ea58ecda26f6ca4e4e8e437296b2aa2a2419d0)

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>
(cherry picked from commit d743b2084cddb5197393bfa5ffeaf6f1e0334784)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d743b2084cddb5197393bfa5ffeaf6f1e0334784)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 0e82fef70b2e4fd9124f9c7538a01030e10a455b)

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>
(cherry picked from commit 8ceab821b5ded6fb14ac747dfc1e2c67a3cbbad8)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 8ceab821b5ded6fb14ac747dfc1e2c67a3cbbad8)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 8ff1fc43c0aa67a07e90f28eace963083829d0a7)

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

Solved minor Conflicts:
C4/Installer/PerlDependencies.pm

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit e4faf296c98f70f44ee67d2354a7cf5c682b27c8)

Solved minor conflict:
C4/Installer/PerlDependencies.pm

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit c5f4ef1c49a8410fcf9aa44d46475ed5227f86ad)

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>
(cherry picked from commit d7862378f006603fb742bd5fe896ea8a0222a5bd)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d7862378f006603fb742bd5fe896ea8a0222a5bd)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit a86d8142251d10eb5c0017c70d7981a6387ca674)

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>
(cherry picked from commit cee5651e11e48c240136e764b628545a1ba6d05e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from cee5651e11e48c240136e764b628545a1ba6d05e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from 0f6bff1348d0273deafe4c503f5b8162bc16b970)

11 years agoLanguage updates for 3.8.14
Bernardo Gonzalez Kriegel [Sat, 6 Jul 2013 01:43:35 +0000 (22:43 -0300)]
Language updates for 3.8.14

11 years agoUpdate release notes for 3.8.14 release v3.08.14
Chris Hall [Sun, 23 Jun 2013 00:53:35 +0000 (12:53 +1200)]
Update release notes for 3.8.14 release

11 years agoDatabase update for 3.8.14 release
Chris Hall [Sun, 23 Jun 2013 00:16:48 +0000 (12:16 +1200)]
Database update for 3.8.14 release

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>
(cherry picked from commit 20bd5b63c4a098fd0d7e98343894d6b2c0b6914d)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 20bd5b63c4a098fd0d7e98343894d6b2c0b6914d)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 297486562293928a78851e37701a3b7ae01947a3)

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>
(cherry picked from commit e9f1137391bedd8214c8dca4e407331c381201a2)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit e9f1137391bedd8214c8dca4e407331c381201a2)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e923ccb07a06af2210359410ed5e6ef55b3d432d)

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>
(cherry picked from commit a6cf34d164c045bbd5e7ea250eae9fb666ccbb13)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a6cf34d164c045bbd5e7ea250eae9fb666ccbb13)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 734e4fccfcd9c593a088cd1aeee5251c99905244)

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.
(cherry picked from commit 910bfa1d1f3823d418d4024be082bd5a1da43a65)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 910bfa1d1f3823d418d4024be082bd5a1da43a65)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 60e1e993f338adbf1fe15b68c29d410d35403f75)

11 years agoBug 10166 [3.10.x] Can't place holds on multiple titles if one or more are un-holdable
Owen Leonard [Thu, 16 May 2013 12:50:23 +0000 (08:50 -0400)]
Bug 10166 [3.10.x] Can't place holds on multiple titles if one or more are un-holdable

opac-reserve.pl tries to check whether all selected titles in a
multiple-hold batch are unavailable to be placed on hold. However, the
logic is flawed in such a way that if the last item in the batch cannot
be placed on hold the script assumes none can be placed on hold.

This patch modifies the way the script tracks the "no titles available
for holds" variable in order to correct the error.

To test, place multiple holds by selecting titles from a list of search
results. Test three conditions:

- All titles are available to be placed on hold

  You should see no onscreen warnings, and all titles should be
  selectable on the place hold screen. A "Place hold" button should
  appear at the bottom.

- Some titles can be placed on hold, some cannot

  The titles which can be placed on hold should be selectable.
  Titles which cannot be placed on hold should show a warning
  message. A "Place hold" button should appear at the bottom.

- No titles can be placed on hold

  "Sorry, none of these items can be placed on hold." should appear at
  the top of the page. All titles should appear with warning messages.
  There should be no "Place hold" button.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 049d422d36de9d2f7ba73c759c0f93f30790fc2f)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 9903fc6fa08c11b3d48fad9c72cce8c60b01bc3d)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit d4d3cb901951b50808c564d5f124be98c66bf47b)

11 years agoBug 10149 - koha-restart-zebra error handling (rewording)
Tomas Cohen Arazi [Mon, 29 Apr 2013 14:54:27 +0000 (11:54 -0300)]
Bug 10149 - koha-restart-zebra error handling (rewording)

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

Regards
To+

Edit:
- changed some wording problems.
- fixed an error in parameter validation

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit cee6909c8a5c10cc534a1ebe35ec5b8cda522eab)

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

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit eeca0831442fa47ba5447f1cdc8a7298becad3aa)

11 years agoBug 10144 - koha-start-zebra error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 13:30:08 +0000 (10:30 -0300)]
Bug 10144 - koha-start-zebra error handling

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

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 98bde26d2571b43ecee07e017e36f45e1aa6e680)

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

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 53d05eac9893ee6b9e70087529f427582275d2e6)

11 years agoBug 10094 - koha-list should have a --disabled option switch
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>
(cherry picked from commit 3772f30a0c50db7b993ce68b10b27aeeb09f1f4b)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 3772f30a0c50db7b993ce68b10b27aeeb09f1f4b)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit ef3322404bf3403a7f5508797cf7051bfb9b88d2)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2e550307bedc8f198667f9c6a95b72fd33073a3e)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit bd80daad3e65433204fd169be47f123900556805)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 0526bc3fa72ed6f5e7c13d581a051bd6894374f2)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit aec01a39e08eee1f46bed5f08dc7e50979b9b4ba)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a3422a47027188b7b76f137fd92effe328ca30c3)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit a675bc263c6a6d0322483a0b54c06f009e83eae9)

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
(cherry picked from commit 450d4070b9d7103e30547eb5bce88d4cd5a97621)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 450d4070b9d7103e30547eb5bce88d4cd5a97621)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 8c1589e2541920d65f858eaa59c114a18837e8f3)

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>
(cherry picked from commit 658071008320fdaad425e49e79bd240dc817d7e5)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 658071008320fdaad425e49e79bd240dc817d7e5)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit ca175204715cef46d77df7785baac46930fc7269)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 8fc93e7abced06ae5adce80e123e061aea46950a)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit c1e883b298a24af0276ec5d2ac75b9c87d8ffde7)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1530cee8a50006bbaa013676917086175401968c)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit f57dab4b0d385cb9e6a21f1248661fc655dd4cee)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 6bfb91f9df69c887643d0f1ae925595c365da10e)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit b3fe1c1b93bd8f825dfe59659fd83bfb23f904cf)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a114dc76149c9c27d5b3e0596302d41a9870fc8b)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from bf47671bace7ff55af53694cd8165f0acf0a5966)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit e1dbabdb7a3bc0ec92d629b862a077f1b6594fbb)

As this is requested, and applies well in 3.10.x, I push it with
it's followups.

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit c80b91c3e0114dae1d09a158baa4cc8c81ac62ee)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit cfdf4759dc0fe857b3dfb2fcab2868e117c5e6ff)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 4ffd79b2f3c6471c730497b892235661e6391e64)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d66e56177ec52d2278007275b261ee5e5b577ad2)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 7b4cb9406e67c787444681af269ca77ee6c45e14)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit b459eab4c89cf507ae3108194c2ec159b04672aa)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 5cea7144bc50477f8518ae47e78282de287c1a23)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 47349148c798ab17762189ef358adfe8d4bfec56)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 84481e79527d8ad1c5a3393b716c17f550736857)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 9d5316e2fb4af51721cf7b11f22759811e344c77)

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.

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d22fb794dcc977c096665c4aa44ffc2185af7d46)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit de32e8d6e849ecfc13d4635c776749f5b5d4ef3e)

11 years agoBug 10083 [3.10.x] In Transit string doesn't get translated in the staff interface
Owen Leonard [Thu, 16 May 2013 13:20:01 +0000 (09:20 -0400)]
Bug 10083 [3.10.x] In Transit string doesn't get translated in the staff interface

For some reason this text inside a <td> isn't getting picked up by the
translator unless it's inside a <span>. This patch adds the span and
tidies up the text.

To test, apply the patch and "translate update" a translation. Searching
the po file for "In transit from" should return a result from detail.pl.

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
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.

11 years agoBug 6709 : Patch for testing translating .xml files
Chris Cormack [Sun, 8 Apr 2012 08:10:19 +0000 (20:10 +1200)]
Bug 6709 : Patch for testing translating .xml files

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on second patch.

11 years agoBug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated
Bernardo Gonzalez Kriegel [Mon, 29 Apr 2013 16:07:11 +0000 (13:07 -0300)]
Bug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated

This patch changes
1) structure and schema for xml files used in MARC21
006 and 008 value builders.
2) JavaScript functions used to show value builders.

Xml processing is enabled in previous patch

Any translatable string has been moved to an xml element,
those strings that no need translation remains as xml
attributes.

NOTE_1: I do not include as translatable material types
codes, because those values are restricted in schema
definition. But this restriction can be removed.

NOTE_2: Anyone with experience in XML/XSD please
check the new schema definition.

NOTE_3: Anyone with experience in the former and
JavaScript please check xmlControlfield.js

To test:
1) Apply the patch
2) Verify that 006 and 008 value builders show and work
properly
3) Update translation files for your favorite language,
a new set of strings must show up corresponding to
names and descriptions on value builders.

Note: messed up patches, sending again.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Did regression tests on the plugins for 006 and 008 and could
spot no differences in behavior of the plugins to before.

Also tested the translation process and found it working nicely.
Thank you for fixing this long standing translation bug!

11 years agoBug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21...
Bernardo Gonzalez Kriegel [Tue, 26 Mar 2013 23:50:05 +0000 (20:50 -0300)]
Bug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21 update #15

This little patch adds a few values and descriptions to complete
value builder for marc21 008.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Follow-up works as described.
XML change only.

11 years agoBug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15
Bernardo Gonzalez Kriegel [Mon, 7 Jan 2013 22:10:56 +0000 (19:10 -0300)]
Bug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15

This patch, together with 9357, fix plugins for leader, 006, 007 and 008 MARC21 fields

Leader18 c and i is fixed on Bug 9357

Added missing/renamed fields on 007

Options 'o' and 'q' already present on 006 and 008,
fixing spaces and removing unnecessary descriptions.

To test:
1) Catalog/edit a record
2) On 007 value builder, check missing values
   on 008, BKS, check for example 33- Literary form,
   i- Letters has a description
3) Apply the patch
4) Clean your browser cache
5) On 007 value builder, new values are present
   On 008/6 descriptions are absent

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2fd42fa89c0eff4e3b26835045a6b64b0b6862a6)

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

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 684421809a332bde4778ab06e6cb2bfd09b3b599)

11 years ago3.8.13 release notes v3.08.13
Chris Cormack [Thu, 23 May 2013 04:34:37 +0000 (16:34 +1200)]
3.8.13 release notes

11 years agoLanguage update for 3.8.13
D Ruth Bavousett [Thu, 23 May 2013 00:55:22 +0000 (21:55 -0300)]
Language update for 3.8.13

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

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
(cherry picked from commit 0394a8f8ce88b6883cd2a14d57971713f98be346)

11 years agoMerge remote-tracking branch 'kc/3.8.x' into 3.8.x
Chris Cormack [Wed, 15 May 2013 21:45:55 +0000 (09:45 +1200)]
Merge remote-tracking branch 'kc/3.8.x' into 3.8.x

11 years agoBug 9923 - correction of a bug due to bz 7129
Christophe Croullebois [Mon, 18 Mar 2013 17:46:03 +0000 (18:46 +0100)]
Bug 9923 - correction of a bug due to bz 7129

See comments in the patch

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
**rebased for 3.8.x**

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoBug 7228: can't add items in an order with Modify
Christophe Croullebois [Thu, 18 Apr 2013 10:55:18 +0000 (12:55 +0200)]
Bug 7228: can't add items in an order with Modify

We have a message if we want to add items and we can't add, substract only.
It's ok if we choose to create items on ordering, in this case koha can't add items, just substract
and in this case we have to delete manually the items(s) in the catalog.
But if via the syspref AcqCreateItem we choose to create items when receiving this limitation is not usefull
The patch just checks if the syspref AcqCreateItem is on 'ordering'
if not the message is not shown and we can add items

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Here is the test I made for signing off :
after applying the patch
- syspref AcqCreateItem  : create items on RECEIVING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch

- syspref AcqCreateItem  : create items on CATALOGING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch

- syspref AcqCreateItem  : create items on ORDERING
- in a basket, create an order (click on "add" to add an item => quantity = 1)
- save the order
- reopen the order
- try to change the quantity (2 instead of 1), without clicking on "add" to create a new item => you cannot (alert message)
=> the behavior is the same as before the patch

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Copied test plan from bug report.
Template only change deactivating the Javascript that blocks
you from changing the quantity when AcqCreateItem is set to
something else than 'ordering'.
Passes all tests and QA script.
**Rebased for 3.8.x**

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
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>
(cherry picked from commit 36e06a151c718d7d905e4cb0b8d818c0b12f3b4d)

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoBug 10033 - dangerous query in _koha_modify_item
Fridolyn SOMERS [Fri, 12 Apr 2013 15:24:17 +0000 (17:24 +0200)]
Bug 10033 - dangerous query in _koha_modify_item

The SQL query build in C4::Items::_koha_modify_item performs an update on a row of items table identified by itemnumber.
Actually the query is build using a hash of datas :
    for my $key ( keys %$item ) {
        $query.="$key=?,";
        push @bind, $item->{$key};
    }
But this hash contains 'itemnumber' key, so you get an update including the primary key.
It is actually harmless but may be dangerous.

This patch simply skips itemnumber key in above loop.

Test plan :
Check you can create and modify items.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 598dfe27224f517fafa06df75521c623992ecbe0)

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

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoBug 9957 - Missing cancel link on subfield editing page
Owen Leonard [Tue, 30 Apr 2013 18:39:48 +0000 (14:39 -0400)]
Bug 9957 - Missing cancel link on subfield editing page

The subfield edit page has an edit bottom at the top of the page. Almost
no other edit screens do this. It would be more consistent to put it at
the bottom. Also missing is a "cancel" link. This patch fixes both
issues.

The patch also adds "Default" to the breadcrumbs when editing a subfield
in the default framework.

To test, apply the patch and edit a subfield: MARC frameworks -> MARC
structure -> Subfields -> Edit. The "Save changes" button should appear
at the bottom of the page alonside a "Cancel" link. Both should work
correctly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, improves consistency and works
nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoBug 9266 - Untranslated strings in tags moderation
Owen Leonard [Fri, 26 Apr 2013 18:20:49 +0000 (14:20 -0400)]
Bug 9266 - Untranslated strings in tags moderation

There are a couple of English strings in tags moderation JavaScript
which are not properly enclosed in the _() function enabling
translation. As a result, clicking a translated 'Approve' or
'Reject' button in the table of tags would change the button's
neighbor's label to the English string. This patch
corrects it.

To test, apply the patch and regenerate a translation to test with. Go
to Tools -> Tags and find a list of tags to moderate (pending, approved,
or rejected). When you click on an 'Approve' or 'Reject' tag in the
table of tags, the buttons in each Approve/Reject pair should retain
their correct translated label. For instance, looking at approved tags
in French:

[ Approuvé ] [ Rejeter ]

Clicking the "Rejetee" button should change the state to:

[ Approuver ] [ Rejetée ]

Clicking "Approuver" should return the buttons to the first state.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoBug 10022 - Multiple tags moderation doesn't work on translated page
Fridolyn SOMERS [Wed, 10 Apr 2013 10:37:54 +0000 (12:37 +0200)]
Bug 10022 - Multiple tags moderation doesn't work on translated page

When using a translated intranet, tags moderation using checkboxes and a
submit button doesn't work. You get a message "Unknown Operation on x
Term(s)" (translated of course).

This patch corrects by using name="op-[operation]" instead of name="op"
in each submit input.

Test plan :
- Create a new tag on a record
- Go to tags moderation in Tools
=> You should see your tag in pending terms
- Click on checkbox
- Click on Approve or Reject submit button at the bottom of the table
=> Without patch the tag is still pending
=> With patch operation is well performed, tag is not pending
- Test "Check lists" form
- Test Approve and Reject buttons from "Actions" column

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoBug 8264 - local cover images not working in IE8 [ prog ]
Edmund Balnaves [Mon, 15 Apr 2013 01:08:06 +0000 (11:08 +1000)]
Bug 8264 - local cover images not working in IE8 [ prog ]

[Patch submitted by David Cook]
Edmund, rather than myself, was the author of this patch,
so I'm not entirely sure about his code choices, but...it
looks like IE must process images differently than other
browsers.

It seems to me that the images are not appearing in IE,
because they're being regarded as incomplete or having
0/NULL natural width.

This patch simply introduces a try/catch hack where it
tries to add the image and remove any "no-image" elements
even nwhen the image is considered incomplete/width of
0/NULL. It won't do this if it catches any errors,
although I'm not sure that any errors would be caught
with this set up anyway...

It's certainly not the ideal solution, but it's a solution.

To Test:

Before applying the patch:
1) Use IE and FF/Chrome/other browser to view a record
   with local images attached
2) Note that the local images appear in FF/Chrome/other,
   but not in IE

Apply patch.

After applying the patch:
1) Repeat step 1 from above
2) Note that the local images now appear in all browsers
   as they should.

--

As I mentioned before, this seems like a real suboptimal
solution. Any ideas on why IE might be considering local
images to be incomplete or having 0/NULL natural width?

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I did a regression test using Chromium and Firefox in
Ubuntu. I checked both prog and CCSR - covers displayed
nicely.
All tests and QA script pass.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed author of patch to reflect actual authorship.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoBug 10093 - Typo in marc21_leader.tt
Stefano Bargioni [Fri, 26 Apr 2013 09:18:52 +0000 (11:18 +0200)]
Bug 10093 - Typo in marc21_leader.tt

fixed a typo in marc 21 leader builder about the value 'b', Serial component part

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch.
Template change only.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
11 years agoBug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC
Tomas Cohen Arazi [Wed, 24 Apr 2013 14:40:18 +0000 (11:40 -0300)]
Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC

This bug is present in master and (at least 3.8.x, where we spotted it).
The patch makes adding items, to a list from the results page, not rely
only on opacbookbag syspref but also 'virtualshelves'.

Regards
To+

PS: Thanks Graciela Galli for reporting.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only patch, works nicely.
Test plan copied from bug report:

- Disable the opacbookbag syspref
- Login in the OPAC
- Create a list (I tested a private one)
- Search in your db for some biblios.
- Choose some and add them to the created list
- Go to your users's page, to the my lists tab
- Your list is empty.

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