]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoUse MARCAuthorityControlField008 in AddAuthority for empty 008s
Frédérick Capovilla [Thu, 20 Oct 2011 16:05:02 +0000 (12:05 -0400)]
Use MARCAuthorityControlField008 in AddAuthority for empty 008s

The old default value for field 008 didn't have the correct length,
which could potentially cause data corruptions.

Uses the MARCAuthorityControlField008 preference added by BUG4839.

http://bugs.koha-community.org/show_bug.cgi?id=7072
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6408547cc0d396c8b9d29e1f7617637d9c12a9a6)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoTest to check for XXX in kohaversion.pl or updatedatabase.pl
Chris Cormack [Mon, 8 Aug 2011 21:45:00 +0000 (23:45 +0200)]
Test to check for XXX in kohaversion.pl or updatedatabase.pl

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended the original patch of Chris to add two exceptions for a line in SetVersion and TransferToNum.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6700: Better handling of version numbers in updatedatabase
Marcel de Rooy [Thu, 30 Jun 2011 07:34:23 +0000 (09:34 +0200)]
6700: Better handling of version numbers in updatedatabase

Contains a few lines of code for updatedatabase routines SetVersion and TransformToNum in order to facilitate testing new db revisions which are still marked XXX.
Currently, the XXX as added in a proposed patch generates an error in the version compare. Additionally, running SetVersion while testing the upgrade is annoying and not needed. In testing stage you would like to keep your version number as is. The version number should of course be incremented when the patch is pushed. A simple test accomplishes that.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c8982e1ab41ef54ba66afd3ed313e81cde307004)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6193 - Use memcached cache koha-conf.xml configuration variables
Tomas Cohen Arazi [Thu, 14 Apr 2011 17:40:21 +0000 (14:40 -0300)]
Bug 6193 - Use memcached cache koha-conf.xml configuration variables

Basically I add some code to Context.pm so it stores koha-conf.xml config vars
in memcached server. It is arguable whether this is an improvement or not,
tests are needed to conclude something about this.

Error handling was an issue with Cache::Memcached, I tried to do it the
simplest I could.

Note: As it was pointless to read the xml file to get the memcached
server info for accessing them for retreiving the info in the koha-conf.xml
file... I passed those values through apache's SetEnv. These variables
are set acordingly through the install scripts and commented out if koha
was setup not to use it.

Bug 6193 - Properly comment the code

Required by slef.

Regards
To+

Signed-off-by: Federico Rinaudo <frinaudo@infocpt.com.ar>
Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22dca58cbad64841fb12a6e48afa50500c1a5c60)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6880- Reason for suggestions do not save
Owen Leonard [Wed, 26 Oct 2011 18:17:52 +0000 (14:17 -0400)]
Bug 6880- Reason for suggestions do not save

The fix for Bug 1883 seems to have lacked the necessary
update to the database to add the "patronreason" column
to the suggestions table. This patch does so.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch adds database update and change to kohastructure.
After this patch is applied, the patron's reason for
making a suggestion (form in opac) is saved to the database
correctly. The reason is also shown in the detail view
of the suggestion.

Backporting to 3.6.x

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Backporting to 3.4.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch
Owen Leonard [Tue, 23 Aug 2011 19:33:34 +0000 (15:33 -0400)]
Fix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch

Plus several other fixes for this report no one uses:

- Clarifying titles and breadcrumbs
- Correcting terminology: branch -> library
- Sorting library select field by library name
- Displaying library name instead of code on output
- Sorting results by itemtype description
- Adding tablesorter to results

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 2307 - Calendar widget cannot be translated
Owen Leonard [Tue, 6 Dec 2011 16:09:46 +0000 (11:09 -0500)]
Bug 2307 - Calendar widget cannot be translated

Implementing the same fix in the OPAC which we now
use in the staff client.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7226 - can't add tags on list
Owen Leonard [Tue, 6 Dec 2011 14:53:05 +0000 (09:53 -0500)]
Bug 7226 - can't add tags on list

Incorrect check for TagsInputOnList was preventing the
right JavaScript from being triggered, and markup was
nested inside the wrong logic for the confirmation
message to be displayed consistently.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6302 follow up
Marcel de Rooy [Wed, 14 Dec 2011 14:54:22 +0000 (15:54 +0100)]
6302 follow up

Updates to_address in message queue when sending an email (when needed).

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2ab11c4892f87c054df02763804e34f070d931e1)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6302: Separate AutoEmailPrimaryAdress and AutoEmailOpacUser
Katrin Fischer [Fri, 2 Dec 2011 06:53:18 +0000 (07:53 +0100)]
Bug 6302: Separate AutoEmailPrimaryAdress and AutoEmailOpacUser

AutoEmailPrimaryAddress is not only used for the patron account mails, but
also for overdues and other email notices to patrons.

This patch separates the system preferences in the system preference editor.

