]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoRelease Notes for 3.06.04.000 20 Feb 2012 19:45:25 Z
Chris Nighswonger [Mon, 20 Feb 2012 19:45:25 +0000 (14:45 -0500)]
Release Notes for 3.06.04.000 20 Feb 2012 19:45:25 Z

12 years agoRevert "Bug 6836: Add jQuery dataTables plugin"
Chris Nighswonger [Mon, 20 Feb 2012 19:44:30 +0000 (14:44 -0500)]
Revert "Bug 6836: Add jQuery dataTables plugin"

This reverts commit 5f36947783cbe43a9550b3ffc839a2956d59ae94.

-Part of Enh 6836

12 years agoRevert "Bug 6836: followup CSS work"
Chris Nighswonger [Mon, 20 Feb 2012 19:44:00 +0000 (14:44 -0500)]
Revert "Bug 6836: followup CSS work"

This reverts commit 8edc97a838f8ee49c099e3870a15e43d554e2b63.

-Part of enh 6836

12 years agoRevert "Bug 6836: test case readingrec.pl"
Chris Nighswonger [Mon, 20 Feb 2012 19:43:34 +0000 (14:43 -0500)]
Revert "Bug 6836: test case readingrec.pl"

This reverts commit 0508e6fb86a48c8b99fdc63ccb2ebb1d5133c95a.

-Part of Enh 6836

12 years agoRevert "Bug 6836 follow-up fixing POD"
Chris Nighswonger [Mon, 20 Feb 2012 19:43:01 +0000 (14:43 -0500)]
Revert "Bug 6836 follow-up fixing POD"

This reverts commit 03e1c36dce6dc37f47c0927517b8bf646c214557.

-Part of Enh 6836

12 years agoRevert "Bug 6838: Add pagination and filtering on subscriptions table"
Chris Nighswonger [Mon, 20 Feb 2012 19:39:09 +0000 (14:39 -0500)]
Revert "Bug 6838: Add pagination and filtering on subscriptions table"

This reverts commit e13db856d4ceac1bb9b195dd10391cd239c19296.

-Part of DataTables Enhancement

12 years agoUpdating Version Number to 3.06.03.002
Chris Nighswonger [Mon, 20 Feb 2012 19:27:42 +0000 (14:27 -0500)]
Updating Version Number to 3.06.03.002

12 years agobug_7090: AllowItemsOnHandCheckout syspref
Srdjan Jankovic [Wed, 21 Dec 2011 08:26:30 +0000 (21:26 +1300)]
bug_7090: AllowItemsOnHandCheckout syspref

Observe AllowItemsOnHandCheckout syspref when using SIP self checkout

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
To test:
* place an item on hold for patron A
* attempt to circulate that item to patron B (via SIP/selfcheck)
syspref off: item should not circulate to patron B
Syspref On: item should circulate to patron B

Both conditions passed in our testing.
Also verified that normal staff client behavior regarding this situation was preserved. It was.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
-backported to 3.6.x

12 years agoBug 7357: display serial title instead of '---'
Adrien Saurat [Mon, 9 Jan 2012 10:55:08 +0000 (11:55 +0100)]
Bug 7357: display serial title instead of '---'

The full title of a serial is now displayed even
if several lines have the same title.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6137 follow-up, moving new test to db_dependent directory
Paul Poulain [Fri, 17 Feb 2012 17:40:33 +0000 (18:40 +0100)]
Bug 6137 follow-up, moving new test to db_dependent directory
(cherry picked from commit 46a5154df940cf10e6718aa87717fdb87ebca702)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6137: unit tests for C4::Circulation::_GetCircControlBranch
Julian Maurice [Fri, 27 Jan 2012 14:59:36 +0000 (15:59 +0100)]
Bug 6137: unit tests for C4::Circulation::_GetCircControlBranch

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 76be6208eeafbeb555103570f1484a64a7a12394)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6137: fix a Circulation bug. userenv null
biblibre [Tue, 8 Mar 2011 09:28:38 +0000 (10:28 +0100)]
Bug 6137: fix a Circulation bug. userenv null

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7532 - remove dependency on Date::ICal
Robin Sheat [Sun, 12 Feb 2012 03:36:34 +0000 (16:36 +1300)]
Bug 7532 - remove dependency on Date::ICal

This removes the dependency on Date::ICal (which is largely
unmaintained) and replaces it with DateTime::Format::ICal which can do
the same job. It also updates all the docs and installation scripts to
handle this change.

Note that this causes a minor behaviour change: previously the generated
times were converted to UTC, now they are left "floating" (that is, have
no timezone attached) and so will appear as the local time when imported
into a calendar. I don't anticipate this'll cause any issues however.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7514 Choose OPAC language with URL parameter
Frédéric Demians [Thu, 9 Feb 2012 10:03:34 +0000 (11:03 +0100)]
Bug 7514 Choose OPAC language with URL parameter

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested:
- with and without cookie set
- different language codes

http://.../cgi-bin/koha/opac-changelanguage.pl?language=de-DE
will directly open the German OPAC.

