working/Evergreen.git
5 years agoTranslation updates - po files
Dan Wells [Wed, 22 Jan 2014 21:24:32 +0000 (16:24 -0500)]
Translation updates - po files

Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoStamping 0854: data.min_max_prices
Jeff Godin [Wed, 22 Jan 2014 14:56:34 +0000 (09:56 -0500)]
Stamping 0854: data.min_max_prices

Stamping 0854 and resolving permission ID conflicts due to drift.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
5 years agoRelease notes for lp1207903: new lost billing min/max setting
Remington Steed [Tue, 24 Sep 2013 20:54:37 +0000 (16:54 -0400)]
Release notes for lp1207903: new lost billing min/max setting

Signed-off-by: Remington Steed <rjs7@calvin.edu>
Signed-off-by: Jeff Godin <jgodin@tadl.org>
5 years agoAdd new option for max/min lost item pricing
Dan Wells [Fri, 14 Dec 2012 19:02:22 +0000 (14:02 -0500)]
Add new option for max/min lost item pricing

In addition to a 'default' price when price is missing or zero,
we can also accommodate a range of prices by saying it should be
at least 'X' and not more than 'Y'.  This also allows you to
effectively set a fixed price for all lost items by setting min
and max to an equal amount.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Jeff Godin <jgodin@tadl.org>
5 years agoLP#842991 Reports needs to error when deleting fails
Remington Steed [Wed, 27 Nov 2013 14:55:35 +0000 (09:55 -0500)]
LP#842991 Reports needs to error when deleting fails

When attempting to delete a report template, the reports interface
incorrectly shows "Action Succeeded" even when it partly fails. If the
user performing the delete does not own all the dependent reports and
outputs, then the perl function returns 1 to indicate that some were
deleted, but not all. However, the javascript that calls that function
does not check for a return value of 1. This commit adds that check, and
also improves the formatting of the related error messages.

Signed-off-by: Remington Steed <rjs7@calvin.edu>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoSerials: improve routing slips per Dan Wells' suggestions on LP #1229349
Lebbeous Fogle-Weekley [Mon, 28 Oct 2013 18:28:37 +0000 (14:28 -0400)]
Serials: improve routing slips per Dan Wells' suggestions on LP #1229349

  - Don't repeat the same address for the same user
  - Label mailing vs. billing
  - Border to separate mailing and billing addresses
  - [Also] move some inline styles to a CSS file

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Remington Steed <rjs7@calvin.edu>
5 years agoStamping 0853: 'Prefer external URL' OUS
Dan Wells [Tue, 21 Jan 2014 20:07:29 +0000 (15:07 -0500)]
Stamping 0853: 'Prefer external URL' OUS

Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoRelease notes for the TPAC library web pages
Dan Scott [Wed, 15 Jan 2014 03:12:16 +0000 (22:12 -0500)]
Release notes for the TPAC library web pages

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoAdd upgrade script for lib.prefer_external_url OUS
Dan Scott [Wed, 15 Jan 2014 02:33:34 +0000 (21:33 -0500)]
Add upgrade script for lib.prefer_external_url OUS

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoCopy details link to Evergreen library page by default
Dan Scott [Mon, 6 Jan 2014 19:33:04 +0000 (14:33 -0500)]
Copy details link to Evergreen library page by default

Add a new library setting, 'lib.prefer_external_url', to force library names in
copy details pages to link to their associated 'lib.info_url' setting rather
than the Evergreen-generated page. In the absence of a 'lib.info_url' setting,
the name will fall back to being linked to the Evergreen-generated page.

Per discussion with Ben Shum and Kathy Lussier.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoImprove label for library's external web site
Dan Scott [Mon, 6 Jan 2014 18:59:50 +0000 (13:59 -0500)]
Improve label for library's external web site

Normal humans will find "Library web site" more meaningful than "External web
site"; thanks to Kathy Lussier for the suggestion!

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years ago%l instead of %H if we're using AM/PM for default time formats
Dan Scott [Mon, 6 Jan 2014 18:19:17 +0000 (13:19 -0500)]
%l instead of %H if we're using AM/PM for default time formats

Thanks again to the indefatiguable Ben Shum for this catch!

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoUse the 'format.time' OUS to format library hours
Dan Scott [Mon, 6 Jan 2014 17:22:28 +0000 (12:22 -0500)]
Use the 'format.time' OUS to format library hours

Sparked by a concern that Ben Shum had over the display of library hours in 24
hour format, I eventually figured out that we could use the Template::Toolkit
Date module to format the times according to library preferences. And given
that we already have a format.time OUS, let's use it.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoTPAC Library schema info - add some caching
Dan Scott [Mon, 28 Oct 2013 15:26:55 +0000 (11:26 -0400)]
TPAC Library schema info - add some caching

Rather than hitting the database every time, cache our requests for a
period of time. It's unlikely that hours of operation or addresses are
going to change very often...

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoLink from copies to library info page
Dan Scott [Tue, 17 Dec 2013 21:29:35 +0000 (16:29 -0500)]
Link from copies to library info page