To test:
- Check Patrons tab shows both system preferences separated
- Check you can still change the settings

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
(cherry picked from commit a5a8d78f0d54acd7606477774d5e94cfcac66e9a)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 : Followup 2. several letters where generated if a borrower had overdues...
Sophie Meynieux [Tue, 30 Aug 2011 14:54:42 +0000 (16:54 +0200)]
Bug 6292 : Followup 2. several letters where generated if a borrower had overdues with different due_date triggering the same level

This patch fixes the SQL request giving the list of borrowers

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 : Overdue notices not being generated when borrower had an overdue older...
Chris Cormack [Tue, 3 May 2011 00:13:28 +0000 (12:13 +1200)]
Bug 6292 : Overdue notices not being generated when borrower had an overdue older than the max value of the notice triggers

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 410975a7f777123d255854ecf3d31541b86ff848)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 followup
Sophie Meynieux [Fri, 12 Aug 2011 14:04:13 +0000 (16:04 +0200)]
Bug 6292 followup

selection of items to be listed in an overdue notice included
both limits (upper and lower). So items with an overdue equal
to a limit appeared on both notices. This patch fix this,
including lower limit and excluding upper limit for the selection.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit d86d62adba7f898db26dc58e909f2b91db3248b0)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_2830: Remove reserve when checking out if the borrower is not the first one in...
Srdjan Jankovic [Thu, 13 Oct 2011 03:57:41 +0000 (16:57 +1300)]
bug_2830: Remove reserve when checking out if the borrower is not the first one in the reserve queue

To test:
Create 4 holds on a bib, for patrons A, B, C, and D,

Check in the item to mark hold as waiting for patron A
Check out the item to patron B -> reserve for patron B should be removed
Check in the item to mark hold as waiting for patron A
Check out the item to Patron A, hold should complete normally
Check in the item to mark hold as waiting for patron C
Check out the item to patron D -> reserve for patron D should be removed.
Check in the item to mark hold as waiting for patron C
Check out the item to patron C, hold should complete normally
Check in the item -> there should be no more reserves.

We also tested:
Created 4 holds on a bib with two items, for patrons A, B, C, and D

All worked as expected.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7361 Fix default option in encoding dropdown
Duncan Tyler [Thu, 15 Dec 2011 00:51:21 +0000 (13:51 +1300)]
Bug 7361 Fix default option in encoding dropdown

http://bugs.koha-community.org/show_bug.cgi?id=7361
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This patch changes the pull down for encodings in staged marc import.

Before patch:
- Character encoding preselected was 'Default'
- 'Default' broke diacritics in utf-8 encoded files and was reported
  to not work correctly
- Selecting 'UTF-8' from the drop down worked

After patch:
- Character encoding preselected is 'UTF-8 (Default)'
- There is no longer a 'Default' option and no separate 'UTF-8'

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7349: corrects sort order for Patron search
Adrien Saurat [Tue, 13 Dec 2011 15:01:45 +0000 (16:01 +0100)]
Bug 7349: corrects sort order for Patron search

Sorting by cardnumber now works (removed a client-side
sort, the server-side sort is enough).

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
1) Verified that before applying this patch, when searching patrons with cardnumber as order by preference, patrons are sorted ny name.
2) Verified that after applying this patch, when searching with cardnumber as order by preference, patrons are correctly sorted by cardnumber.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm
Duncan Tyler [Wed, 14 Dec 2011 03:42:30 +0000 (16:42 +1300)]
Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7319 - Improving title and breadcrumbs on acquisitions Z39.50 search pages
Owen Leonard [Mon, 5 Dec 2011 14:32:07 +0000 (09:32 -0500)]
Bug 7319 - Improving title and breadcrumbs on acquisitions Z39.50 search pages

Changing title and breadcrumbs so that they correctly reflect
the curent stage of the process.

To test: Add to an order from an external source. When filling
out the Z39.50 search form the title and breadcrumbs should read
"Order from external sources." After searching they should read
"Order from external sources -> Search results"

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7324: Show alternate email as mailto: / hide labels when field is empty
Katrin Fischer [Tue, 6 Dec 2011 17:45:33 +0000 (18:45 +0100)]
Bug 7324: Show alternate email as mailto: / hide labels when field is empty

UPDATE 2011-12-15
Fixed wrong div that broke the patron account display.
Thank you Paul for catching this!

Changes made to the patron detail tab:
- alternate email shows as mailto: link

- labels for following fields only show when field is filled
  - initials
  - date of birth
  - gender
  - country (alternate address)
  - email (alternate address)
  - state (alternative contact)
  - country (alternative contact)
  - phone (alternative contact)

To test:
1) Add new patron with minimal data and check the labels don't show
2) Change patron to have data in changed fields and check labels show
3) Check all email addresses are shown as mailto: links now

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified tests 1-3, looks good to me.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agowelcome to Marc Balmer, #167
Paul Poulain [Thu, 15 Dec 2011 17:37:39 +0000 (18:37 +0100)]
welcome to Marc Balmer, #167
(cherry picked from commit 42d6b17851626c547481438138ebc592177c4e75)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBail out early if an invalid language is used.
Marc Balmer [Sun, 11 Dec 2011 14:40:55 +0000 (15:40 +0100)]
Bail out early if an invalid language is used.