http://.../cgi-bin/koha/opac-changelanguage.pl?language=en
will directly open the English OPAC.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8ec812d97de321d8100f8e80ccad06cc36840e12)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_7458: A call number plugin
Srdjan Jankovic [Wed, 8 Feb 2012 02:12:05 +0000 (15:12 +1300)]
bug_7458: A call number plugin

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
A library using an inhouse callnumbering system wants to be able to generate the next available call number not already in use.  This custom call number plugin returns the next callnumber not already in use once a correct prefix has been entered.  The prefixes are four to six letters, space, then one or two numbers.
(cherry picked from commit ecc1e94f35491ba392aa3bfd17118c55fa14e55b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7409 - add unzip and perl-doc dependencies to package
Robin Sheat [Fri, 10 Feb 2012 03:10:28 +0000 (16:10 +1300)]
Bug 7409 - add unzip and perl-doc dependencies to package

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7312: Adds ISSN to serials/subscription-bib-search.pl results
Matthias Meusburger [Thu, 12 May 2011 09:29:01 +0000 (11:29 +0200)]
Bug 7312: Adds ISSN to serials/subscription-bib-search.pl results

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7289: Add biblioitems.editionstatement to missing sql files
Katrin Fischer [Sun, 12 Feb 2012 18:27:57 +0000 (19:27 +0100)]
Bug 7289: Add biblioitems.editionstatement to missing sql files

Follow-up for 7289 adding the new mapping to translated frameworks.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit 72616e4f3fa85f65741f8bd50f06408428bc60c5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7246 add offset/length and where options to rebuild_zebra
Paul Poulain [Wed, 1 Feb 2012 14:15:02 +0000 (15:15 +0100)]
Bug 7246 add offset/length and where options to rebuild_zebra

This patch reimplement a feature that is on biblibre/master for Koha-community/master

It adds 4 parameters:
* offset = the offset of record. Say 1000 to start rebuilding at the 1000th record of your database
* length = how many records to export. Say 400 to export only 400 records
* where = add a where clause to rebuild only a given itemtype, or anything you want to filter on

Another improvement resulting from offset & length limit is the rebuild_zebra_sliced.zsh
that will be submitted in another patch.
rebuild_zebra_sliced will slice your all database in small chunks, and, if something went wrong for a given slice, will slice the slice, and repeat, until you reach a slice size of 1, showing which record is wrong in your database.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Removed mention of -l option for limiting number of items exported, as requested
by QA manager. This can be re-added in a later patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1fd8c8a4debf750476a2369e4440ac662b19f6b7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7201 follow-up, fixing some indentation mistakes
Paul Poulain [Fri, 17 Feb 2012 09:58:01 +0000 (10:58 +0100)]
Bug 7201 follow-up, fixing some indentation mistakes
(cherry picked from commit 647843c3bba2fcd30b972e95b5b1952f38ff4ca0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_7201: Holds reports: add copynumber and enumchron
Srdjan Jankovic [Thu, 9 Feb 2012 00:24:35 +0000 (13:24 +1300)]
bug_7201: Holds reports: add copynumber and enumchron

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Data is there and correct - very helpful patch, thanks!
passes prove t xt t/db_dependent in line with current master failures.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8b80b315c3689bd58bee4cb5fc3c0d843bd080eb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6985 - remove kw,wrdl from the search results
Liz Rea [Wed, 25 Jan 2012 20:41:03 +0000 (14:41 -0600)]
Bug 6985 - remove kw,wrdl from the search results

To test:

* Apply patch
* Do a search in the OPAC, the result page should now say
  "Your search returned X results" instead of
  "Your search for "kw,wrdl:yyy" returned x results"
* Do a search that will have no results, kw,wrdl should not appear in the text.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Adrien Saurat <adrien.saurat@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4490650e2fc5dd4da6bd2e339434f1366beb610d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5346: Small display changes
Katrin Fischer [Mon, 23 Jan 2012 06:43:11 +0000 (07:43 +0100)]
Bug 5346: Small display changes

Changing display from:
Suggested by Admin, Koha (from suggestion #2)

To:
Suggested by: Admin, Koha (suggestion #2)

Adding some missing parentheses and deleting some additional spaces.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b5f7a1f8771fb0d98db3b39f1ef6315783c30238)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5346: Linking suggestions and orders.
Jonathan Druart [Wed, 18 Jan 2012 13:16:16 +0000 (14:16 +0100)]
Bug 5346: Linking suggestions and orders.

Display suggestion info in acquisition module:
  basket.pl
  neworderempty.pl
  orderreceive.pl
  parcel.pl

To Test:
Create a suggestion and accept it.
Create a new order from this suggestion
Receive this order

For each step, check if suggestion info are visible.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test provides more unit tests, all complete successfully.
perl t/db_dependent/Suggestions.t
Note: test case should be cleaned up after running tests.

Display changes are consistent and information about the suggestion
is shown on every important screen now.

I created an order from a suggestion and one from an existing record.

No problems found.
(cherry picked from commit 0200639b0077398fe2ce2cbe915c5c73b6dd9a01)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago7367: Make translation possible of Close this window
Marcel de Rooy [Thu, 16 Feb 2012 12:37:51 +0000 (13:37 +0100)]
7367: Make translation possible of Close this window

Trivial change in two opac templates.
(cherry picked from commit 2ee63f49979bc617d010ec4f22027e1120776713)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7203: Fixes typo - 'Mange' to 'Manage' in several files.
Garry Collum [Wed, 18 Jan 2012 01:28:55 +0000 (20:28 -0500)]
Bug 7203: Fixes typo - 'Mange' to 'Manage' in several files.

Found 3 instances of the typo while looking for the typo reference in Bug 7203.
Fixed labels/label-edit-batch.tt, labels/label-edit-layout.tt, and patroncards/edit-layout.tt.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7530: Missing <li> tag in circ-menu.inc
Garry Collum [Sat, 11 Feb 2012 17:37:13 +0000 (12:37 -0500)]
Bug 7530: Missing <li> tag in circ-menu.inc

The address information of circ-menu.inc is not contained in <li> tags, this patch fixes it.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
verified new <li> in template. Looks good.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 99f2f62be926cf42812a639c4a5b3f458729aec3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7114: Fixes the Funds' page display after the Filter link is clicked.
Garry Collum [Fri, 20 Jan 2012 16:23:04 +0000 (11:23 -0500)]
Bug 7114: Fixes the Funds' page display after the Filter link is clicked.

On the funds page there is a Fund Filters form and a menu underneath this form.  When the form is hidden the contents of the page shift to the left overlapping the menu.  The menu underneath the fund filters form must have been a later edition.  This patch removes the line of javascript that shifts the contents of the page after the form is hidden.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes the broken Layout when clicking on 'Filters'.

I am a bit confused by the link. I think it should toggle between different descriptions and
perhaps even hide all of the left navigation. This way the funds table would get more
room for display.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c2be08f695a1a28c51276e233ac030fc5337484c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7406 Fix saved reports display paging inconsistency
Frédéric Demians [Wed, 8 Feb 2012 18:13:41 +0000 (19:13 +0100)]
Bug 7406 Fix saved reports display paging inconsistency

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3fcdd902f8fcd6d64fba8f434ae811d8e1a04fdd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7489 - Implement DisplayOPACiconsXSLT for NORMARC XSLT
Magnus Enger [Fri, 3 Feb 2012 08:57:32 +0000 (09:57 +0100)]
Bug 7489 - Implement DisplayOPACiconsXSLT for NORMARC XSLT

This patch actually hides the whole line that contains the icon in the result
list, including "literary form" and "audience", but this is how the syspref
works for MARC21 too, so I'm sticking with that.

To test:
- Set marcflavour = NORMARC
- Set OPACXSLTResultsDisplay = on
- Set DisplayOPACiconsXSLT = show
- Check that icons and information about "Type", "Litterær form" and
  "Målgruppe" are displayed in results, "Type" and the icon in detail
- Set DisplayOPACiconsXSLT = don't show
- Check that icons and information is not displayed in result or detail

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan worked nicely. Patch works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0bc06f11a6e94b2c01593f29881c661cc6c03c59)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7521: Templates should use receive_serials permission
Katrin Fischer [Fri, 10 Feb 2012 06:17:33 +0000 (07:17 +0100)]
Bug 7521: Templates should use receive_serials permission

Corrects templates to use permission receive_serials.

Before patch:
1) Serial receive page (/cgi-bin/koha/serials/serials-edit.pl...)
can only be accessed with full serials permissions.
When one permission is missing, page can not be accessed.

2) Serial collection/Issue History page (/cgi-bin/koha/serials/serials-collection.pl...)
can only be accessed with full serials permissions.