In the absence of a specific lib.info_url org unit setting, link to the library
info page.

If we _do_ have a lib.info_url org unit setting, link from the library info
page to to the external web site.

Rather than wrapping everything in the table cell as the seller, focus
on the <a> and give it an explicit Library typeof attribute; then we can
offer up the name of the library as the name attribute, should the
crawler be too lazy to follow the link.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoFirst inklings of schema.org support for library pages
Dan Scott [Sat, 26 Oct 2013 21:32:22 +0000 (17:32 -0400)]
First inklings of schema.org support for library pages

Adds a TPAC page where the information for a given library can be publicly
exposed; in addition, that information is marked up with schema.org structured
data so that, for example, a search engine can offer up the hours of operation
and contact information for a given branch right on the search results page.

We give the content-wrapper a main-content for indentation, to be consistent
with other pages in the TPAC.

We also add the cargo-cult common-full-pad div for a bottom margin.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoFixed title/author display at checkout for non-pre-cat items.
Steven Callender [Thu, 10 Oct 2013 20:09:06 +0000 (16:09 -0400)]
Fixed title/author display at checkout for non-pre-cat items.

Fixed a display problem on checkout where items that were formely pre-cats
were still displaying the pre-cat data. Now it will make sure the item is
still a pre-cat before using the dummy data.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoLP969312: No warning for Delete All from Catalog in Copy Buckets
Pasi Kallinen [Tue, 28 May 2013 17:18:06 +0000 (20:18 +0300)]
LP969312: No warning for Delete All from Catalog in Copy Buckets

Add a confirmation dialog popup.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoTPAC: Display authors using inline-block
Dan Scott [Thu, 16 Jan 2014 03:33:25 +0000 (22:33 -0500)]
TPAC: Display authors using inline-block

Rather than letting author credits wrap willy-nilly, use inline-block mode so
that each line will begin with a new author. Devices with constrained screens
in particular benefit from this, as the list of authors is much easier to scan,
and wider screens can still fit multiple authors on a single line.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoTPAC: Use indexed subfields only in author search links
Dan Scott [Wed, 15 Jan 2014 20:25:02 +0000 (15:25 -0500)]
TPAC: Use indexed subfields only in author search links

Addresses LP# 1267231 in which we found that the titles of works in the added
author field (such as subfield t) were showing up in the link ahead of the
author's birth and death date (if applicable). Now we reserve the link for
only the indexed author subfields (depends on whether the name is personal,
corporate, or conference, but generally subfields a/b/c/d/e/n/q), then the
extra subfields go after the name + dates, then we finally put the relationship
into the parentheses after everything else.

We also simplify the markup so that each name is contained in a single <span
class="rdetail_author_div"> element to make it easier to control the layout.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoSerials: Batch Receive interface Copy Location widget was inert
Lebbeous Fogle-Weekley [Thu, 14 Nov 2013 20:59:55 +0000 (15:59 -0500)]
Serials: Batch Receive interface Copy Location widget was inert

Choosing a value from the Copy Location widget wasn't working.  You'd
get a default copy location (or the one supplied by the Receive Unit
Copy Template) no matter what you set that control too.

This is fixed.  One does not read from XUL menulist element by using its
'value' property.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Remington Steed <rjs7@calvin.edu>
5 years agoLP#882586: In Serial Control View, show copy templates owned by ancestors
Lebbeous Fogle-Weekley [Wed, 15 Jan 2014 22:53:25 +0000 (17:53 -0500)]
LP#882586: In Serial Control View, show copy templates owned by ancestors

When creating/editing distributions, dropdowns for Receive Unit Template
and Bind Unit Template now show copy templates owned not only at the
distribution's holding lib, but at any of the holding lib's ancestors.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoPull forward previous upgrade scripts
Mike Rylander [Mon, 20 Jan 2014 16:17:29 +0000 (11:17 -0500)]
Pull forward previous upgrade scripts

Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoCreate 008 - take only the first field/subfield combo
Dan Scott [Mon, 20 Jan 2014 03:24:07 +0000 (22:24 -0500)]
Create 008 - take only the first field/subfield combo

In the event that there were multiple $a subfields in, say, 044, the create 008
function could spew raw XML into the 008 field. Avoid that by taking the primary
instance.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoAllow generating fixed data in control field 008 quickly user/dbs/008ism
Pasi Kallinen [Thu, 18 Jul 2013 18:00:31 +0000 (21:00 +0300)]
Allow generating fixed data in control field 008 quickly

Language and country codes come from 041a and 044a,
Date1 comes from 260c, and the record date is set to current day.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/xul/staff_client/server/cat/marcedit.js

5 years agoLP#1235474: fix failure of authority browse context menu to render
Galen Charlton [Fri, 4 Oct 2013 21:44:56 +0000 (14:44 -0700)]
LP#1235474: fix failure of authority browse context menu to render