Signed-off-by: Marc Balmer <marc@msys.ch>
http://bugs.koha-community.org/show_bug.cgi?id=7346
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d9f7922ad77406939a5f57a22e9a6474e4c328d3)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7333 - modifying Members.t to use a branchcode that exists in the sample data
Liz Rea [Wed, 7 Dec 2011 22:32:11 +0000 (16:32 -0600)]
Bug 7333 - modifying Members.t to use a branchcode that exists in the sample data

To test:
Create a fresh koha db with all of the sample data (if you have one that has the sample branches in it, that will work too)
run the test: prove t/db_dependent/Members.t

All subtests should complete.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests complete successfully with my database created from
sample data and with the database provided on the bug.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7331 - Circulation.pl generates errors in the log
Duncan Tyler [Thu, 8 Dec 2011 01:11:43 +0000 (14:11 +1300)]
Bug 7331 - Circulation.pl generates errors in the log

Fixed error in C4::Dates causing unneeded warnings

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7330 - System preferences editor generates errors in the log with each search
Owen Leonard [Wed, 7 Dec 2011 15:50:06 +0000 (10:50 -0500)]
Bug 7330 - System preferences editor generates errors in the log with each search

Adding a check for an empty value in a couple of places
which seem to always get one.

As far as I can tell these places in the script are looping
over ALL the data in the pref files, and sometimes an empty
value comes through. I wonder if this is because of a minor
syntax error in the pref file?

My correction is a stab in the dark since I haven't determined
where the empty value is actually coming from. This change
quiets the errors in the log and doesn't seem to affect
preference search results.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
No more messages in the logs. Yay!

Ran unit tests on this (t, xt/author, xt, t/db_dependent)- nothing out of the ordinary in any.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7326: longoverdue.pl hardcoded to 366 days maximum
Ian Walls [Wed, 7 Dec 2011 00:12:04 +0000 (19:12 -0500)]
Bug 7326: longoverdue.pl hardcoded to 366 days maximum

Adds --maxdays command line flag to longoverdue.pl to allow the user to specify
their own $endrange value.  Because sometimes 366 isn't enough!

Also adds help documentation for both --quiet and --maxdays params

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Simple change, works well

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7325 - Editing a list generates errors in the log
Owen Leonard [Tue, 6 Dec 2011 21:03:31 +0000 (16:03 -0500)]
Bug 7325 - Editing a list generates errors in the log

Checking for variables before trying to use them in
building the pagination menu

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7323 - Javascript error when editing list
Owen Leonard [Tue, 6 Dec 2011 16:43:10 +0000 (11:43 -0500)]
Bug 7323 - Javascript error when editing list

Correcting check for empty shelf name to prevent
javascript error.

Also correcting unescaped ampersand.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7321: Silence some warns in Koha.pm
Katrin Fischer [Mon, 5 Dec 2011 20:52:44 +0000 (21:52 +0100)]
Bug 7321: Silence some warns in Koha.pm

While testing bug 7013 I noticed a lot of warns in the koha error log.
This patch is silencing them.

To test:
Add or edit an authorised value and check your log files before and after
applying the patch.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7313: Untranslatable strings in 'Search to hold' feature
Katrin Fischer [Sat, 3 Dec 2011 08:55:44 +0000 (09:55 +0100)]
Bug 7313: Untranslatable strings in 'Search to hold' feature

Changed the javascript to include markup for translation _(...) in result
list and detail page tool bars.

Also changed the text shown for each result to match the text in the toolbar
to make things more consistent.

To test:
- Apply patch
- Run "perl translate update <your language code>"
- Open .po file for staff and check for "Place hold on" and "Forget"
- Translate those
- Run "perl translate install <your language code>"
- Activate "Search for hold" feature in patron account
- Do a search and check tool bar on top of result list
- Check link text shown in result list
- Check detail page

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm"
Paul Poulain [Thu, 15 Dec 2011 15:14:35 +0000 (16:14 +0100)]
Revert "Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm"

This reverts commit 06c822c37ce91e5936542990d7e3299e14271bd3.
(cherry picked from commit 8df873c1a298d9c7e4283372201466d28fa1a784)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"
Paul Poulain [Thu, 15 Dec 2011 15:11:47 +0000 (16:11 +0100)]
Revert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"

