]> git.koha-community.org Git - koha.git/log
koha.git
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>
(cherry picked from commit 4160917c377b3d2d7637b2fbaa210a10447694a2)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating Version Number to 3.04.08.001
Chris Nighswonger [Mon, 20 Feb 2012 03:22:54 +0000 (22:22 -0500)]
Updating Version Number to 3.04.08.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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- backported to 3.4.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>
(cherry picked from commit fa3a2cbedb24e793bf7ffd1ee8a3deff49010c9e)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
(cherry picked from commit 6c0eaa0f47b98317a2ee84e5ce1ce2b835214149)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 - move another test around
Robin Sheat [Wed, 1 Feb 2012 00:52:53 +0000 (13:52 +1300)]
Bug 5327 - move another test around
(cherry picked from commit 8aacb28fc02323367f33f96ca83730342fda97ea)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 316dc62867d7e7110a51775195e7d4e7dc0ff53b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Shifting a db dependent test to the right place
Chris Cormack [Mon, 30 Jan 2012 23:48:13 +0000 (12:48 +1300)]
Bug 5327: Shifting a db dependent test to the right place

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(cherry picked from commit 227cafe8c2d7fd321c77a807d1196f43d5ba450a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e0612c01d923d13f15acde7ed34a8352ab0b19c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 6631 follow-up adding author in contributors list
Paul Poulain [Wed, 1 Feb 2012 16:56:42 +0000 (17:56 +0100)]
bug 6631 follow-up adding author in contributors list
(cherry picked from commit 4cb60dbbe21a58d62c66908a600fce5d306601fd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 8c3ea52ded9cfb105e79b5add88afc2f6255a64d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6631: Anonymous users can create lists in OPAC
Aleksa Vujicic [Tue, 24 Jan 2012 01:09:34 +0000 (14:09 +1300)]
Bug 6631: Anonymous users can create lists in OPAC

Made opac-addbybiblionumber.pl page require authentication.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit bf29ff10d353f054388a45d5f7840d322e42d7ba)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6539 follow-up, fixing wrong indentation
Paul Poulain [Wed, 1 Feb 2012 16:51:05 +0000 (17:51 +0100)]
Bug 6539 follow-up, fixing wrong indentation
(cherry picked from commit 64da5af31d76471b9552df0366d71db742fdb84c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit aa2d2fd7cc512655ec2c61d80f9a928a7b22efbc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6539 - When searching the catalogue, if I get no results then hit the Z39.50...
Peter Lorimer [Thu, 30 Jun 2011 08:47:55 +0000 (09:47 +0100)]
Bug 6539 - When searching the catalogue, if I get no results then hit the Z39.50 search the title field in the pop up window is populated with what I searched for.

If I search for a valid ISBN number and hit the Z39.50 search, the title field
is populated with the ISBN number I searched for. This number should populate
the ISBN field and not the title field.

http://bugs.koha-community.org/show_bug.cgi?id=6539
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- Search new ISBN using ISBN search from advanced search page
- 0 results - click on Z39.50 search
- Z30.50 form will have your ISBN in ISBN search option

I am signing off on this, because it's an improvement over the current
behaviour.

I see some  problems though that should perhaps be addressed in a separate
bug or as a follow-up:

If you use th catalog search field and search for an ISBN or
a keyword the right fields of the Z39.50 search form will be populated, but
the search index will be put in front:

ISBN: kw,wrdl: 9783492251495
or
Title: kw,wrdl: koha testing

If you search for ISBN as keyword on the advanced search page, it will
still populate the Title search.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22aed769a69fd3b6d1864889d9f63406d92052f9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit aaf019a020454537f90fd2770025a8e9580321ca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6210 - Follow up, Choose framework on merge
Owen Leonard [Tue, 24 Jan 2012 15:44:11 +0000 (10:44 -0500)]
Bug 6210 - Follow up, Choose framework on merge

- Adding subtitle to the display of titles to be merged
- Adding a link to preview the MARC record of titles to be merged
- Fixing up markup of form to improve appearance
- Correcting breadcrumbs

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 8b3bb800dd4fcf3107ae261ac5edeb634c6ade9e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_6210: Select framework if merging two records with different frameworks
Srdjan Jankovic [Mon, 19 Dec 2011 06:22:49 +0000 (19:22 +1300)]
bug_6210: Select framework if merging two records with different frameworks

ModBiblio() - set framework to "" if "Default"

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

Test 1:  Merge two records with the same framework
    Desired result:  shouldn't get any prompting to pick a framework, and the
same framework should be used

    Test 2:  2 records, different frameworks, into the kept record's framework
    Desired result:  merge with kept records framework used

    Test 3:  2 records, different frameworks, into the discarded record's
framework
    Desired result:  merge with used records framework used

    Test 4:  2 records, different frameworks, into a third framework
    Desired result:  merge with third framework used
(cherry picked from commit 91d870f67aa4b6a4784794e77304fcf759675184)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 9f99173ac4aa389ad969f5d8f444e992c4db68a5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_6488: Take in account opachiddenitems when searching in opac
Srdjan Jankovic [Mon, 23 Jan 2012 04:04:02 +0000 (17:04 +1300)]
bug_6488: Take in account opachiddenitems when searching in opac

Changed searchResults() interface
Added trailing \n when parsing OpacHiddenItems to make YAML happy
XSLTParse4Display() and buildKohaItemsNamespace() take hidden
items as input param
Removed numbering from the search results, looks wrong with
hidden items

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 58edcf7ab7b4b8f460c32f8730e225577829d911)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added tests for C4/Languages.pm
Sam Sanders [Thu, 19 Jan 2012 01:15:45 +0000 (14:15 +1300)]
Bug 5327 added tests for C4/Languages.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit a0c1414f6d7e431dd0c6bc55f0dd11b55951df81)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit ed9eac7dd095ab238960199bff6e9c6821ccb923)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 Added unit tests for C4/SIP/ILS/Transaction/Renew.pm
Connor Dewar [Wed, 18 Jan 2012 02:33:43 +0000 (15:33 +1300)]
Bug 5327 Added unit tests for C4/SIP/ILS/Transaction/Renew.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 597fabf4f474c52d0c9fc3f9fa9ce0267f6e04e2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit bb06b9ac1b40cccced78716fda40d412b126b36c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/Search_PazPar2.pm
Kate Henderson [Wed, 18 Jan 2012 22:24:00 +0000 (11:24 +1300)]
Bug 5327 added unit tests for C4/Search_PazPar2.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 66fecdd798fa499e9184c5b70b252d36f4b64235)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 91aab0fddf3847814b5b431fbf2ff6719f65057d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/Scheduler.pm
Kate Henderson [Thu, 19 Jan 2012 01:29:53 +0000 (14:29 +1300)]
Bug 5327 added unit tests for C4/Scheduler.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 1e2e7b9dd8614dd7729ecdebb6b6c99ad52d602a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit a36582632d01340e7943fdd1dc4a0608b9a04609)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 5327 added unit tests for C4/Ris.pm
Sam Sanders [Wed, 18 Jan 2012 02:38:52 +0000 (15:38 +1300)]
bug 5327 added unit tests for C4/Ris.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 0618b9db72b548a962c5e235397e1cdb6feb0f13)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 88aee70187719efdc6fb72f1ac269bd48303f81f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/Creators/PDF.pm
Jono Mingard [Thu, 19 Jan 2012 01:31:57 +0000 (14:31 +1300)]
Bug 5327 added unit tests for C4/Creators/PDF.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit e81cbd7fe0064519fa86f96b2dc4a7800b5e3c67)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit cbccfdbb614307d84ccdb24a3af019ac8cef0d9c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/ClassSortRoutine/LCC
Sam Sanders [Tue, 17 Jan 2012 20:39:55 +0000 (09:39 +1300)]
Bug 5327 added unit tests for C4/ClassSortRoutine/LCC

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 200b5a8231d800a5bec0e57a5cdd0030aa248f75)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 2d113b93033441da28caacaf46a5d4503bb6072d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/Barcodes_PrinterConfig.pm
Jorgia Kelsey [Wed, 18 Jan 2012 23:30:05 +0000 (12:30 +1300)]
Bug 5327 added unit tests for C4/Barcodes_PrinterConfig.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 1a20feb4caa812d49eb8861b06ebc81164ea66c1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit dbf3a3df34183f9baaf6d19957378ead9de291f5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/AuthoritiesMarc/MARC21.pm
Jono Mingard [Wed, 18 Jan 2012 22:03:59 +0000 (11:03 +1300)]
Bug 5327 added unit tests for C4/AuthoritiesMarc/MARC21.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 5579abe41f5ab6ce04761545efe1d423faa037d6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 675315473aa0b1b98fc2b7a1c5a9e5aae3c0ec7c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added tests for C4/Labels.pm
Sam Sanders [Thu, 19 Jan 2012 00:53:15 +0000 (13:53 +1300)]
Bug 5327 added tests for C4/Labels.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 3b9722c7dd08009a7baabdb84ad108462a1ba3c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 60bf1f05945dd010014233c9f070c404b33c67a4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 5327 added unit test for C4/Csv.pm
Sam Sanders [Thu, 19 Jan 2012 03:18:48 +0000 (16:18 +1300)]
bug 5327 added unit test for C4/Csv.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit f918c57e89d7dcc2ce0f824e54ca3285fc511f69)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 329e39b8cc35cff1501cb175e1b43f32a9c17467)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7460: Add template toolkit's FILTER html_line_break on opac details description...
Stéphane Delaune [Mon, 23 Jan 2012 15:06:47 +0000 (16:06 +0100)]
Bug 7460: Add template toolkit's FILTER html_line_break on opac details description's tab

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 8cfa7e1835f23a31d0ec08980da11a4627935f38)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7446: Redundant display of availablecount in results.tt in staff client.
D Ruth Bavousett [Sun, 15 Jan 2012 15:51:30 +0000 (07:51 -0800)]
Bug 7446: Redundant display of availablecount in results.tt in staff client.