This patch fixes a situation where if an authority record that would
be brought up by the authority browse context menu in the MARC editor
lacks an 003 field, the context menu would not be rendered all, meaning
that the default context menu (e.g., cut/copy/paste/etc.) would be
displayed instead.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoNew live test for fetching and update bre/MARC data
Bill Erickson [Thu, 10 Oct 2013 20:05:57 +0000 (16:05 -0400)]
New live test for fetching and update bre/MARC data

Fetch a record, test the title, add a new subfield, update the record,
and test that the new subfield survived the update.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoMove hard-coded style out of the copy status layout.
Pasi Kallinen [Tue, 18 Jun 2013 06:01:30 +0000 (09:01 +0300)]
Move hard-coded style out of the copy status layout.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoLP104785: Selfcheck needs to be run with HTTPS
Elliot Voris [Mon, 9 Dec 2013 18:57:20 +0000 (12:57 -0600)]
LP104785: Selfcheck needs to be run with HTTPS

Redirect attempts to connect to the self-check via HTTP to the more secure
HTTPS instead. Addresses this bug reported in launchpad:
https://bugs.launchpad.net/evergreen/+bug/1047485

Based on work for Apache 2.2 by Michael Peters <mrpeters@library.in.gov>,
updated and applied to 2.4 by Elliot Voris.

Signed-off-by: Elliot Voris <evoris@slcconline.edu>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoMore explicit database configuration instructions
Dan Scott [Sun, 19 Jan 2014 18:52:20 +0000 (13:52 -0500)]
More explicit database configuration instructions

These README tweaks should help new folk install Evergreen with
a few less hurdles.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoFedora: Net::SSLeay 1.55 is too new for Net::HTTPS::Any
Dan Scott [Sun, 19 Jan 2014 16:30:57 +0000 (11:30 -0500)]
Fedora: Net::SSLeay 1.55 is too new for Net::HTTPS::Any

Although Net::HTTPS:Any wants Net:SSLeay 1.30 or later, 1.55 is apparently too
late, or something. The alternative is Crypt::SSLeay, which seems to work, so
let's go with that.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoLP#1269884 repair MVR id / doc_id thinko
Bill Erickson [Thu, 16 Jan 2014 18:03:34 +0000 (13:03 -0500)]
LP#1269884 repair MVR id / doc_id thinko

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoReplace deprecated javascript escape() with encodeURIComponent()
Pasi Kallinen [Fri, 28 Jun 2013 05:47:11 +0000 (08:47 +0300)]
Replace deprecated javascript escape() with encodeURIComponent()

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/xul/staff_client/chrome/content/auth/controller.js
Open-ILS/xul/staff_client/chrome/content/util/error.js
Open-ILS/xul/staff_client/chrome/content/util/print.js
Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js
Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js

Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoAnd renaming the test
Mike Rylander [Thu, 16 Jan 2014 20:46:41 +0000 (15:46 -0500)]
And renaming the test

Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoRenumbering the test
Mike Rylander [Thu, 16 Jan 2014 20:44:58 +0000 (15:44 -0500)]
Renumbering the test

Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoRenumbering the upgrade script
Mike Rylander [Thu, 16 Jan 2014 20:44:48 +0000 (15:44 -0500)]
Renumbering the upgrade script

Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoTest for Mike's proximity adjustment fix two commits back
Lebbeous Fogle-Weekley [Thu, 16 Jan 2014 19:59:25 +0000 (14:59 -0500)]
Test for Mike's proximity adjustment fix two commits back

Being placed in Open-ILS/src/sql/Pg/live_t, the test requires stock and
Concerto data be loaded.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoUpgrade script
Mike Rylander [Thu, 16 Jan 2014 19:11:34 +0000 (14:11 -0500)]
Upgrade script

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoFix proximity adjustment calculator
Mike Rylander [Thu, 16 Jan 2014 18:58:12 +0000 (13:58 -0500)]
Fix proximity adjustment calculator

The canonical use case for proximity adjustment is to use it broadly
to effect the local proximity of items within a particular area, in
a like manner, across many parts of the org tree.  However, in cases
where it is lightly used, or used with non-overlapping criteria columns,
there are cases where the adjustment will spread beyond its intended
range of influence.

The changes here create a much stricter and correct test for rule
matching, which will end in the correct choice of rules in all cases.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agomake_release cleanup and options
Bill Erickson [Wed, 18 Dec 2013 18:31:18 +0000 (13:31 -0500)]
make_release cleanup and options

* Avoid packaging the XULRunner packages within the Evergree tarball

* Skip the inline SQL upgrade script edit step by default; continue
  supporting option inline editing with a new -r option.

* New -i option forces the script to bypass the lengthy i18n process,
  which is primarily useful for quickly testing changes to this script.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoIn prereq installer, don't try to chown extracted files to original UID/GID
Lebbeous Fogle-Weekley [Tue, 14 Jan 2014 22:11:45 +0000 (17:11 -0500)]
In prereq installer, don't try to chown extracted files to original UID/GID