This reverts commit 18bb9c22100ba810944a1341a891bc5b2e765255.
(cherry picked from commit 746deb51279c01176442220a21f7174dc65ff77d)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm
Duncan Tyler [Wed, 14 Dec 2011 03:42:30 +0000 (16:42 +1300)]
Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded missing reference case to Boolean.t and corrected count
Chris Hall [Wed, 7 Dec 2011 20:34:36 +0000 (09:34 +1300)]
Added missing reference case to Boolean.t and corrected count

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agowelcome to Duncan Tyler, developer 166 !
Paul Poulain [Thu, 15 Dec 2011 12:45:21 +0000 (13:45 +0100)]
welcome to Duncan Tyler, developer 166 !
(cherry picked from commit e60e1cba00ae406942ecdfb6975dd30242420480)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded missing reference case to Boolean.t and corrected count
Chris Hall [Wed, 7 Dec 2011 20:34:36 +0000 (09:34 +1300)]
Added missing reference case to Boolean.t and corrected count

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Patch removes unneeded self=shift from TTParser::unshift_token
Chris Hall [Thu, 8 Dec 2011 22:04:19 +0000 (11:04 +1300)]
Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token

Removed  unneeded self=shift from unshift_token
(as peek and next do not take a self, makes interface more consistent)

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 18bb9c22100ba810944a1341a891bc5b2e765255)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit tests for Scrubber
Duncan Tyler [Thu, 8 Dec 2011 21:19:14 +0000 (10:19 +1300)]
Added unit tests for Scrubber

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit test for AuthoritiesMarc/UNIMARC.pm
Duncan Tyler [Thu, 8 Dec 2011 19:52:34 +0000 (08:52 +1300)]
Added unit test for AuthoritiesMarc/UNIMARC.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit tests for Sip Checksum.pm
Duncan Tyler [Thu, 8 Dec 2011 01:38:28 +0000 (14:38 +1300)]
Added unit tests for Sip Checksum.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

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

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet
Magnus Enger [Fri, 2 Dec 2011 16:08:44 +0000 (16:08 +0000)]
Bug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet

Adds two files, to enable XSLT for the detail view in the intranet:
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl

To test:
- Set sysprefs: marcflavour = NORMARC and XSLTDetailsDisplay = "using XSLT stylesheet"
- Make sure OPACBaseURL is set correctly
- Check that detail display looks ok
- Check that automatic links for author, subjects etc work
- Check that the "Open in new window" link works as expected
- Empty the OPACBaseURL syspref and check that "Open in new window" does not display

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Great test plan, could reproduce problem and can confirm patch fixes it.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7287 : Fix overdue notification if a branch given as parameter does not have...
Sophie Meynieux [Fri, 2 Dec 2011 09:04:25 +0000 (10:04 +0100)]
Bug 7287 : Fix overdue notification if a branch given as parameter does not have rules

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7275 - Pagination lost when click in the option "Show more" of facets column
Juan Romay Sieira [Tue, 29 Nov 2011 09:17:26 +0000 (10:17 +0100)]
Bug 7275 - Pagination lost when click in the option "Show more" of facets column

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7270: Removing double itemtype on shelve contents page when no icon is shown
Marcel de Rooy [Wed, 30 Nov 2011 15:42:19 +0000 (16:42 +0100)]
Bug 7270: Removing double itemtype on shelve contents page when no icon is shown

Just adding a check on imageurl in the template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7262 - No calendar present in holidays module when there are quotes in title...
Juan Romay Sieira [Thu, 24 Nov 2011 17:01:05 +0000 (18:01 +0100)]
Bug 7262 - No calendar present in holidays module when there are quotes in title or description

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nice patch, making use of the Template::Toolkit filters

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7239 fix to avoid error being thrown even though a record is created
Chris Hall [Tue, 6 Dec 2011 03:03:59 +0000 (16:03 +1300)]
bug 7239 fix to avoid error being thrown even though a record is created

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
When creating an item in acquisitions while ordering and not filling out
any fields, there is no longer shown a perl error message.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7227, "Delete all items" action should redirect to the detail view
Owen Leonard [Tue, 15 Nov 2011 16:50:40 +0000 (11:50 -0500)]
Fix for Bug 7227, "Delete all items" action should redirect to the detail view

Using the delete all items function should now redirect back to the
biblio view specified in the BiblioDefaultView system preference.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7135 - in addbiblio, make save button floating to have it on always on screen
Owen Leonard [Tue, 13 Dec 2011 19:37:32 +0000 (14:37 -0500)]
Bug 7135 - in addbiblio, make save button floating to have it on always on screen

Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7202 - z39.50 search on bib edit not working
Owen Leonard [Fri, 2 Dec 2011 20:14:58 +0000 (15:14 -0500)]
Bug 7202 - z39.50 search on bib edit not working