This tiny patch removes a redunant display.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 8694b540e143918d10fea13fb015807edc038e54)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3806 - Holidays table doesn't order by date correcly
Owen Leonard [Tue, 6 Dec 2011 20:09:27 +0000 (15:09 -0500)]
Bug 3806 - Holidays table doesn't order by date correcly

Adding dateformat filter to JavaScript tablesorter
configurations.

Follow-up adds a custom date parser for dates without year ("01/10")

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested yearly repeatables under Calendar for all three date formats.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit c52d62d92a8b67635402b8a1731bddc88e496f37)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7350: In neworderempty.pl duplicating an item does not preserve select box selections
Christophe Croullebois [Sat, 10 Dec 2011 17:39:37 +0000 (18:39 +0100)]
Bug 7350: In neworderempty.pl duplicating an item does not preserve select box selections

cloneNode() does not preserve select box selections, I have created a function to duplicate them : "clone_with_selected".
It is included in "cloneItemBlock", that's all.
Now the values selected in ddl are duplicated as the imput-texts are.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit d3462cdf803bde0a2aeaf3ec16a5b90e596a25b9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago7367 Removing reintroduced debugging statement from Auth.pm
Marcel de Rooy [Mon, 23 Jan 2012 13:18:50 +0000 (14:18 +0100)]
7367 Removing reintroduced debugging statement from Auth.pm