As this Makefile is designed to be used by a make process running as
root, this will avoid problems on some systems when tar extracts
files and tries to give them the same UID/GID as they have in their
archives, but those accounts don't exist on the local system.

e.g, libdbi has files set 1000/1000. On most systems, there's a user
and a group with these IDs, but there can be systems where nothing
uses those IDs, and where tar fails with e.g. 'tar: libdbi-0.8.3:
Cannot change ownership to uid 1000, gid 1000: Invalid argument'

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoLP#1234201: fix menu item to display patron requests (if summary is horizontal)
Galen Charlton [Tue, 14 Jan 2014 18:30:48 +0000 (13:30 -0500)]
LP#1234201: fix menu item to display patron requests (if summary is horizontal)

This patch adds a missing command element to the horizontal
patron summary display so that the 'Acquisition Requests' menu
item will work.

To test:

[1] Set the Patron circulation summary is horizontal library setting
    to true.
[2] Retrieve a patron and try using the Acquisition Requests menu
    item.  It will do nothing.
[3] Apply the patch and clear cache in the staff client.
[4] Repeat step 2.  This time, the Acquisitions Request menu item
    should bring up the list of the patron's requests.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Srey Seng <sreyseng@gmail.com>
5 years agoStamping 0851 - changes for Encode.pm 2.54+
Dan Wells [Tue, 14 Jan 2014 19:59:56 +0000 (14:59 -0500)]
Stamping 0851 - changes for Encode.pm 2.54+

Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoUpgrade file for Encode.pm 2.54+ changes
Dan Wells [Tue, 14 Jan 2014 19:12:53 +0000 (14:12 -0500)]
Upgrade file for Encode.pm 2.54+ changes

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Remington Steed <rjs7@calvin.edu>
5 years agoAdd pgTAP test for normalized MARC records
Dan Scott [Fri, 25 Oct 2013 17:54:35 +0000 (13:54 -0400)]
Add pgTAP test for normalized MARC records

Specifically, we're concerned about ensuring that any changes related to
the fix for Encode (requiring the removal of the effectively useless but
now erroring decode_utf8()) do not inadvertently change the content of
the MARC records on ingest. Because we wouldn't want to have to reingest
everything to normalize search, etc.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoTest Perl Unicode normalization process
Dan Scott [Thu, 24 Oct 2013 21:44:00 +0000 (17:44 -0400)]
Test Perl Unicode normalization process

Add some basic tests of our Unicode normalization (and entityization)
process.

Also, 'use utf8;' tells the script that it contains UTF8 characters,
not binary bytes, and resolves a test problem.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoEncode.pm change to the UTF8 flag
Dan Scott [Mon, 21 Oct 2013 15:58:06 +0000 (11:58 -0400)]
Encode.pm change to the UTF8 flag

In the past, decode_utf8() silently ignored attempts to decode data
with the UTF8 flag on. However, Encode.pm changed around 2.53 and
resulted in wide-character errors preventing the likes of
--load-all-sample from working.

Since our data should already be UTF8 when it hits these functions, we
should not be trying to decode it in the first place.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoLP#1269042: prevent acq seach from building dropdown of every copy ID in the DB
Galen Charlton [Tue, 14 Jan 2014 16:00:38 +0000 (11:00 -0500)]
LP#1269042: prevent acq seach from building dropdown of every copy ID in the DB

This patch ensures that if a user sets a search field in the
acquisitions general search form to the line item details copy ID
(labeled "LID - Evergreen Copy ID"), the form presents a normal
input widget rather than trying to build a drop-down containing
every copy ID in the database.  Except for very small databases,
the previous behavior would mean that an open-ils.pcrud backend
would eventually consume a great deal of memory trying to service
a request for all copies in the system.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoTreat empty username as invalid in user editor
Jeff Godin [Wed, 30 Oct 2013 19:29:24 +0000 (15:29 -0400)]
Treat empty username as invalid in user editor

There seems to be undesired interaction between the required
attribute and the isValid method on a dojo/dijit ValidationTextBox.
If both are set, isValid needs to check for an empty value,
otherwise the field is considered valid the moment it gains focus.

We don't want an empty username to be considered valid, because we
know that we will be unable to save the user.

We can work around this by teaching the isValid function to consider
an empty value as invalid.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Melissa Ceraso <mceraso@biblio.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoFedora needs Locale::Maketext::Lexicon too user/csharp/fedora_maketext_signoff
Dan Scott [Thu, 9 Jan 2014 17:19:38 +0000 (12:19 -0500)]
Fedora needs Locale::Maketext::Lexicon too

Per commit 66c45b647, install Locale::Maketext::Lexicon on Fedora to satisfy
that dependency. How did _this_ one slip by so long! Thank heavens for
tests.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
5 years agoLP#1267224: repair another fm_IDL.xml typo
Galen Charlton [Thu, 9 Jan 2014 17:05:55 +0000 (12:05 -0500)]
LP#1267224: repair another fm_IDL.xml typo