The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7197 - add a Spanish readme file to the packages
Robin Sheat [Wed, 23 Nov 2011 05:39:25 +0000 (18:39 +1300)]
Bug 7197 - add a Spanish readme file to the packages

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch
(cherry picked from commit 373e49576d023c24e1b649f0a5c2a2570f4bb80f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 follow-up history.txt and perlcritic compliance
Paul Poulain [Wed, 14 Dec 2011 14:10:28 +0000 (15:10 +0100)]
Bug 7164 follow-up history.txt and perlcritic compliance

* in history.txt, added a tab for Stephane Delaune, for display consistency
* fixed a small mistake in about.pl that was resulted in a perlcritic failure
(cherry picked from commit 82ed4696321df9b3f4e16b759b1e1a083a5c5e28)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 minor follow-up
Paul Poulain [Wed, 14 Dec 2011 13:49:22 +0000 (14:49 +0100)]
Bug 7164 minor follow-up

tab for Stephane Delaune, for display consistency

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 - add Koha history timeline tab to 'About' page
Mason James [Sat, 5 Nov 2011 10:28:48 +0000 (23:28 +1300)]
Bug 7164 - add Koha history timeline tab to 'About' page

Includes follow up by Chris Cormack fixing formatting in docs/history.txt

[MINOR EDIT] Added html filter to output for validity's sake

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
(cherry picked from commit 6bc414a3d418cd5255a178271207121f3cb9878a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7160: paying fines throws error
Ian Walls [Sat, 5 Nov 2011 03:28:31 +0000 (23:28 -0400)]
Bug 7160: paying fines throws error

The call to ReturnLostItem in C4/Accounts was not properly namespaced to
come from C4::Circulation.  That prefix is added to the call.

To test:

Pay a fine, and confirm the error disappears (and the fines is still paid)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7143: Follow up patch for Updating about.tt
Brendan [Wed, 2 Nov 2011 10:04:58 +0000 (03:04 -0700)]
Bug 7143: Follow up patch for Updating about.tt

I had a typo where I put Ian Walls as Release Manager - I have fixed to QA.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I put in another missing space for Colin Campbell.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain
Brendan [Wed, 2 Nov 2011 09:59:41 +0000 (02:59 -0700)]
Bug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c3494eaaed4cdb45d7b9f80251fa096a57af143b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7139 : Log addition and deletion of circulation messages
Chris Cormack [Wed, 2 Nov 2011 01:43:45 +0000 (14:43 +1300)]
Bug 7139 : Log addition and deletion of circulation messages

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Changed the two action names into caps no-spaces.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7135: Save button options
Owen Leonard [Thu, 3 Nov 2011 18:54:39 +0000 (14:54 -0400)]
Fix for Bug 7135: Save button options

This patch adds a jQuery plugin which will cause
an element to remain "fixed" at the top of the
screen if it would otherwise scroll up out of
view.

The license of this plugin is "This plugin is as free as fresh
air. Feel free to use it anywhere.".

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I tested this on Chrome OSX
saving works
changing framework works
scrolling works, obviously.
tabbing through the records works
z39 button works as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
updated patch comment about licensing of the plugin
(cherry picked from commit da916a368c98e7f2599cf3a52126d53ee0ecfcd1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAlternate fix for Bug 2534 - Viewing items table on item edit screen requires horizon...
Owen Leonard [Mon, 22 Aug 2011 15:33:59 +0000 (11:33 -0400)]
Alternate fix for Bug 2534 - Viewing items table on item edit screen requires horizontal scrolling

This patch doesn't eliminate horizontal scrolling, but simplifies
the situation:

- The left-hand sidebar has been moved below the table of items.
- The "overflow:scroll" style has been removed from the table of items.
  Having overflow set meant that it was often necessary to scroll twice
  to reach data in the table: once using the scrollbars on the table
  and again using the page's scrollbars.

The NEKLS catalogers also extend their thanks for this fix.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Backporting to 3.4.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7121 - remove comma on items info
Owen Leonard [Fri, 11 Nov 2011 16:43:27 +0000 (11:43 -0500)]
Fix for Bug 7121 - remove comma on items info

Because I can't just take out one comma, I reworked
the way moredetail.pl fetches and outputs biblio
data based on the way it does in detail.pl. This
allows for simpler output in the template.  In the
process I've added subtitle information to the
template.

Revision adds line break for readability

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Backported to 3.4.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7093: placeholds for suggestion table not working in notices
Ian Walls [Wed, 7 Dec 2011 16:43:20 +0000 (11:43 -0500)]
Bug 7093: placeholds for suggestion table not working in notices

In parseletter_sth, the suggestions table was defined twice.  The first time (which
is the only definition to get called, as it matches first then exists), defined the
primary search keys as borrowernumber and biblionumber.  This is incorrect; the only
usage of the suggestions table tokens is with suggestionid as the key.  This is defined
further down the if/then chain.

This patch removes the erroneous sth query definition.

To test:

1.  Place a suggestion with a patron account with a configured email you can access
2.  Approve or reject it
3.  Verify the message you receive contains suggestion tokens (like title, author and reason)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Suggestion mails for accepted, rejected and ordered look good now.
I couldn't test the suggestion mail AVAILABLE (bug 7096), but
assuming this would work too.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716 Update biblio & deletedbiblio tables
Nicole C. Engard [Thu, 20 Oct 2011 10:47:54 +0000 (06:47 -0400)]
Bug 6716 Update biblio & deletedbiblio tables

The comments on the biblio and deletedbiblio table
didn't mention the MARC21 subfields. This patch adds
that documentation in.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agowelcome Fabio, you're 165th !
Paul Poulain [Tue, 13 Dec 2011 13:43:41 +0000 (14:43 +0100)]
welcome Fabio, you're 165th !

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7123 - barcode should be one word
Owen Leonard [Tue, 1 Nov 2011 13:21:51 +0000 (09:21 -0400)]
Fix for Bug 7123 - barcode should be one word

Other fixes thrown in for good measure:

- Adding data to the results table to match output of returns
- Better checking of error codes in the script to control
  output of error messages (don't show error box when there
  are no errors).
- Move some errors/messages from the right column onto the
  top of the page to match Koha's established pattern.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6935: Correct XISBNDailyLimit for new installations
Katrin Fischer [Wed, 30 Nov 2011 07:04:27 +0000 (08:04 +0100)]
Bug 6935: Correct XISBNDailyLimit for new installations

This corrects the value of XISBNDailyLimit in the system preferences
installation file to 999 instead of 499.

The file was missed in an earlier update, so new installations
have different values than older installations that were updated.

Another patch with a database update is needed. Sending this patch first,
until it's clear how database updates will work for 3.8.

To test:
1) Recreate your database from scratch
2) Check your system preference XISBNDailyLimit shows 999 instead of 499,
matching the description of the system preference.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 6917 Dates filters doesn't work when they are not selected on row or column
Alex Arnaud [Mon, 26 Sep 2011 10:21:58 +0000 (12:21 +0200)]
bug 6917 Dates filters doesn't work when they are not selected on row or column

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6865 - Replace image-based gradient backgrounds with CSS3 gradients
Owen Leonard [Tue, 13 Sep 2011 12:16:13 +0000 (08:16 -0400)]
Bug 6865 - Replace image-based gradient backgrounds with CSS3 gradients

Replaces image-based gradients in:

OPAC search bar
OPAC submit buttons
OPAC lists menu background
OPAC alert and message boxes
OPAC user menu tabs
Staff client alert and message boxes
Staff client side menu tabs

Removes obsoleted background image files.

Cross-browser background-gradients created using:
http://www.colorzilla.com/gradient-editor/

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6803: Replacing remote XSL include
Marcel de Rooy [Wed, 12 Oct 2011 12:00:54 +0000 (14:00 +0200)]
Bug 6803: Replacing remote XSL include

Replacing remote include by local one.
This resolves possible connectivity issues (see Bugzilla comments).
Should theoretically be safer and faster too.

December 7, 2011: Rebased and included nbsp entity definition (bug 7141).

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716 : Categories table
Nicole C. Engard [Mon, 10 Oct 2011 10:50:23 +0000 (06:50 -0400)]
Bug 6716 : Categories table

This patch documents the patron categories table in Koha.
There are a couple fields marked unused and a couple that aren't
documented because I wasn't sure:

* dateofbirthrequired
* bulk

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 3aa00f63131fdccba4bb57870bc86c93329d5050)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716: Document biblioitems and deletedbiblioitems
Nicole C. Engard [Sun, 2 Oct 2011 14:04:37 +0000 (10:04 -0400)]
Bug 6716: Document biblioitems and deletedbiblioitems