After applying patch:
1) Serial receive page can only be accessed when user has receive_serials
permission.

2) Edit and serial receive links are hidden, when user doesn't have
serials_receive permission. Page is accessible with at least 1 serials
permission.

I will send a another patch to correct behaviour for the routing permission.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7551 : Can only renew for the user you are logged in as now
Chris Cormack [Thu, 16 Feb 2012 20:23:53 +0000 (09:23 +1300)]
Bug 7551 : Can only renew for the user you are logged in as now

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 497f49d8b69e0be9e192b48bf40f2f5ab6cc92ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7546 - cannot view subscription detail
Liz Rea [Wed, 15 Feb 2012 20:13:49 +0000 (14:13 -0600)]
Bug 7546 - cannot view subscription detail

This patch adds a C4::Search to subscription-detail.pl to compensate for a removed
one from auth.pm during the denesting effort.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Bug 7546 Do not call routine as bareword

Fixes compilation errors due to calling routine without parens
Also nothing was gained (and obfuscation added) by forcing
the return into a hash ref have changed variable to hash
tidied up the if else chain

These routines should be refactored out future

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
bug 7546 follow-up, enabled_staff_search_views problem

* enabled_staff_search_views was not exported by C4::Search, should have been
* serials/serials-edit.pl were also missing it