vam.eg_record points to authority.record_entry, not
biblio.record_entry.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
5 years agoLP#1267224: Repair IDL typo for vandelay authority match / rec link
Bill Erickson [Wed, 8 Jan 2014 19:35:05 +0000 (14:35 -0500)]
LP#1267224: Repair IDL typo for vandelay authority match / rec link

"vqbr" should be "vqar" for authority records.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Yamil Suarez <yamil@yamil.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
5 years agoTests: Ensure TT2 templates parse cleanly
Dan Scott [Sat, 13 Oct 2012 05:23:35 +0000 (01:23 -0400)]
Tests: Ensure TT2 templates parse cleanly

File::Find and Test::Output make it easy to check for any stderr
returned from the TT2 extractor.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
5 years agoLP1038240 - Patron editor field documentation does not display text
Kyle Tomita [Tue, 24 Sep 2013 16:55:02 +0000 (09:55 -0700)]
LP1038240 - Patron editor field documentation does not display text

Changed the legend tag to have a closing tag.
Also modified the css id uedit-help-div, to add a top margin so
it does not overlap the save div.

Signed-off-by: Kyle Tomita <tomitakyle@gmail.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
5 years agoRepair the live_t regression tests
Dan Scott [Thu, 9 Jan 2014 03:39:57 +0000 (22:39 -0500)]
Repair the live_t regression tests

When we added more realistic hours of operation for some of the branches,
several of the live_t regression tests failed because they depended on the
default hours of operation for BR4. Rather than change the regression test,
just switch BR4 back to the default hours of operation and use BR1 as the
closed-on-weekends branch instead.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
5 years agoLP#1266937: Fix missing/incorrect regex for authority in Vandelay.pm
Srey Seng [Tue, 7 Jan 2014 22:30:49 +0000 (14:30 -0800)]
LP#1266937: Fix missing/incorrect regex for authority in Vandelay.pm

Add in missing "~" in function import_record_list_impl when
type is authority records. Also replace "auth" with "authority"
so that the generated values match up with functions in the
database.

Signed-off-by: Srey Seng <sreyseng@gmail.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
5 years agofix pub date data type in reporter.classic_item_list
Chris Sharp [Wed, 8 Jan 2014 19:51:59 +0000 (14:51 -0500)]
fix pub date data type in reporter.classic_item_list

As noticed by Ben Shum in IRC, reporter.classic_item_list
had pub_date, a free text field, classified as "int". This
changes that to "text" to prevent errors.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoFix bug that caused deleted holdings to be visible in SRU/Z39.50 results
Jeff Davis [Wed, 8 Jan 2014 21:21:13 +0000 (13:21 -0800)]
Fix bug that caused deleted holdings to be visible in SRU/Z39.50 results

Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoTPAC: Add Notes label to that row in small-screen My Account->Holds
Lebbeous Fogle-Weekley [Mon, 6 Jan 2014 16:44:56 +0000 (11:44 -0500)]
TPAC: Add Notes label to that row in small-screen My Account->Holds

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoTPAC: Display public hold notes in user holds list
Dan Scott [Mon, 30 Dec 2013 06:47:19 +0000 (01:47 -0500)]
TPAC: Display public hold notes in user holds list

If a given hold has a note marked as public, and not marked for staff, then
display the note in the My Account -> Holds list. This enhancement also
includes sample notes for each hold, to include data that ensures that the TPAC
does not display any hold notes that are not marked public, or which are marked
for staff.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
5 years agoTPAC: Get rid of all unneccessary uppercase and some bold
Lebbeous Fogle-Weekley [Mon, 6 Jan 2014 16:27:57 +0000 (11:27 -0500)]
TPAC: Get rid of all unneccessary uppercase and some bold

This gets rid of all places in the TPAC where CSS uses text-transform:
uppercase or capitalize.  The former is bad for readability, and the
latter can only confuse users when strings might appear to be
capitalized differently in one context than another (esp. users'
personal names).

This mostly, but not exclusively, affects the My Account section.
Also, one wholly unused CSS class was removed altogether.

It also gets rid of some bold style that was applied too liberally to
the whole contents of tables.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoMake sample phone numbers "(xxx) xxx-xxxx" format
Dan Scott [Mon, 6 Jan 2014 16:07:17 +0000 (11:07 -0500)]
Make sample phone numbers "(xxx) xxx-xxxx" format

The extra hyphen between the closing parenthesis and the 4th digit was just
plain weird. Thanks to Ben Shum for mentioning this in IRC!

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoSample library external URLs, phone numbers, and emails
Dan Scott [Tue, 17 Dec 2013 18:05:43 +0000 (13:05 -0500)]
Sample library external URLs, phone numbers, and emails

Supply reasonable URLs and contact information for the branches.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoAdd sample library addresses and hours of operation
Dan Scott [Tue, 17 Dec 2013 17:02:56 +0000 (12:02 -0500)]
Add sample library addresses and hours of operation