This patch documents the biblioitems and the deletedbiblioitems
tables.  There are many fields left undocumented because I didn't see
information in them, but this is enough of a start to be helpful to
those writing reports.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 66b5175aa5b38fd793db64f725fa927bc113e8c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716 Document deleteditems table
Nicole C. Engard [Sun, 2 Oct 2011 06:16:44 +0000 (02:16 -0400)]
Bug 6716 Document deleteditems table

This patch documents the deleted items table. Some fields were left
undocumented because I was unsure of what data was stored there:

stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c9441f48955360829ef7f8e97a54afa7aa31fc5b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716 - Document Items Table
Nicole C. Engard [Sun, 2 Oct 2011 06:11:06 +0000 (02:11 -0400)]
Bug 6716 - Document Items Table

This patch documents the items table. Some fields were left
undocumented because I was unsure of what data was stored there:

stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 12031f5b8cfc9e294f121135a7eb83449f1c2b63)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug6716: documenting reserves and old_reserves tables
Nicole C. Engard [Wed, 28 Sep 2011 10:19:33 +0000 (06:19 -0400)]
bug6716: documenting reserves and old_reserves tables

This patch documents the reserves and the old_reserves table.
Note that a few fields are marked unused: notificationdate and
reminderdate. Also two fields are left undocumented: lowestPriority
which never seems to be anything other than 0 and constrainttype which
is either 'a' or 0, but there doesn't appear to be any explanation
as to what each stands for.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 156f45fe2158ebfb8eeced2614a212f7bcb6aa7b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6663: Features for holidays.pl with datepicker
Christophe Croullebois [Fri, 2 Dec 2011 15:03:19 +0000 (16:03 +0100)]
Bug 6663: Features for holidays.pl with datepicker

Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I have added also Holidays repeated yearly on a range.
On suggestions I have added a datepicker for "To Date".

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7245 Tables population with mandatory data for italian installation
Frédéric Demians [Sun, 20 Nov 2011 12:13:28 +0000 (13:13 +0100)]
Bug 7245 Tables population with mandatory data for italian installation