Comments:
* checked with for file in */*.pl; do perl -wc $file; done that no script was still having this problem

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Final sign off for all 3 patches
Note: I had some problems with tests, but it is probably related to my data and not this patch.
(cherry picked from commit 1ddc9322dfc13ef7f1e930692bfd2cb3771b102b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3264 UnCloneField() / minus button in MARC editor can clear all subfields (author...
Marcel de Rooy [Thu, 19 Jan 2012 08:50:03 +0000 (09:50 +0100)]
Bug 3264 UnCloneField() / minus button in MARC editor can clear all subfields (authorities AND biblio)

All subfields following the removed subfield were not saved.
Problem is in C4/Biblio routine TransformHtmlToMarc.
If the field is emptied, the param list contains a code param but no subfield
param. The while loop handling the subfields could not handle that. Also added
a FIXME because the whole routine depends on an assumption about the order of
cgi parameters that is not strictly guaranteed.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
I was unable to replicate the problem, but can confirm that the patch does
not break anything under any of the following platforms/browsers:
Mac OS X 10.6.8:
Chrome 16.0.912.77
Firefox 9.0.1

Windows 7:
Firefox 3.6.3
Firefox 9.0.1
IE 8.0.7600.16385

Ubuntu 11.10
Firefox 8.0
Chromium 15.0.874.106 (Developer Build 107270 Linux)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 795dc61f7526c3810173139004c741dc8c810382)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6718 No manager_id saved for writeoff fines.
Maxime Pelletier [Tue, 7 Feb 2012 16:10:32 +0000 (11:10 -0500)]
Bug 6718 No manager_id saved for writeoff fines.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Tested per test plan.
Passes prove xt t t/db_dependent

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1d7262838077543af4dc8afde7e43188c0c432c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7018 - need all acq permissions to search
Kyle M Hall [Wed, 8 Feb 2012 15:45:53 +0000 (10:45 -0500)]
Bug 7018 - need all acq permissions to search

Single line fix. Changes permissions required for histsearch.pl
from requiring * for acquisitions to only requiring
group_manage, order_manage, and order_receive

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0d037efd358c5516466c5df99e565d5fd98d5a74)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7545: Can't edit items
Nicole C. Engard [Wed, 15 Feb 2012 19:48:33 +0000 (14:48 -0500)]
Bug 7545: Can't edit items

This patch makes it so that you can click 'edit items' and actually
edit items.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Works as advertised.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
(cherry picked from commit c004b88f5a907227af0249bd9516ea7e868a8f76)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7238 - make packages deal with SIP config
Robin Sheat [Thu, 9 Feb 2012 23:55:09 +0000 (12:55 +1300)]
Bug 7238 - make packages deal with SIP config

This moves the SIP config to the templates directory (on package
building) in anticipation of making it configurable with package tools.
Prevents it being installed into /etc.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoPrevious and next functions are not used, since this code was removed from mas_subfie...
Juan Romay Sieira [Tue, 27 Sep 2011 09:16:27 +0000 (11:16 +0200)]
Previous and next functions are not used, since this code was removed from mas_subfields_structure.pl

http://bugs.koha-community.org/show_bug.cgi?id=6924
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2d67771157e9c07f5e907fc6507bbd9fabb3b82c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7080 - Revised - Clean up interface on fine payment screens
Owen Leonard [Fri, 21 Oct 2011 14:19:30 +0000 (10:19 -0400)]
Bug 7080 - Revised - Clean up interface on fine payment screens

- Move some content out of table cells
- Improve table markup with <thead>, <tbody>, and <tfoot>
- Improve breadcrumb specificity on paycollect.pl
- Add clearer messages for different actions (Pay selected fines, pay an
  individual fine, etc.
- Add client-side warning to pay.pl when writing-off all
- Correcting terminology: When a verb, "write off," when a noun: "Writeoff."

Revision: Correcting tab label case according to Bug 2780 guidelines

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked all 4 fine tabs and performed different fine actions.
The layout on all pages looks clean and correct.
I tested the new client-side warning and made sure it's translatable.
Labels have proper capitalization.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0f80707d7c7b609fab357b12913da242b212e63b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting Auth.pm
Paul Poulain [Fri, 16 Sep 2011 16:02:58 +0000 (18:02 +0200)]
Bug 6875 de-nesting Auth.pm

* removed use C4::Koha that is useless
* moved "use C4::Members" to "require C4::Members" just before GetMemberDetails call. This will avoid loading C4::Member everytime a page is called by someone not logged

* still to do = work on C4::VirtualShelves, that can be optimized, definetly !

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master, 28 Jan 2012

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Please WAIT with virtual shelves. Working on that..
Tested and marked as Passed QA.
(cherry picked from commit e780e0669c8b2d2a50a7996ab76e584c4cd4c59d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting C4::VirtualShelves
Paul Poulain [Fri, 16 Sep 2011 19:58:30 +0000 (21:58 +0200)]
Bug 6875 de-nesting C4::VirtualShelves

* C4::Circulation is unused, removing it
* C4::Members used only in ShelfPossibleAction, switching from use to require
* C4::Auth used only in RefreshShelvesSummary, a sub called only in
opac-addbybiblionumber.pl script, moving the require inside the sub

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting C4::Heading
Paul Poulain [Fri, 16 Sep 2011 17:38:06 +0000 (19:38 +0200)]
Bug 6875 de-nesting C4::Heading

C4::Search is needed only in authorities sub, moving it here and switching to
require

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected call to SimpleSearch in both subs where it is used. Additional
performance improvements are included in bug 7284. 28 Jan 2012
(cherry picked from commit 58c46b27af601a893e1eabdfb5bd7d4d0d887f24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting C4/Serials
Paul Poulain [Fri, 16 Sep 2011 16:48:15 +0000 (18:48 +0200)]
Bug 6875 de-nesting C4/Serials

* use C4::Branch is loaded only to call GetBranchNAme in PrepareSerialsData
  and set branchname in the hashresult. This sub PrepareSerialsData is used
  in the following scripts :
opac/opac-serial-issues.pl:    my $subscriptioninformation=PrepareSerialsData($subscriptions); => no use of branchname after
serials/serials-collection.pl:   $subscriptions=PrepareSerialsData(\@subscriptioninformation); => no use of branchname after
=> we can remove the ->{branchname} from the result, and remove the C4::Branch dependancy
* moves use C4::Items to require C4::Items, to call AddItemFromMarc, when
  receiving a serial, with Recieving create an item set in the subscription.
* removed use C4::Letters and C4::Search, that are useless

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 cleaning opac-main.pl
Paul Poulain [Fri, 16 Sep 2011 22:40:03 +0000 (00:40 +0200)]
Bug 6875 cleaning opac-main.pl

C4::VirtualShelves, C4::Branch and C4::Acquisition are useless, removing their
loading

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 cleaning mainpage.pl
Paul Poulain [Fri, 16 Sep 2011 22:34:40 +0000 (00:34 +0200)]
Bug 6875 cleaning mainpage.pl

AutoritiesMarc is loaded for nothing : we don't display authorities anywhere,
so removing the dependancy as well as the useless code

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6875 de-nesting C4::Koha.pm
Paul Poulain [Fri, 16 Sep 2011 16:28:00 +0000 (18:28 +0200)]
Bug 6875 de-nesting C4::Koha.pm

* removed use C4::Output, that was not used
* moved use URI::split to getitemtypeimagelocation and switched to "require".
  Checked it still works through admin/itemtype.pl
* moved use Business::ISBN to _isbn_cleanup.pl and switched to "require".
  Checked it still works with the following small script :

use C4::Koha;
print GetNormalizedISBN("1-56592-257-3");

(GetNormalizedISBN uses _isbn_cleanup)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7432 : Fixing caching for C4::Languages
Chris Cormack [Thu, 2 Feb 2012 23:44:17 +0000 (12:44 +1300)]
Bug 7432 : Fixing caching for C4::Languages

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7432 : Fixing caching for SQLHelper
Chris Cormack [Thu, 2 Feb 2012 23:39:43 +0000 (12:39 +1300)]
Bug 7432 : Fixing caching for SQLHelper

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7432 : Fix how we are setting expiry time when caching
Chris Cormack [Thu, 2 Feb 2012 23:35:21 +0000 (12:35 +1300)]
Bug 7432 : Fix how we are setting expiry time when caching

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6598 [REVISED] OPACFineNoRenewals syspreference does not stop user renewing in...
Owen Leonard [Tue, 11 Oct 2011 18:52:19 +0000 (14:52 -0400)]
Bug 6598 [REVISED] OPACFineNoRenewals syspreference does not stop user renewing in opac

This patch standardizes the condition under which renewal controls
are displayed at the page (as opposed to item) level. In some
places "canrenew" was used, in others "patron_flagged" was used.
Now "canrenew" controls renew controls and "patron_flagged" only
triggers the display of user warnings.

This patch also allows for renewal information to be displayed
for each item in situations where OPAC renewals are allowed but
disabled for whatever reason. This gives the patron information
about used/available renew counts but hides renew controls.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0027fe0cc367632038f4562aaea22a582c785d9b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating Version Number to 3.06.03.001
Chris Nighswonger [Sun, 19 Feb 2012 21:35:19 +0000 (16:35 -0500)]
Updating Version Number to 3.06.03.001

12 years agoBug 6299 - Advertise this addition during upgrade
Tomas Cohen Arazi [Thu, 4 Aug 2011 20:47:42 +0000 (17:47 -0300)]
Bug 6299 - Advertise this addition during upgrade

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
August 10, 2011: Fixed some small typos.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Oct 7th, 2011: rebased for master

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- backported to 3.6.x

12 years agoBug 6299 - add es-ES
Tomas Cohen Arazi [Wed, 10 Aug 2011 14:46:17 +0000 (11:46 -0300)]
Bug 6299 - add es-ES

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Confirmed that the RELTERMS authorised values category is populated. Not
knowing Spanish I can't comment on the translations, but any errors can be
corrected at a later date.
(cherry picked from commit 1142b189f29808bae6f7f099f692b902795ab94b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6299 Add relator codes for fr-FR
Frédéric Demians [Mon, 30 Jan 2012 18:14:04 +0000 (19:14 +0100)]
Bug 6299 Add relator codes for fr-FR

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Confirmed that the RELTERMS authorised values category is populated. Not
knowing French I can't comment on the translations, but any errors can be
corrected at a later date.
(cherry picked from commit 147a3f8b970450c97a41a4ef60f56c5f77748564)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6299 - Provide a list of authorized values for Relator terms
Tomas Cohen Arazi [Tue, 7 Jun 2011 14:27:37 +0000 (11:27 -0300)]
Bug 6299 - Provide a list of authorized values for Relator terms

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
August 10,2011: Tested install and upgrade.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
January 28, 2012: Removed untranslated non-en SQL relator term files.
(cherry picked from commit 211a10c83ab36af3c299b05cd74864e6801bd072)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6838: Add pagination and filtering on subscriptions table
Julian Maurice [Fri, 2 Sep 2011 14:30:18 +0000 (16:30 +0200)]
Bug 6838: Add pagination and filtering on subscriptions table

Use dataTables plugin

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2916ddae4ad32886831004d8efe373a62eda198e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6634 manager_id and itemnumber not populated when paying fines
Maxime Pelletier [Tue, 7 Feb 2012 15:37:49 +0000 (10:37 -0500)]
Bug 6634 manager_id and itemnumber not populated when paying fines

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 89893e8d4303127e266208d04cb2d135887bb644)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 : Removing a broken test
Chris Cormack [Fri, 10 Feb 2012 22:09:21 +0000 (11:09 +1300)]
Bug 5327 : Removing a broken test

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7345: Enable exporting records sans private fields
Jared Camins-Esakov [Sun, 11 Dec 2011 01:14:52 +0000 (20:14 -0500)]
Bug 7345: Enable exporting records sans private fields

Add an option for marcstd to the opac-export.pl and catalogue/export.pl
scripts. This new format removes all 9XX, X9X, XX9 fields and subfield $9
(with the exception of 490 in flavours of MARC other than UNIMARC). The work is
done in C4::Record::marc2marc.

This patch adds the new export option 'marcstd' for exporting MARC
records without 9xx, x9x and xx9 fields and subfields to the staff
detail page.

Testing plan:
1. Export a record in "MARC (Unicode/UTF-8)" format as a control
2. In the OPAC, run the following jQuery to add the marcstd option to the UI:
> $("#export #format").append("<option value='marcstd'>MARC (no 9xx)</option>");
3. Export the same record in "MARC (no 9xx)" format
4. Compare the two, noticing that any subfield $9 or fields including 9 (other
   than 490 in flavours of MARC other than UNIMARC) have been removed

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised now.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This patch squashes both the original patch and Katrin's follow-up adding
marcstd as an export option on the staff client.

Feb 13, 2012 (marcel): Amended this patch to resolved two definitions of $error in catalogue/export script.
(cherry picked from commit 6378436089134f1d9b8015e991fcb81c7d8ead7c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7511 [ENH] Template caching (T::T feature)
Paul Poulain [Fri, 10 Feb 2012 08:45:34 +0000 (09:45 +0100)]
Bug 7511 [ENH] Template caching (T::T feature)

Just add to your Koha configuration file
<template_cache_dir>/path/writable/by/apache/user</template_cache_dir>
in the <config> block, and Koha will use template caching, for about
10% CPU time saving.

on linux servers, /tmp is usually OK

(also fixes an indenting with a TAB)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The results of using this are very striking. Based on an insufficient
sample size, it would seem that the time spent in T::T is reduced by a
factor of at least 5.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1161079e1f14c681e82e139e72291af35d6f9b98)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7519 - show patron's street number in search results
Robin Sheat [Fri, 10 Feb 2012 01:33:29 +0000 (14:33 +1300)]
Bug 7519 - show patron's street number in search results

When searching for a patron in the staff client, their address is shown.
However, the street number component isn't included. This includes it.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works as announced. I confirm that street number isn't displayed on patron
search result table without this patch, and is displayed with this patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 858efb488643979eeddcf99f532e1bfaa45287d5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7501: OPAC auth browser should have alternating colors
Jared Camins-Esakov [Sat, 4 Feb 2012 17:39:12 +0000 (12:39 -0500)]
Bug 7501: OPAC auth browser should have alternating colors

Test plan:

1. Access authority browser in OPAC. Note that all rows have the same background
   color.
2. Apply patch, notice that colors now alternate.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 44fd379dc23fb4423619ab07e5f4a4906c097a6c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6865 - Follow-up, Replace image-based gradient backgrounds with CSS3 gradients
Owen Leonard [Tue, 24 Jan 2012 13:34:55 +0000 (08:34 -0500)]
Bug 6865 - Follow-up, Replace image-based gradient backgrounds with CSS3 gradients

Staff client login screen has a separate CSS file which wasn't
included in the original changes for Bug 6865. This caused a 404
error (missing background image).

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested in Chrome, FF, Safari, and IE8.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit ac3b4061b7bb63b42cfbf8945789289215e90ee4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7147 - Style Z39.50 search errors according to style patterns
Owen Leonard [Thu, 2 Feb 2012 17:59:22 +0000 (12:59 -0500)]
Bug 7147 - Style Z39.50 search errors according to style patterns

Styles Z39.50 errors and messages in the standard style.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7505 Superlibrarian can't export all biblios when IndependantBranches is enabled
Frédéric Demians [Mon, 6 Feb 2012 19:00:24 +0000 (20:00 +0100)]
Bug 7505 Superlibrarian can't export all biblios when IndependantBranches is enabled

When a Koha user has superlibrarian permissions, and if
IndependantBranches is enabled, in Tools > Export bibliographic and
holdings, this user can't export all biblio records. He will just export
the biblio from the branch he belongs to.

This patch fix that.

To test:

  - Do a ALL records export as superlibrian on a multi-branches Koha instance
  - Examine the resulting MARC file with the tool of your choice (MArcEdit,
    yaz-marcdump, etc.)
  - You will see that 952/995 contains exlusively items from your branch (as
    Koha user)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7457: log cleaning on basket.pl
Adrien Saurat [Tue, 31 Jan 2012 14:17:07 +0000 (15:17 +0100)]
Bug 7457: log cleaning on basket.pl

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 19d6339c26e5a9160592c7f861493c03da21b1f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoSmall fix to allow help popup in IE9, not 7 or 8 - bug 7339
Duncan Tyler [Tue, 20 Dec 2011 00:37:18 +0000 (13:37 +1300)]
Small fix to allow help popup in IE9, not 7 or 8 - bug 7339

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3317d16029fc230ed51d987bc412b9d89463596f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Follow up, shifting test
Chris Cormack [Mon, 30 Jan 2012 23:37:43 +0000 (12:37 +1300)]
Bug 929 : Follow up, shifting test
(cherry picked from commit 6a06860f0c48101414015b44d6b44873631554cc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoError in records.abs for marc21/biblios
Janusz Kaczmarek [Mon, 6 Feb 2012 14:44:36 +0000 (15:44 +0100)]
Error in records.abs for marc21/biblios

http://bugs.koha-community.org/show_bug.cgi?id=7502
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c1e47b9359a77b6812173b7b23934bbc154a88e4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7127 - Templates must be valid XHTML
Owen Leonard [Tue, 1 Nov 2011 18:14:51 +0000 (14:14 -0400)]
Bug 7127 - Templates must be valid XHTML

Replaces & with &amp; on several template pages

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 311dbc8bc1d5c89eff73d4e33c598c9435025ce6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6490 - Lost and paid not updated when book is checked out.
Kyle M Hall [Thu, 2 Feb 2012 15:15:43 +0000 (10:15 -0500)]
Bug 6490 - Lost and paid not updated when book is checked out.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Tested:

item checked out and marked lost - item is removed from borrower's checkouts and charged to patron
Checking out the item (without checking it in first) removed the fines and issued the item normally.

Passed prove t xt t/db_dependent (results congruent with current master failures)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 58c62f69c1cabf31840006531338f9362f0a1e0e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7466 - Cart notification popup should appear onscreen even when button isn't
Owen Leonard [Tue, 24 Jan 2012 20:46:20 +0000 (15:46 -0500)]
Bug 7466 - Cart notification popup should appear onscreen even when button isn't

This patch compares the scroll position of the window with the page
position of the cart button and displays the cart notification
popup at the top of the visible page if the cart button has moved
offscreen.

Includes fix for OPAC and staff client.

Signed-off-by: Aleksa Vujicic <aleksa@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1eb0cbc5bf728f6cdb64b5cf102f227df1efb617)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7453: All patrons should have an expiry date
Katrin Fischer [Fri, 20 Jan 2012 07:08:24 +0000 (08:08 +0100)]
Bug 7453: All patrons should have an expiry date

Fixes sample data. All patrons should always have an expiry date.

To test:
Load sample patron data and check that all patrons have an expiry date.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6314 XSL UNIMARC Improvments
Frédéric Demians [Fri, 6 May 2011 06:43:34 +0000 (08:43 +0200)]
Bug 6314 XSL UNIMARC Improvments

- Exclude 'marc' & 'item' prefix from UNIMARC util XSL to slim down
  result
- Add missing NSB/NSE characters striping
- 200 fields on result/detail page: show all subfields in order, link to
  detail page only on $a
- 4xx display, more fields and more subfields, respects subfields order
  which matter
- Improve RAMEAU authorities linkings to subdivisions (pure XSLT)
- Add missing fields: 205, 500
- Add missing MARC21 syspref:
  - DisplayOPACiconsXSLT, not implemtable in UNIMARC
  - OPACURLOpenInNewWindow
  - URLLinkText
  - ShowISBD
  Sidenote: this should have been done by people having introduced those
  syspref into MARC21 XSL.

Suite

http://bugs.koha-community.org/show_bug.cgi?id=6314
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fd84f8c2bcdc01fc753c6b281f13e387586199cc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5674: patron name sort ignoring case when placing holds.
Garry Collum [Wed, 1 Feb 2012 17:35:27 +0000 (12:35 -0500)]
Bug 5674: patron name sort ignoring case when placing holds.

Fixes the patron name sorting when placing holds.

Testing - See Bug 5674.
Create two patrons.  One named SMITH, THOMAS and the other Smith, John.
Search for an item to place on request.  Do a patron search for Smith.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm both the original bug and the fix, sorting is correct now.
Patch does not change status of tests - prove t t/db_dependent xt no different from master.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e1d948ecd69b802917272b2bc73e11fabc2a0e88)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6323 -- Error handling cleanup for moveitem.tt
Liz Rea [Wed, 28 Sep 2011 14:04:14 +0000 (09:04 -0500)]
Bug 6323 -- Error handling cleanup for moveitem.tt

Added button to retry attaching item, added default bib view handling, cosmetic changes to the error display (buttons now in error div).

Incorporates changes that should satisfy QA.

To test:
Find a bib with multiple items and grab one of the barcodes.
Go to a second bib and click Edit -> Attach item
Paste your barcode in there and click "Submit"
Click the "Try again with a different barcode" button. It should take you back to the barcode entry screen.

Also try with a non-existent barcode and verify that the button appears and works as intended.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin
Chris Cormack [Thu, 17 Nov 2011 00:17:01 +0000 (13:17 +1300)]
Bug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
The scripts run with the caveat that you must specify the path to SIPconfig.xml. The followup previously attached should take care of that issue.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 43b3fb97015c16d159f67b758ff01483890b42d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7238 Followup - fix sip_run to require path to SIPconfig.xml
Liz Rea [Sun, 1 Jan 2012 03:41:03 +0000 (21:41 -0600)]
Bug 7238 Followup - fix sip_run to require path to SIPconfig.xml

This requires Chris C's patch to move the scripts to the new location outside of C4.

To test:
run sip_run.sh with no arguments - it should fail with a message to add the path and try again.

Run sip_run.sh with a path to a valid SIPconfig.xml - it should start and run.
(cherry picked from commit 866bb561dc4dc92b587be177a7c8261b58439a3d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7461 - Cart offering to remove items when closing
Owen Leonard [Tue, 24 Jan 2012 14:10:46 +0000 (09:10 -0500)]
Bug 7461 - Cart offering to remove items when closing

The "hide window" button in the cart called a quit() function
which deletes any checked items. My understanding of the "hide
window" button is that it should *only* hide the window, not
perform any other operations. I'm removing the calls to the
quit() function in both the OPAC and staff client and adding
a CSS class, "close," which is already tied via jQuery to
the window.close() function.

To test in both OPAC and staff client: Add items to the cart.
Try clicking the "hide window" button with items selected and
without. In both cases the window should close without affecting
the contents of the cart.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5528b06fda325396484a3841d08687c697bc8ca6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7472 Edit button ineffective when paying borrower fee
Frédéric Demians [Thu, 26 Jan 2012 09:39:52 +0000 (10:39 +0100)]
Bug 7472 Edit button ineffective when paying borrower fee

On payment page, the Edit button doesn't load anymore the current
borrower edit page.

To reproduce the bug:

- Define a borrower category 'foo' with Enrollment fee
- Create a new 'foo' borrower
- Click on Check out tab
- A message is displayed: Fees & Charges: Patron has Outstanding fees &
  charges of xx.00. Checkouts are BLOCKED because fine balance is OVER
  THE LIMIT. Make Payment
- Click on Payment link
- Click on Edit button
- You reach a page for creating a new borrower
  => you should reach the current borrower edition page

- Same issue on paycollect.tt template

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9d80ca27750c60471ef0902c6f7bda345341dd7c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7476 Remove executable bit from files that probably should not be executed
MJ Ray [Mon, 30 Jan 2012 21:06:57 +0000 (21:06 +0000)]
Bug 7476 Remove executable bit from files that probably should not be executed

Signed-off-by: Aleksa Vujicic <aleksa@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended to replace some copy-and-paste comments only with consent of MJR.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d4b132136cef6204dd074205aef94b6b0efc6930)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7459 - Can only add to one public list in OPAC search results
Marcel de Rooy [Mon, 9 Jan 2012 12:10:51 +0000 (13:10 +0100)]
Bug 7459 - Can only add to one public list in OPAC search results

This makes the second and higher public list appear again in the AddTo combo of the search results screen.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 724e0d520df63bfbe5dfdf4d8ea0aedd7889f9d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6984 - Holds statistics doesn't work.
Garry Collum [Wed, 1 Feb 2012 15:15:46 +0000 (10:15 -0500)]
Bug 6984 - Holds statistics doesn't work.

This patch fixes several errors in reserves_stats.pl and reserves_stats.tt.

Testing -
To test this patch, data must be in either the reserves table or old_reserves or both.  The following SQL will give you the raw data that is used by the report.

SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = reserves.itemnumber)
UNION SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
old_reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM old_reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = old_reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = old_reserves.itemnumber)

To test the notificationdate and reminderdate, I added data to the old_reserves table, since I have never run notices on my test machine.

Ex:
UPDATE old_reserves
SET notificationdate = "2012-01-29",
reminderdate = "2012-01-29"
WHERE timestamp = "2012-01-29 20:09:34";

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm original bug -- Reports work as expected now!
prove t xt t/db_dependent no different from master.
(cherry picked from commit 67825637beb8ce3fabb7f34548f6962dec2993e5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7450 small follow-up, removing warn
Paul Poulain [Fri, 3 Feb 2012 11:09:24 +0000 (12:09 +0100)]
bug 7450 small follow-up, removing warn

removing an unconditional warn. It was already here before the patch,
but my pre-applypatch script complained, so I fix as a follow-up
(cherry picked from commit 1034b21dea0460b58ef63550cf920b17d5e2662e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7450: missing placeholders in authorised_values.pl
Adrien Saurat [Tue, 17 Jan 2012 11:00:32 +0000 (12:00 +0100)]
Bug 7450: missing placeholders in authorised_values.pl

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Successfully added, edited and deleted authorised values.
No problems found.
(cherry picked from commit f0a660093442941ee11c0c2fe11402eebfa45a01)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7431: Fixes the display of the due date in opac item specific holds.
Garry Collum [Sat, 28 Jan 2012 19:36:18 +0000 (14:36 -0500)]
Bug 7431: Fixes the display of the due date in opac item specific holds.

Fixes the reference to the due date in opac-reserve from date_due to dateDue as defined int opac-reserve.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit cf15a0e427d8b8166d1dde8dae6ad6bf1a6f7de9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7355 Note subfields are not displayed in TEXTAREA if hidden
Frédéric Demians [Wed, 14 Dec 2011 07:52:32 +0000 (08:52 +0100)]
Bug 7355 Note subfields are not displayed in TEXTAREA if hidden

In the data entry form, there is a (hidden) functionality for note subfields.
MARC21 500-599 and UNIMARC 300-399 subfields are displayed in TEXTAREA rather
than INPUT tags. This is good since usually notes can be pretty long. But if
one of those fields is marked in the framework as 'hidden', then it isn't
displayed at first when you create a record and when you expand the field by
clicking on its label the field is displayed in a one-line INPUT tag.

To reproduce this bug:

- Modify your framework:
  MARC21: 500$a, hidden=1
  UNIMARC: 300$a, hidden=1
- Create a new biblio record with this framework
- Open the tab containing 500 or 300 field
- 500 or 300 tab is collapsed
- Click on 500 or 300 label to expand the field
- 500$a or 300$a is displayed in a one-line INPUT tag, not in a TEXTAREA
  as it should

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan works. Also checked cloning and deleting
subfields still works.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised. Simplifies code too. Well documented test plan.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 86406bcf910d28691655d4a9a1490d34e669a6ee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6210 follow-up, removing warn
Paul Poulain [Thu, 2 Feb 2012 14:35:26 +0000 (15:35 +0100)]
Bug 6210 follow-up, removing warn

See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c27
and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c28
(cherry picked from commit 1637af349e4976c146d1ae5e1fb5b49aaaef288d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6488 adding a 2nd \n to silence logs
Paul Poulain [Thu, 2 Feb 2012 14:21:25 +0000 (15:21 +0100)]
Bug 6488 adding a 2nd \n to silence logs

YAML don't like when you try to open a YAML file with just a \n. This patch add a 2nd \n to silence logs.
(cherry picked from commit 1f66e9fa691f9cfd705375450a21c623e0155f52)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_7190: Do not reverse writeoffs when item is returned
Srdjan Jankovic [Tue, 31 Jan 2012 02:36:44 +0000 (15:36 +1300)]
bug_7190: Do not reverse writeoffs when item is returned

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6b092f0e2784c3ea82f48fe8a6660d54a3fe6119)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7148 - Add some error handling to Acquisitions' Z39.50 search to match...
Owen Leonard [Thu, 3 Nov 2011 14:22:11 +0000 (10:22 -0400)]
Fix for Bug 7148 - Add some error handling to Acquisitions' Z39.50 search to match Cataloging's

- Copying over error handling for timeout(10007) and refused(10000)
- Copying over error handling for submission with no targets chosen
- Correcting "cancel" link in the template which was not modified
  when it was copied from cataloging's popup window template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7005 follow-up fix coding guidelines broken
Paul Poulain [Thu, 2 Feb 2012 11:04:55 +0000 (12:04 +0100)]
Bug 7005 follow-up fix coding guidelines broken
(cherry picked from commit abdef00248903539ea9836bb43b7edcf28fabd02)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7005: Writeoff all now has a confirmation dialog.
Aleksa Vujicic [Thu, 19 Jan 2012 02:01:19 +0000 (15:01 +1300)]
Bug 7005: Writeoff all now has a confirmation dialog.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fbfdfa2cc74ecec0255288977aea3ad66100d786)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6913: More options for koha-create and koha-remove
Jared Camins-Esakov [Sat, 8 Oct 2011 19:34:24 +0000 (15:34 -0400)]
Bug 6913: More options for koha-create and koha-remove

This commit makes koha-create more flexible by adding a number of command-line
and configuration options.

The biggest change is to add support for pre-determined MySQL credentials using
a file in /etc/koha/passwd (for security reasons, if you use this feature, make
sure the file is not world-readable). The configuration file has the following
format:
instance:user:password:database
The database is optional, but the other two are both required if you want to
specify MySQL credentials. If no credentials are specified for a given instance,
the standard koha_instance username and an auto-generated password are used.

The following additional command line options are now available:
* --use-db - use a pre-existing database, see also --database
* --database - specify the name of the mysql database (still defaults to
  koha_instance)
* --passwdfile - specify a custom (Koha) passwd file for MySQL credentials

The following additional variables are now available (for use in
koha-sites.conf or a custom config file):
* OPACPORT (previously added but not documented) - port on which the OPAC
  should be served
* OPACPREFIX - prefix for the OPAC's virtual host
* OPACSUFFIX - suffix for the OPAC's virtual host

This commit also adds the --keep-mysql option to koha-remove, which, if
specified, will prevent koha-remove from deleting the database or MySQL user
when removing an instance.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6913 - change how ports are handled by koha-create
Robin Sheat [Sun, 25 Sep 2011 23:04:13 +0000 (12:04 +1300)]
Bug 6913 - change how ports are handled by koha-create

This does two things:
* Allows OPACPORT to be specified to change the default OPAC port,
* removes the port number from the ServerName directive, as it's already
  handled by the VirtualHost declaration.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 44377378582a1cbe9b38858f81d33dd1480a195d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdding Jorgia Kelsey and Peter Lorimer as contributors
Paul Poulain [Thu, 2 Feb 2012 08:06:51 +0000 (09:06 +0100)]
Adding Jorgia Kelsey and Peter Lorimer as contributors
(cherry picked from commit f68d56bbab77d6330d8f657a3a3de508e0b1224d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6842 FU : library transfer limits edits not stored
Henri-Damien LAURENT [Thu, 22 Dec 2011 05:23:35 +0000 (06:23 +0100)]
Bug 6842 FU : library transfer limits edits not stored

Followup :
Changes the DeleteBranchTransferLimits signature :
one now needs to delete only the limits for ONE branch
(cherry picked from commit 54e6b44da956190bb555045e522e6ed6ce49229e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6842 Alternate fix, Branch transfer limits broken
Owen Leonard [Wed, 28 Dec 2011 16:41:16 +0000 (11:41 -0500)]
Bug 6842 Alternate fix, Branch transfer limits broken

The patch which moved the table pager markup into an
include undid the fix which was previously pushed for
this problem. Re-implementing the fix in the pager
include is a simpler fix which doesn't depend on
the Datatables plugin.

The markup change in table-pager.inc fixes the problem
in branch transfer limits and does not affect functionality
on other pages.

The changes in this patch to branch_transfer_limits.tt and
staff-global.css are for cosmetic reasons only.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Saving changes works now correctly. I tried:
- uncheck all for a branch
- check all for a branch
- making changes for different itemtypes on different tabs

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- backported to 3.6.x

12 years agoadding 3 contributors from catalyst OpenSource academy
Paul Poulain [Wed, 1 Feb 2012 17:23:16 +0000 (18:23 +0100)]
adding 3 contributors from catalyst OpenSource academy

they contributed tests
(cherry picked from commit 563fcd1fd11402d4644b20eef4dbe970ff92f544)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>