Provide branch-level granularity of addresses and hours of operation, using
different addresses in some cases for mailing vs. billing vs. ILL vs. holds for
more realism.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoMove default actor.org_unit entries into sample data
Dan Scott [Tue, 17 Dec 2013 15:16:32 +0000 (10:16 -0500)]
Move default actor.org_unit entries into sample data

The only actor.org_unit entry we absolutely require in the sample data is the
consortium, as many things are owned by it. Otherwise, we should treat the
libraries and associated settings such as addresses as sample data.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoStamping 0850 - translate icon labels
Ben Shum [Wed, 18 Dec 2013 18:36:39 +0000 (13:36 -0500)]
Stamping 0850 - translate icon labels

Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoTranslate the icon labels in TPAC
Thomas Berezansky [Tue, 10 Dec 2013 18:54:40 +0000 (13:54 -0500)]
Translate the icon labels in TPAC

Instead of just using English.

Also, in the event we have a search_label, use it.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoDocs: bug fixes in new files
Remington Steed [Tue, 17 Dec 2013 16:17:25 +0000 (11:17 -0500)]
Docs: bug fixes in new files

This commit fixes a small bug in the new Action Triggers chapter and a
few small formatting bugs in the new subsection in the Holds Management
chapter. It also fixes a small wording typo in the Holds Management intro.

Signed-off-by: Remington Steed <rjs7@calvin.edu>
5 years agoStamping 0849 - desk renewal description
Ben Shum [Tue, 17 Dec 2013 19:59:44 +0000 (14:59 -0500)]
Stamping 0849 - desk renewal description

Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoUpdated the label on the desk renewal global setting.
Steven Callender [Thu, 12 Dec 2013 20:13:57 +0000 (15:13 -0500)]
Updated the label on the desk renewal global setting.

Updated the label on the desk renewal global flag circ.desk_renewal.use_original_circ_lib
to properly explain the it's the workstation library that will not be used rather than the
user home library. The OPAC renewal uses the users home library and desk renewals use
the workstation library.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoBreak out of focus() in cat/z3950.js if obj.active_services is undefined.
Jason Stephenson [Wed, 11 Dec 2013 15:05:18 +0000 (10:05 -0500)]
Break out of focus() in cat/z3950.js if obj.active_services is undefined.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoEliminate an annoying and useless warning in the JavaScript Console.
Jason Stephenson [Wed, 11 Dec 2013 14:50:09 +0000 (09:50 -0500)]
Eliminate an annoying and useless warning in the JavaScript Console.

Timestamp: 12/10/2013 02:52:51 PM
Warning: Empty string passed to getElementById().
Source File: oils://remote/xul/rel_3_0_20131206_120120/server/OpenILS/global_util.js
Line: 354

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoAsciidoc fix
Angela Kilsdonk [Tue, 17 Dec 2013 16:37:23 +0000 (11:37 -0500)]
Asciidoc fix

Another asciidoc fix for 2.5 documentation:
-Disable patron credit.

Signed-off-by: Angela Kilsdonk <akilsdonk@esilibrary.com>
5 years agoDocumentation for 2.5
Angela Kilsdonk [Tue, 17 Dec 2013 16:22:41 +0000 (11:22 -0500)]
Documentation for 2.5

asciidoc fixes for:
-Disable Patron Credit
-Lost and Long Overdue Colors
-PV Supa Goodstuff Integration

Signed-off-by: Angela Kilsdonk <akilsdonk@esilibrary.com>
5 years agoUpdate README to address Apache locking problem
Dan Scott [Mon, 16 Dec 2013 19:10:05 +0000 (14:10 -0500)]
Update README to address Apache locking problem

Because Apache is still running as the opensrf user, we need to change the
ownership of the lock directory to enable Apache to write to it.

Also cut over to the osrf_config script instead of the osrf_ctl.sh script to
avoid deprecation warnings.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
5 years agoDocumentation for 2.5
Angela Kilsdonk [Mon, 16 Dec 2013 18:29:16 +0000 (13:29 -0500)]
Documentation for 2.5

Includes:
-Patron Self Registration
-PV Supa Goodstuff Integration
-Disable Patron Credit in Billing Interface

Signed-off-by: Angela Kilsdonk <akilsdonk@esilibrary.com>
5 years agoLP#1254816: prevent cases where a Google Book preview is not displayed
Galen Charlton [Mon, 25 Nov 2013 18:05:21 +0000 (10:05 -0800)]
LP#1254816: prevent cases where a Google Book preview is not displayed

Due to quirks in how different parts of the Google Books API
processes ISBN searches, it is possible for a Google Books Preview
badge to get displayed, but when the user tries to display the preview,
the embedded preview does not get displayed.

This patch fixes the problem by grabbing the preview link from
the GB volumes search results, which in turn can be fed into the
Embedded Viewer initialization.