Formatted patch from Fabio Tiana <fabio.tian@gmail.com>

While installing italian and UNIMARC version of Koha via web installer, two
errors occur: ERROR 1136 (21S01) and ERROR 1064 (42000). Some tables can't be
populated with mandatory data.

Errors are related to files sample_itemtypes.sql and unimarc_framework.sql
(/usr/share/koha/intranet/cgi-bin/installer/data/mysql/it-IT/ and
subdirectories).

Signed-off-by: koha <koha@kohabase.l.i>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a5241093b3cfd564f69b26a76b52ef04eaa5719e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7215 : The Module changed, but the tests weren't updated to reflect that
Chris Cormack [Tue, 13 Dec 2011 08:18:37 +0000 (21:18 +1300)]
Bug 7215 : The Module changed, but the tests weren't updated to reflect that

Updating the test

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7082: Template improvements for better translatability
Katrin Fischer [Mon, 24 Oct 2011 14:09:35 +0000 (16:09 +0200)]
Bug 7082: Template improvements for better translatability

Problem:
/cgi-bin/koha/admin/aqbudgets.pl
<label for="show_mine">Show my<br /> funds only</label>

This gets broken into 2 strings for translation which makes it very hard for
translators to make sense of it.
Patch removes the line break.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This patch removes the linebreak and has no ill effects that I can see, even
on a small screen. I'll attach before and after screenshots in Bugzilla.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7336 - memberentry.pl generates an error in the log
Owen Leonard [Thu, 8 Dec 2011 16:10:20 +0000 (11:10 -0500)]
Bug 7336 - memberentry.pl generates an error in the log

Adding check for the existence of a variable in
order to quiet errors in the log.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7215 - changed callnumber PRESET field to itemcallnumber
Brendan [Fri, 11 Nov 2011 17:25:15 +0000 (09:25 -0800)]
Bug 7215 - changed callnumber PRESET field to itemcallnumber

Fixes problem with creating new labels - before it populated with callnumber and not itemcallnumber

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7198: show patron name in overdue list even if name column is null
Galen Charlton [Wed, 9 Nov 2011 01:44:25 +0000 (20:44 -0500)]
bug 7198: show patron name in overdue list even if name column is null

If the surname or firstname of a patron is NULL, the MySQL concat()
function (properly) returns NULL, leading to the patron name not
displaying in the overdue report.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 18e06ecf0bfeeefd08575d0512891bea52bc1bde)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen...
Liz Rea [Fri, 4 Nov 2011 19:37:11 +0000 (14:37 -0500)]
Bug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen's suggestion)

I know there's talk of getting rid of this patron search method, but I had a
request for this and so here it is.

To test:
verify that branchcode is displayed on patron search results from
circulation.pl.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating distro specific install files
Chris Cormack [Fri, 21 Oct 2011 20:12:15 +0000 (09:12 +1300)]
Updating distro specific install files
(cherry picked from commit d89eb95b0be7d1b3d58555b1af305bb717e34822)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating main INSTALL instructions
Chris Cormack [Fri, 21 Oct 2011 20:04:19 +0000 (09:04 +1300)]
Updating main INSTALL instructions
(cherry picked from commit 55306b9267f3ec9a2fec29e2ae1679ce69e25240)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited
Chris Cormack [Mon, 26 Sep 2011 22:14:06 +0000 (11:14 +1300)]
Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited
(cherry picked from commit b9808b86dfb8363406bc1ffe46f9a663e1813327)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7316 - Missing escaping in search results
Frère Sébastien Marie [Sun, 4 Dec 2011 17:14:09 +0000 (18:14 +0100)]
Bug 7316 - Missing escaping in search results

Two parameters are now escaped in title (html element):
 - query_desc
 - limit_desc

This is a security correction against XSS.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.04.07.000 07 Dec 2011 19:43:11 Z
Chris Nighswonger [Wed, 7 Dec 2011 19:43:11 +0000 (14:43 -0500)]
Release Notes for 3.04.07.000 07 Dec 2011 19:43:11 Z

12 years agoUpdating Version Number to 3.04.07.000 v3.04.07
Chris Nighswonger [Wed, 7 Dec 2011 17:43:47 +0000 (12:43 -0500)]
Updating Version Number to 3.04.07.000