Commit 07d1eae7ccf5c8746251b666b6460440ecc26204 removed this statement from the module, but some months later commit 7b12e07d3ba44530d7ba33d09de01afef46bbfc7 reintroduced it again while reindenting code ;)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 9c0ce2bf3b01948b371c2389f958ba981a036031)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4235bb17e89c0f1072cc6b894f51c1590ef27857)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7157 follow-up: j2a.pl executable again
Paul Poulain [Fri, 27 Jan 2012 11:18:25 +0000 (12:18 +0100)]
Bug 7157 follow-up: j2a.pl executable again

This patch just update the permission of the script, that must be executable
(cherry picked from commit e8b83c665a9e419158369079381865ae5fb5d0af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit a616321929026e67feffd7ba85015fd31adcbb76)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7157 - Improve the j2a.pl cronjob
Liz Rea [Fri, 4 Nov 2011 18:20:23 +0000 (13:20 -0500)]
Bug 7157 - Improve the j2a.pl cronjob

- Calculates updates date based on the upper age limit defined in the patron categories.
- Allows libraries to work on all branches or only one.
- Allows libraries to specify which Adult patron category to update child categories to.
- Allows libraries to specify a single Child patron category to update to an adult category.
- Has a test mode to display what transforms would be done on the database without executing the changes.

Includes improved help, copyright statement, and uses warnings. Also incorporates Paul's suggestions regarding --help and --man, changes -fromcat and -tocat to -f and -t, and removes a redundant update to categorycode (per M. deRooy).

To test:

Create two patron categories, a child and an adult category. Make sure they
have an upper age limit.

Create or modify some patrons in multiple branches that fall into the category
of "my birthdate is less than or equal to today's date minus the upper age
limit"

1. Run the script with no flags - nothing should  happen, it will suggest you try the --help flag.
2. Run the script with the --help flag - you should see the help
3. Run the script with the -f=<child category> -t=<adult category> -v -n - should show you results from all branches but take no action and tell you what its computations are.
4. Run the script with the -f=<child category> -t=<adult category> -b=<branchcode> -v -n - should show you results from your specified branch, but take no action and tell you what it's computations are.
5. Run the script with the -f=<child category> -t=<adult category> -v -b=<branchcode> - should show you the computations and tell you how many patrons were modified in your single branch. It will not show you the information on which patrons were updated.
6. Run the script with the -f=<child category> -t=<adult category> -v - should show you the computations and tell you how many patrons were modified across all branches.
7. Run the script without the -v flag, if you care what the non-verbose output looks like.

Fixed in this revision: Known limitation - if you give it an unknown tocat, it will fail with a rather ugly error.