An ISBN that can be used to reproduce the problem is 9781937994198.
Before the patch, the badge is displayed but not the preview; after
the patch, both badge and preview should be displayed.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoDocumentation for 2.5
Angela Kilsdonk [Fri, 13 Dec 2013 21:30:51 +0000 (16:30 -0500)]
Documentation for 2.5

asciidoc fix

Signed-off-by: Angela Kilsdonk <akilsdonk@esilibrary.com>
5 years agoRevive and update Action Triggers docs for 2.5
Remington Steed [Wed, 20 Nov 2013 14:40:10 +0000 (09:40 -0500)]
Revive and update Action Triggers docs for 2.5

This commit revives the missing Action Triggers docs section, last seen
in the 2.0 version of the docs. Also, several small corrections and
wording edits were made, as well as a few actual feature changes since
version 2.0.  The most explicit of these feature changes is the addition
of a basic description for a new Event Definition field in 2.5: "Event
Repeatability Delay".

Signed-off-by: Remington Steed <rjs7@calvin.edu>
5 years agoFix LP1180140, View Holds not working for a serial with subscription and no issuances
Steven Chan [Wed, 15 May 2013 21:30:15 +0000 (14:30 -0700)]
Fix LP1180140, View Holds not working for a serial with subscription and no issuances

A request is made to
open-ils.circ.holds.retrieve_all_from_title,
which is the function Circ/Holds.pm/all_rec_holds().

In the function, when checking for issuance holds, there is a missing @
to dereference the list of issuance IDs, so that the ahr table is search
with badly formed input, which results in returning an undefined list
instead of an empty list.  The error will occur for any record with a
serial.subscription entry but with no related entries in
serial.issuance.

We also recode the initialization of the response object in order to
clarify its expected structure, a hash of array references.

Signed-off-by: Steven Chan <schan@sitka.bclibraries.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
5 years agoDocumentation for Sorting Billing Columns
Angela Kilsdonk [Tue, 10 Dec 2013 19:52:18 +0000 (14:52 -0500)]
Documentation for Sorting Billing Columns

Docs for sorting money columns in billing interface.  In ersions 2.3-2.5.

Signed-off-by: Angela Kilsdonk <akilsdonk@esilibrary.com>
5 years agoNew documentation for 2.5
Angela Kilsdonk [Tue, 10 Dec 2013 19:30:28 +0000 (14:30 -0500)]
New documentation for 2.5

Documentation for:
-Z39.50 Search Enhancements
-Catalog Browse
-Alternative Hold Pick-up Location
-Marking Items Long Overdue
-Lost and Long Overdue Bill Colors
-Vandelay Item Load

Signed-off-by: Angela Kilsdonk <akilsdonk@esilibrary.com>
5 years agoAlways show Email Address label to staff
Thomas Berezansky [Mon, 9 Dec 2013 16:15:29 +0000 (11:15 -0500)]
Always show Email Address label to staff

When placing holds staff commonly change out patrons, and pointing staff
towards the "My Account" area makes no sense to begin with.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoDocumentation typo in Authorities chapter subheading
Elliot Voris [Sat, 7 Dec 2013 21:24:46 +0000 (15:24 -0600)]
Documentation typo in Authorities chapter subheading
Addresses this bugs reported in launchpad:
https://bugs.launchpad.net/evergreen/+bug/1248726

I also browsed through the rest of the docs/admin
directory, and made some (very non-consequential)
changes.

Signed-off-by: Elliot Voris <evoris@slcconline.edu>
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
5 years agoPushing upgrade scripts forward
Mike Rylander [Thu, 5 Dec 2013 16:00:55 +0000 (11:00 -0500)]
Pushing upgrade scripts forward

Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoForward port 2.3.11->2.3.12 DB upgrade
Bill Erickson [Thu, 5 Dec 2013 15:08:34 +0000 (10:08 -0500)]
Forward port 2.3.11->2.3.12 DB upgrade

Signed-off-by: Bill Erickson <berick@esilibrary.com>
5 years agoPull in 2.5 version upgrade files
Dan Wells [Thu, 5 Dec 2013 14:49:05 +0000 (09:49 -0500)]
Pull in 2.5 version upgrade files

For 2.5.0 and 2.5.1

Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoFix a broken link in the holds docs
Remington Steed [Wed, 4 Dec 2013 14:35:30 +0000 (09:35 -0500)]
Fix a broken link in the holds docs

Signed-off-by: Remington Steed <rjs7@calvin.edu>
5 years agoDocs: integrate holds docs from EG 2.1
Remington Steed [Thu, 21 Nov 2013 15:29:22 +0000 (10:29 -0500)]
Docs: integrate holds docs from EG 2.1

The small amount of Holds docs present in master seemed to fit well at
the end of the older Holds documentation, so this commit appends them
to the new holds.txt file, deletes the previous holds_management.txt file,
and makes the appropriate change to root.txt.

This commit also includes several small formatting improvements, wording
changes, and bug fixes.

Signed-off-by: Remington Steed <rjs7@calvin.edu>
5 years agoFix boolean lists; Better atom regex; Caching
Mike Rylander [Wed, 13 Nov 2013 23:15:21 +0000 (18:15 -0500)]
Fix boolean lists; Better atom regex; Caching