12 years ago3.4.7 Translation Update
Frédéric Demians [Wed, 7 Dec 2011 17:16:20 +0000 (18:16 +0100)]
3.4.7 Translation Update
(cherry picked from commit d26c11e97b599b018495880e71b7e5fac98e3a5b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.04.07.000 07 Dec 2011 16:48:02 Z
Chris Nighswonger [Wed, 7 Dec 2011 16:48:03 +0000 (11:48 -0500)]
Release Notes for 3.04.07.000 07 Dec 2011 16:48:02 Z

12 years agoAdding a git mailmap file to allow standardizing of commit author's names/email
Chris Nighswonger [Mon, 5 Dec 2011 02:07:49 +0000 (21:07 -0500)]
Adding a git mailmap file to allow standardizing of commit author's names/email
(cherry picked from commit 5dc48be361fd66db512f8c4caaa022535efa3485)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdding template for autogeneration of 3.4.x release notes
Chris Nighswonger [Mon, 5 Dec 2011 02:27:30 +0000 (21:27 -0500)]
Adding template for autogeneration of 3.4.x release notes

12 years agoBug 6629 fix for vulnerability
Chris Cormack [Fri, 25 Nov 2011 07:38:35 +0000 (20:38 +1300)]
Bug 6629 fix for vulnerability

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6628 fixing security vulnerability
Chris Cormack [Fri, 25 Nov 2011 18:39:51 +0000 (07:39 +1300)]
Bug 6628 fixing security vulnerability

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
 - patch taken from master
 - I also corrected two invalid calls to themelanguage (tests are not possible else)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoJoy nelson was already in history.txt, removing the entry
Paul Poulain [Fri, 18 Nov 2011 22:28:38 +0000 (23:28 +0100)]
Joy nelson was already in history.txt, removing the entry
(cherry picked from commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6799 rebuild_zebra.pl -x produces invalid XML records
Frédéric Demians [Sat, 27 Aug 2011 11:32:08 +0000 (13:32 +0200)]
Bug 6799 rebuild_zebra.pl -x produces invalid XML records

This patch allow to handle properly items containing extended characters and
send valid XML records to zebraidx

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7095: Fixing cut and paste error and removing the use of diag() as this does...
Chris Nighswonger [Wed, 26 Oct 2011 15:14:05 +0000 (11:14 -0400)]
Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6977: Follow-up patch : catch CloneSubfield errors
Frédérick Capovilla [Fri, 21 Oct 2011 16:04:03 +0000 (12:04 -0400)]
Bug 6977: Follow-up patch : catch CloneSubfield errors

A javascript error could occur if the CloneSubfield function failed for
any reason. This would prevent the popup from disappearing.

Example : Importing informations of a UNIF_TITLE authority with multiple
$x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
error occurs when trying to clone it.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6475 - Edit it's not possible in subfield "0" in MARC framework
Salvador Zaragoza Rubio [Wed, 22 Jun 2011 16:18:40 +0000 (18:18 +0200)]
Bug 6475 - Edit it's not possible in subfield "0" in MARC framework

When trying to modify the subfield "0" on a field in the
MARC subfield structure admin -> Tag xxx Subfield Constraints,
the boolean condition on liblibrarian fails for the initial "0" value.
Modified condition to allow the value "0"

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7134: patron records getting corrupted birthdates
Ian Walls [Thu, 17 Nov 2011 15:27:47 +0000 (10:27 -0500)]
Bug 7134: patron records getting corrupted birthdates

If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
is obviously incorrect (the result of passing 0 to the database directly)

The fix is to remove a conditional check buried deep in C4::SQLHelper.  This is in a helper subroutine that was changed
for the Unified Member Search dev (bug 6253).  Reverting this small change to the conditional does not seem to break
search, but testing will be required.

To test:
1. apply patch, and create a new patron with blank birthdate.  The new patron should now have a blank birthdate instead of '00/02/0'
2. search for a borrower by 1 part surname, confirm search works
3. search for a borrower by 2 part surname, confirm search works
4. search for a borrower across firstname AND surname; confirm
5. search for a borrower and include categorycode/branchcode filters

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I confirm all working tests 1-5
1. Created patron with blank birthdate - birthdate was blank
2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
3. Searched for mr. acevedo using "Acevedo III" - result was correct
4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.

also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
Not complaining, just noting. :)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoupdating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
Paul Poulain [Thu, 17 Nov 2011 15:50:54 +0000 (16:50 +0100)]
updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
(cherry picked from commit 2216cd4371a72d95491dc51455d1ae7a6c783147)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoMake all strings translatable in marc21_field_007.tt
Frédérick Capovilla [Fri, 14 Oct 2011 19:52:30 +0000 (15:52 -0400)]
Make all strings translatable in marc21_field_007.tt

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- apply patch
- update po files using 'perl translate update <language-code>
- check po files for new strings from 007 plugin
- translate some / all of them
- update templates with changed po files 'perl translate install <language-code>
- verify 007 still works and got translated
(cherry picked from commit 8fde30912ec89c8855a7b4d468f5e48e7b886e85)

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