Minor changes to the commit message to reflect new longopts (which I missed the last time)
There is more this script could do, please feel free to take it and run.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 7157 : Follow up, fixing FSF address

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fe1a642a1a06c38b55c2666ead4f4ff4ea3658da)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 14396956c96d632cfd6d3de141c84eead58b0f63)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6752: Be stricter with utf-8 encoding of output
Colin Campbell [Wed, 6 Jul 2011 07:24:28 +0000 (08:24 +0100)]
Bug 6752: Be stricter with utf-8 encoding of output

use encoding(UTF-8) rather than utf-8 for stricter
encoding
Marking output as ':utf8' only flags the data as utf8
using :encoding(UTF-8) also checks it as valid utf-8
see binmode in perlfunc for more details
In accordance with the robustness principle input
filehandles have not been changed as code may make
the undocumented assumption that invalid utf-8 is present
in the imput
Fixes errors reported by t/00-testcritic.t
Where feasable some filehandles have been made lexical rather than
reusing global filehandle vars

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 960da426a876891a04523c11239ccd04e85c6676)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agohistory.txt removing a useless tab
Paul Poulain [Tue, 24 Jan 2012 10:02:08 +0000 (11:02 +0100)]
history.txt removing a useless tab
(cherry picked from commit 572233de4a0148b2140650abf5401bd0bf16612a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e26279c11dc499cf0b43cfa8e950ffe412ab5919)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6350 - Adding new developers to history.txt Jesse Maseto Connor Dewar Sam Sanders
Liz Rea [Tue, 17 Jan 2012 21:30:31 +0000 (15:30 -0600)]
Bug 6350 - Adding new developers to history.txt Jesse Maseto Connor Dewar Sam Sanders

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit c0744f9e57e7c78222cfe8c9764396823c76c57d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7343 - Fix empty values in statistic 1 and 2 dropboxes in neworderempty
Alex Arnaud [Fri, 20 Jan 2012 09:02:16 +0000 (10:02 +0100)]
bug 7343 - Fix empty values in statistic 1 and 2 dropboxes in neworderempty

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Comments have been incorporated. Marked as Passed QA.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 77c1513408c4afc00b97b655c82d28717a064fc8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7098: Adds koha_url elements to sco.css.
Garry Collum [Fri, 20 Jan 2012 17:24:27 +0000 (12:24 -0500)]
Bug 7098: Adds koha_url elements to sco.css.

The 'Powered by Koha' link was not styled in self-cko.  The koha_url elements were missing from sco.css.  The elements within opac.css were copied and added to sco.css.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit d39fb1ff429fade599d172cdee02a21eb09cf074)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6829 Follow up
Marcel de Rooy [Thu, 5 Jan 2012 13:45:06 +0000 (14:45 +0100)]
6829 Follow up

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Needed this second follow up to remove 952-0 from the display again, coming up after the first follow up.
Changed a second test in accordance with first follow up.
Removed a useless 10th loop to create a tab10XX that is not in the template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 16f466ea78307bf60de9dd6a48991cd9e0ac7e80)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6829 Follow up patch
Frédéric Demians [Tue, 27 Dec 2011 10:01:48 +0000 (11:01 +0100)]
Bug 6829 Follow up patch

To reproduce the bug:

- Open OPAC MARC View for a specific biblio record
- Fields which are affected to tab 0 are all hidden

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes bug for 0xx fields in OPAC MARC view.
Note: the problem only exists for 0xx fields with real subfields,
control fields display correctly, fields like 040 only display
after patch was applied.
(cherry picked from commit 263e5724eb1c9f1e787474ec92403179496c03b4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit a0080586e4582ab26ea599965eb71bd3ae5d8908)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6790: Remove unnecessary variable from getroutinglist return
Colin Campbell [Fri, 26 Aug 2011 15:17:11 +0000 (16:17 +0100)]
Bug 6790: Remove unnecessary variable from getroutinglist return

getroutinglist returns a count variable to indicate how many elements
are in the array. This is almost always a serious code smell. (We are
programming in a list manipulating language) The routine was executing
am unnecessary loop just to maintain that var.
Removed the variable from the routine and perldoc
refactored calls of the routine removed the c-style loops for
more idiomatic and maintainable for loops
renamed some opaquely named variables
removed a call to the routine where nothing was done with the data
moved some html out of the calling script and into the template

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d2c24f3bbff5c3ba96ce5ae8baa2313fabf786d5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 5bed69ff231b9a9a3aca0128fd789c10cd47b1ba)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5473 follow-up : removed warn & replace some tabs by 4 spaces
Paul Poulain [Fri, 20 Jan 2012 15:30:48 +0000 (16:30 +0100)]
Bug 5473 follow-up : removed warn & replace some tabs by 4 spaces
(cherry picked from commit f961638465cf1fc41b15a6c277e3c936ec02ab6e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 5e32902941c60f6b22e1c95d52fbe211407b7a87)

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