First, we didn't need to make $last_type local, and it broke explicit
grouping anyway.  That's removed, and we now reset that (and a few more
like it) at calls to the top level parse() method.  This introduces a
situation where a long list of booleans could cause query plan problems,
so we limit the plan depth to 40 (20 ||'d conditions).

Second, we are smarter about finding the boundary of atoms.  Previous
to this commit, and curly brace could send the parser into a tailspin
from which it would not recover.  Now we use alternation instead of
a character class, which is much safer with the default multi-character
float syntax specifier.

Third, as a catch-all, if we can't parse the remained of a query we
now simply say so (when in debug mode) and go away, instead of risking
an infinite loop.  We do this via a final, unqualified "else" clause
in decompose().

Finally, instead of building 10+ regexp objects on each query parse,
cache them per QP subclass and reuse them.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoLP#1238015 hide patron credit summary when disabled
Bill Erickson [Mon, 28 Oct 2013 14:24:37 +0000 (10:24 -0400)]
LP#1238015 hide patron credit summary when disabled

When the circ.disable_patron_credit / "Disable Patron Credit" org unit
setting is disabled, also hide the patron credit summary information in
the bills interface.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
5 years agoRe-apply the changes provided by 0802 for backport
Mike Rylander [Mon, 25 Nov 2013 15:14:08 +0000 (10:14 -0500)]
Re-apply the changes provided by  0802 for backport

Preserve record order of subfields for authority heading extraction

When extracting headings from authority records we currently read the
subfields of a tag in configuration order.  We should, instead, read
them in record order, to preserve the desired sorting properties that
the cataloger has encoded in the record.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoFix copy_table HTML markup errors
Dan Scott [Sun, 27 Oct 2013 17:11:37 +0000 (13:11 -0400)]
Fix copy_table HTML markup errors

TD elements take a "headers" attribute, not a "header" attribute. Also,
we have a few typos in identifying the header attributes.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoLP#1254146 gracefully handle custom trees sans entries
Bill Erickson [Fri, 22 Nov 2013 19:55:26 +0000 (14:55 -0500)]
LP#1254146 gracefully handle custom trees sans entries

Avoid references to custom tree entries when no tree entries for a
custom tree exist.  Prevents:

egweb: template error: undef error - Can't call method "org_unit" on an
undefined value at
/usr/local/share/perl/5.10.1/OpenILS/WWW/EGCatLoader/Util.pm line 185.\n

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoImprove facet styling
Dan Wells [Thu, 14 Nov 2013 20:12:46 +0000 (15:12 -0500)]
Improve facet styling

1) Facets currently display very poorly when the number reaches 3-4
digits.  Facet data is more or less a two column table, so let's style
it that way to make it more robust.

2) Rearrange some styles to reduce redundancy, and allow overflow
where possible.

3) Change the selected highlight to look a little better.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Ben Shum <bshum@biblio.org>
5 years agoPulling in new version upgrade
Mike Rylander [Wed, 20 Nov 2013 19:45:18 +0000 (14:45 -0500)]
Pulling in new version upgrade

Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoLP#1251774 exit and alert on multiple payments per xact
Bill Erickson [Fri, 15 Nov 2013 22:06:53 +0000 (17:06 -0500)]
LP#1251774 exit and alert on multiple payments per xact

If more than one payment for a transaction is received, exit the API
call early and return a MULTIPLE_PAYMENTS_FOR_XACT event.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoEnforce one-payment-per-xact-per-call
Mike Rylander [Fri, 15 Nov 2013 21:40:36 +0000 (16:40 -0500)]
Enforce one-payment-per-xact-per-call

There is no legitimate reason for a transaction to receive more than
one payment per call to open-ils.circ open-ils.circ.money.payment,
but we have seen the staff client generate such a data structure. This
leads to seemingly duplicate payments, and is bad all around.  So,
we will enforce the restriction by taking only the first payment per
xact in the list of payments.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
5 years agoReplace erroneous calls to $e->retrieve_authority_record($rec_id).
Jason Stephenson [Fri, 8 Nov 2013 20:02:53 +0000 (15:02 -0500)]
Replace erroneous calls to $e->retrieve_authority_record($rec_id).

On lines 153 and 175 of OpenILS::Application::Cat::Authority calls
like the above should be $e->retrieve_authority_record_entry($rec_id).
This branch replaces the two misspelled calls with the proper ones.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
5 years agoLP1093856 fix Fast Item Add with Z39.50 import
Jason Etheridge [Thu, 12 Sep 2013 16:02:15 +0000 (12:02 -0400)]
LP1093856 fix Fast Item Add with Z39.50 import

The first time I tried this fix I ran afoul of
https://bugs.launchpad.net/evergreen/+bug/787561

But a second attempt worked.  So I didn't kill
two birds with one stone, but this should take
care of 1093856.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>