[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_3_1_5 created. 4fff751b2cf978d2a611a3a3c3ac65befb5102a3
Evergreen Git
git at git.evergreen-ils.org
Mon Aug 27 17:02:22 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, tags/rel_3_1_5 has been created
at 4fff751b2cf978d2a611a3a3c3ac65befb5102a3 (commit)
- Log -----------------------------------------------------------------
commit 4fff751b2cf978d2a611a3a3c3ac65befb5102a3
Author: blake <blake at mobiusconsortium.org>
Date: Wed Aug 22 16:18:26 2018 -0500
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: blake <blake at mobiusconsortium.org>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..dce01bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,608 @@
-Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs.
-Those seeking a change log are encouraged to run 'git log -v', or read
-it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log
+commit b51e8505f7ad4f9ae246074a803a0e0ddee8452a
+Author: blake <blake at mobiusconsortium.org>
+Date: Wed Aug 22 16:15:38 2018 -0500
+
+ bumping Perl version string for 3.1.5
+
+ Signed-off-by: blake <blake at mobiusconsortium.org>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit 206ae778b88d211908a355c5af42a13f9bf1b15b
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Wed Aug 22 17:11:15 2018 -0400
+
+ Translation updates - po files
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+102 63 build/i18n/po/webstaff/ar-JO.po
+102 63 build/i18n/po/webstaff/cs-CZ.po
+67 61 build/i18n/po/webstaff/en-GB.po
+102 63 build/i18n/po/webstaff/es-ES.po
+76 61 build/i18n/po/webstaff/hy-AM.po
+67 61 build/i18n/po/webstaff/ru-RU.po
+
+commit 9faf6932695cb5726c089c016a7edc8a5b8b6314
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Wed Aug 22 17:04:40 2018 -0400
+
+ Translation updates - newpot
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+1295 1295 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot
+212 203 build/i18n/po/webstaff/webstaff.pot
+
+commit 508b86dd9956bf84996f2da033a67113b9c83811
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Wed Aug 22 13:57:32 2018 -0700
+
+ Docs: finalizing 3.0.11 release notes
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+2 0 docs/RELEASE_NOTES_3_0.adoc
+
+commit 799ed8222141884d3e0b6406a21166e4281d2dbd
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Wed Aug 22 13:58:24 2018 -0700
+
+ Docs: finalizing 3.1.5 release notes
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+2 0 docs/RELEASE_NOTES_3_1.adoc
+
+commit c2eecb2a1ab27cb4bca22146db22e1ca86070a43
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Wed Aug 22 09:07:55 2018 -0400
+
+ LP1733590: Only Print Selected Items Out
+
+ The list of selected items being passed to print_receipt
+ was being ignored and the whole list of items currently
+ checked out used instead. This patch uses the list
+ presented so staff can only print those items that they
+ want to, such as a small number of items renewed today,
+ etc.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+1 1 Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+
+commit c916ef9a7da376f3aed6936069cc344d35476631
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Wed Aug 22 10:22:20 2018 -0700
+
+ Docs: more release notes for 3.1.5
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+7 2 docs/RELEASE_NOTES_3_1.adoc
+
+commit f20f2dcf1132470bfcb6e9df30cf28c6c85f697c
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Wed Aug 22 10:18:29 2018 -0700
+
+ Docs: updating 3.0.11 release notes
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+9 2 docs/RELEASE_NOTES_3_0.adoc
+
+commit df268ea7d48b210eb564ff33ba0c7ba0f4f05b6f
+Author: a. bellenir <ab at grpl.org>
+Date: Wed Aug 22 11:33:55 2018 -0400
+
+ LP#1788417: boolean fields should say 'Yes'/'No' instead of true/false
+
+ boolean fields on egGrid use tt2-translated strings for "Yes" and "No"
+ instead of letting the browser translate the values 'true' and 'false'
+ (in accordance with the prophecy of XUL)
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+2 0 Open-ILS/src/templates/staff/base_js.tt2
+4 5 Open-ILS/web/js/ui/default/staff/services/grid.js
+
+commit e112c316136a6068effa549b6aaff4e1113b2796
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Thu May 31 15:12:55 2018 -0400
+
+ LP#1774448 Auth poll spam/timing repairs
+
+ Avoid spamming the server with authentication session checks on bad poll
+ time values. Specifically, never poll more often than once per minute
+ and avoid integer overflow on long authentication timeout values
+ (greater than about 24.8 days) resulting in the poll running with an
+ effective timeout of zero and spamming the server with API calls.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+
+14 3 Open-ILS/web/js/ui/default/staff/services/auth.js
+
+commit dcd4c6a88e0518010c9afc3619fe9fa44dab3b48
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Aug 10 12:16:57 2018 -0400
+
+ LP#1724029 Patron search API returns correct order
+
+ Avoid use of max_chunk_size in patron search API as it results in
+ streaming responses in the wrong order. Use max_bundle_count instead,
+ which does not suffer from the sorting issues. What's more, its purpose
+ and affect is easier to grasp in the code.
+
+ Bundle count is set to 5 so the API will begin returning results at most
+ 5 patrons into the data fleshing process.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
+
+2 10 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
+
+commit 4017ddc04148d49cc952dc17b10c2dd4f1669611
+Author: a. bellenir <ab at grpl.org>
+Date: Mon Jun 4 14:25:00 2018 -0400
+
+ LP#1743801: Item Status List Display Issues
+
+ Update fm_IDL.xml, establishing circ_as_type as a link to
+ config::item_type_map. Flesh this field to display desired value on
+ client side.
+
+ Conflicts:
+ Open-ILS/web/js/ui/default/staff/circ/services/item.js
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+2 1 Open-ILS/examples/fm_IDL.xml
+1 1 Open-ILS/src/templates/staff/cat/item/t_list.tt2
+1 1 Open-ILS/web/js/ui/default/staff/circ/services/item.js
+
+commit 98820ce8d456bc20e01f52e1bf010cf2667b422a
+Author: a. bellenir <ab at grpl.org>
+Date: Thu May 24 11:44:28 2018 -0400
+
+ LP#1743801: Item Status List View Display Issues
+
+ Age Protection was missing '.name' field.
+
+ Loan Duration and Fine Levels are numeric: 1, 2, or 3.
+ Added an Angular filter to show the desired string from numeric index.
+
+ Conflicts:
+ Open-ILS/src/templates/staff/cat/item/t_list.tt2
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+7 3 Open-ILS/src/templates/staff/cat/item/t_list.tt2
+1 0 Open-ILS/web/js/ui/default/staff/circ/services/item.js
+
+commit bac23909865c4974fadea38440bf3350b5f2a23e
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Tue Aug 21 10:12:45 2018 -0700
+
+ Docs: Adding release notes for 3.1.5
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+58 0 docs/RELEASE_NOTES_3_1.adoc
+
+commit 0081285486fa9877ea39fa35dbf5413b2a5991a2
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Tue Aug 21 10:10:32 2018 -0700
+
+ Docs: Adding release notes for 3.0.11
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+55 0 docs/RELEASE_NOTES_3_0.adoc
+
+commit 90d9b56c3c4dfb4aecd819f9fd17f7a8838b0efc
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Mon Aug 20 16:47:23 2018 -0700
+
+ Docs: removing outdated info about alerts
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+0 25 docs/circulation/circulating_items.adoc
+
+commit 430722bda226efcda08fe7c001f4a70e6b50e441
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Fri Aug 17 12:25:55 2018 -0700
+
+ Docs: small changes to record bucket docs
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+4 1 docs/cataloging/record_buckets.adoc
+
+commit 1f20d447c3414bdeb9b7a0a658eafcffe9230eb5
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Aug 15 18:10:08 2018 -0400
+
+ LP#1775216: Stamping upgrade script for inconsistent copy counts
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+ Conflicts:
+ Open-ILS/src/sql/Pg/002.schema.config.sql
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+0 88 Open-ILS/src/sql/Pg/upgrade/1112.schema.lp1775216_consistent_avail_counts.sql
+90 0 Open-ILS/src/sql/Pg/upgrade/1119.schema.lp1775216_consistent_avail_counts.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/1112.schema.lp1775216_consistent_avail_counts.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1119.schema.lp1775216_consistent_avail_counts.sql
+
+commit eb4931b9e6087f538cac53a9c7c8f5188421f013
+Author: a. bellenir <ab at grpl.org>
+Date: Fri Jun 15 15:53:10 2018 -0400
+
+ LP#1587620: inconsistent copy counts between opac and staff client for peer bibs
+
+ staff copy counts should include peer bib copies, per LP1587620.
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+34 20 Open-ILS/src/sql/Pg/040.schema.asset.sql
+26 15 Open-ILS/src/sql/Pg/upgrade/1112.schema.lp1775216_consistent_avail_counts.sql
+
+commit 35766b15ce9810098f16dbdb1561e9c7086faa57
+Author: a. bellenir <ab at grpl.org>
+Date: Fri Jun 8 11:42:53 2018 -0400
+
+ LP#1775216: inconsistent copy counts between opac and staff client
+
+ opac version of copy counts was including copies under deleted call numbers
+ more discussion here: http://irc.evergreen-ils.org/evergreen/2018-06-08#i_363334
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 0 Open-ILS/src/sql/Pg/040.schema.asset.sql
+41 0 Open-ILS/src/sql/Pg/upgrade/1112.schema.lp1775216_consistent_avail_counts.sql
+
+commit b81f987dd7e0ac052fd97afafc370cae4fccb735
+Author: a. bellenir <ab at grpl.org>
+Date: Fri Jun 8 10:29:59 2018 -0400
+
+ LP#1775216: adding a pgtap test for inconsistent availability counts
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+35 0 Open-ILS/src/sql/Pg/t/lp1775216-inconsistent-available-counts.pg
+ create mode 100644 Open-ILS/src/sql/Pg/t/lp1775216-inconsistent-available-counts.pg
+
+commit ecda99aa2eaf242a1650959206e27a5c98350a22
+Author: a. bellenir <ab at grpl.org>
+Date: Tue Jun 5 15:56:24 2018 -0400
+
+ LP#1775216: inconsistent availability counts between staff client and opac
+
+ update asset.staff_ou_record_copy_count to get an accurate available count.
+
+ borrow asset.opac_ou_record_copy_count's logic for counting available copies
+ so that statuses with is_available set to 't' in config.copy_status are used
+ instead of using the hardcoded status id list (0,7,12)
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+3 1 Open-ILS/src/sql/Pg/040.schema.asset.sql
+36 0 Open-ILS/src/sql/Pg/upgrade/1112.schema.lp1775216_consistent_avail_counts.sql
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1112.schema.lp1775216_consistent_avail_counts.sql
+
+commit b12934fe72b4996ffbab8bebe4cf04e4f882d387
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Aug 14 15:22:49 2018 -0400
+
+ LP#1770981 Apply OpenSRF locale on webstaff page load
+
+ Translate the locale from the locale cookie into the global
+ OpenSRF.locale variable so network calls are stamped with the correct
+ locale.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+13 1 Open-ILS/web/js/ui/default/staff/services/startup.js
+
+commit 5d40327d79fd2f913944aaeca858c72f95cc702b
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Aug 7 14:27:47 2018 -0400
+
+ LP#1718032 Patron merge honors group perms; no self-merge
+
+ Ensure the staff performing a patron merge have sufficient permission to
+ edit all users involved in the merge process, in addition the
+ MERGE_USERS permssion.
+
+ Prevent staff from merging their own logged in account.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
+
+12 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
+1 0 Open-ILS/src/templates/staff/circ/patron/index.tt2
+14 7 Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+
+commit 5268e48c08c0f5684792a1ac420403c7b052a543
+Author: Garry Collum <gcollum at gmail.com>
+Date: Sun Jun 10 00:08:53 2018 -0400
+
+ LP#1752891 Crowded text on Print Item Labels page fix.
+
+ This patch replaces an h4 style used for labels for dropdown lists, removes a blue background, and changes the style of the title of the page. All to make this page look more consistent with other pages in Evergreen. Also removes some unnecessary extra divs and makes the bootstrap columns for the top form more consistent.
+
+ Signed-off-by: Garry Collum <gcollum at gmail.com>
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+ Conflicts:
+ Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
+
+32 29 Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
+
+commit ca8ae4410a69ab68ca4e704da7982d7457f50955
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Fri Aug 10 10:34:28 2018 -0700
+
+ Docs: sample patron import script now also updates existing patron data
+
+ With inspiration and help from Martha Driscoll
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+41 6 docs/admin_initial_setup/migrating_patron_data.adoc
+
+commit a65b26f4e29a2d1273fde69421625b1a2bff7794
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Thu Aug 9 10:20:54 2018 -0400
+
+ LP#1775719 Modify array check for Phantomjs; reduce logging;
+
+ PhantomJS doesn't support the handy [1,2,3].includes(1) function, so
+ replace it with the tried-and-true indexOf();
+
+ Avoid logging errors on failure to connect to the shared offline worker
+ when running within phantomjs.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+5 2 Open-ILS/web/js/ui/default/staff/services/lovefield.js
+
+commit 40a3132236393425cfb8fd4d7d2fee6e984ab62c
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Aug 7 15:00:12 2018 -0400
+
+ LP#1747512 Non-cat checkout fix display/print
+
+ Fixes an issue which caused an exception to be thrown during non-cat
+ item checkout in the browser client, preventing the checkout from being
+ properly displayed in the checkout page, the Items Out list, and on the
+ receipt.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+3 1 Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
+
+commit ef09ffa85b04f82e253102e7c31e44dfecff6deb
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Fri Jul 7 15:34:57 2017 -0400
+
+ LP#1702978: memcache Remove method used in a variadic way
+
+ Related to the OpenSRF branch on this same bug, the prevents Evergreen from
+ using a to-be-non-variadic memcache method in that way. This prevents issues
+ for memcache keys that contain a %.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+3 1 Open-ILS/src/c-apps/oils_auth.c
+
+commit 46ff8dcbeea5dd81a5b2efabed54e54378404573
+Author: a. bellenir <ab at grpl.org>
+Date: Wed Aug 8 11:49:57 2018 -0400
+
+ LP#1785305: Item Status 'Edited By' shows id instead of username.
+
+ This commit changes Item Status 'Edited By' field to show the editor's
+ username to match XUL.
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: John Amundson <jamundson at cwmars.org>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1 1 Open-ILS/src/templates/staff/cat/item/t_list.tt2
+1 1 Open-ILS/web/js/ui/default/staff/circ/services/item.js
+
+commit 10e4be8363b77cc9cd708348f2a1fff46c16efb4
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Aug 7 17:41:23 2018 -0400
+
+ LP#621459 Clear Z39 overlay target message after overlay
+
+ Reset the "Record with TCN XXX marked for overlay." message to show "No
+ record marked for overlay." once the overlay target is cleared after a
+ Z39 overlay.
+
+ Removed an errant '"' in the overlay message.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/templates/staff/cat/z3950/t_list.tt2
+1 0 Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
+
+commit 2e199328052d71202b3a55a22263a3be82ad61d6
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Fri Aug 3 11:00:25 2018 -0400
+
+ LP#621459: Discard overlay target after merge in Z39.50 interface
+
+ Cataloger concensus is that we should discard the overlay target after a merge
+ is completed in order to help avoid accidental re-overlay.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+2 1 Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
+
+commit 093e22d923c28d0a81c27fd2647e6ebbeaf9a2e5
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Wed Jan 10 11:55:08 2018 -0500
+
+ LP#1739460: Be more careful when gathering shelving locations
+
+ Specifically, make sure we're getting the IDs, and comparing them as numbers.
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+5 3 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+3 3 Open-ILS/web/js/ui/default/staff/services/org.js
+
+commit 7201dd039de661d57b9935f763531492536e11da
+Author: a. bellenir <ab at grpl.org>
+Date: Tue Aug 7 18:18:41 2018 -0400
+
+ LP#1785333: Right-click can clear grid selection
+
+ This commit uses egGrid's indexValue API to identify the clicked row rather
+ than depending on grid row order when checking whether the that row is
+ currently selected. This is a generalized fix for all grids.
+
+ Signed-off-by: a. bellenir <ab at grpl.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+3 8 Open-ILS/web/js/ui/default/staff/services/grid.js
+
+commit 43aca456ff7f31c00e5521c70f933e25ebf433a0
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Aug 7 12:10:17 2018 -0400
+
+ LP#1768947 Disable offline download button, improve logging
+
+ Once the offline block list download button is clicked, it's disabled to
+ prevent any possibility of double-clicks. The shared worker also
+ reports a more meaningful error in case a double-click sneaks past.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 0 Open-ILS/src/templates/staff/offline-interface.tt2
+7 2 Open-ILS/web/js/ui/default/staff/offline-db-worker.js
+6 1 Open-ILS/web/js/ui/default/staff/offline.js
+
+commit 7b524077059caa4d27d45f516b6374d8f64e005c
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Jun 22 10:56:02 2018 -0400
+
+ LP#1768947 Offline xact presence is cached; show date
+
+ Maintain an entry to the object date cache table indicating the time of
+ the most recent offline transaction entry. This data is used on the
+ login page to determine if offline transactions exist, so the staff
+ logging in can be notified. We do this in lieu of checking the offline
+ transaction table, since that table only exists in the offline UI.
+
+ As a bonus, since we know the last transaction add time, display this
+ information in the login page offline xact alert panel.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+8 3 Open-ILS/src/templates/staff/t_login.tt2
+14 0 Open-ILS/web/js/ui/default/staff/offline-db-worker.js
+38 12 Open-ILS/web/js/ui/default/staff/services/lovefield.js
+
+commit 7ec111ee9b27a050b0a19e1e51ed0ac33802831a
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri Jun 8 13:08:18 2018 -0400
+
+ LP#1768947 Offline DB runs in shared web worker
+
+ Move the lovefield database access logic into a shared web worker
+ script. This ensures the only one connection (per schema) can exist,
+ avoiding data integrity problems caused by having multiple tabs writing
+ to the database at the same time.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+8 0 Open-ILS/src/templates/staff/base_js.tt2
+394 0 Open-ILS/web/js/ui/default/staff/offline-db-worker.js
+18 24 Open-ILS/web/js/ui/default/staff/offline.js
+265 270 Open-ILS/web/js/ui/default/staff/services/lovefield.js
+4 2 Open-ILS/web/js/ui/default/staff/webpack.config.js
+ create mode 100644 Open-ILS/web/js/ui/default/staff/offline-db-worker.js
+
+commit 7a47445b02c1a558a992214dc0460e65cc79477e
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Jun 19 11:27:43 2018 -0400
+
+ LP1739284 Bib summary fetches classification scheme
+
+ Always fetch the classification scheme org setting (or access the cached
+ value) instead of relying on the value getting stored in advance in
+ egEnv.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+12 8 Open-ILS/web/js/ui/default/staff/cat/services/record.js
+
+commit d73230bdb66a2465ff4faeef222dd3fa8366aa0b
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Fri May 18 13:15:57 2018 -0400
+
+ LP#1770973 Webstaff loads locale-specific IDL
+
+ Fetch the locale-specific version of the /IDL2js data so that IDL-based
+ labels in the UI may be correctly translated.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Garry Collum <gcollum at gmail.com>
+
+9 2 Open-ILS/src/templates/staff/base_js.tt2
+
+commit 9689fc182c45921f1401e0968f37848f90bc2ea8
+Author: John Yorio <jyorio at equinoxinitiative.org>
+Date: Tue May 22 09:05:46 2018 -0400
+
+ LP#1193446: circ.staff.max_visible_event_age setting
+
+ Signed-off-by: John Yorio <jyorio at equinoxinitiative.org>
+ Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+
+1 1 Open-ILS/examples/fm_IDL.xml
+
+commit 2a25da596ff04b00c54976013ff4517a99652b11
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Thu Jul 26 10:32:36 2018 -0400
+
+ Forward-port 3.1.4 upgrade script
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+257 0 Open-ILS/src/sql/Pg/version-upgrade/3.1.3-3.1.4-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/3.1.3-3.1.4-upgrade-db.sql
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..a96a845 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
sub ils_version {
# version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
# For branches, format is "x-y"
- return "HEAD";
+ return "3-1-5";
}
__PACKAGE__->register_method(
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index c52edf4..252e47b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -93,6 +93,7 @@ CREATE TRIGGER no_overlapping_deps
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1119', :eg_version); -- idjit/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.1.5', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.1.4-3.1.5-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.1.4-3.1.5-upgrade-db.sql
new file mode 100644
index 0000000..9919ef7
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/3.1.4-3.1.5-upgrade-db.sql
@@ -0,0 +1,95 @@
+--Upgrade Script for 3.1.4 to 3.1.5
+\set eg_version '''3.1.5'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.1.5', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1119', :eg_version);
+
+CREATE OR REPLACE FUNCTION asset.staff_ou_record_copy_count(org integer, rid bigint)
+ RETURNS TABLE(depth integer, org_unit integer, visible bigint, available bigint, unshadow bigint, transcendant integer)
+ LANGUAGE plpgsql
+AS $function$
+DECLARE
+ ans RECORD;
+ trans INT;
+BEGIN
+ SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+ FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+ RETURN QUERY
+ WITH available_statuses AS (SELECT ARRAY_AGG(id) AS ids FROM config.copy_status WHERE is_available),
+ cp AS(
+ SELECT cp.id,
+ (cp.status = ANY (available_statuses.ids))::INT as available,
+ (cl.opac_visible AND cp.opac_visible)::INT as opac_visible
+ FROM
+ available_statuses,
+ actor.org_unit_descendants(ans.id) d
+ JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+ JOIN asset.copy_location cl ON (cp.location = cl.id AND NOT cl.deleted)
+ JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted)
+ ),
+ peer AS (
+ SELECT cp.id,
+ (cp.status = ANY (available_statuses.ids))::INT as available,
+ (cl.opac_visible AND cp.opac_visible)::INT as opac_visible
+ FROM
+ available_statuses,
+ actor.org_unit_descendants(ans.id) d
+ JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted)
+ JOIN asset.copy_location cl ON (cp.location = cl.id AND NOT cl.deleted)
+ JOIN biblio.peer_bib_copy_map bp ON (bp.peer_record = rid AND bp.target_copy = cp.id)
+ )
+ SELECT ans.depth, ans.id, count(id), sum(x.available::int), sum(x.opac_visible::int), trans
+ FROM ((select * from cp) union (select * from peer)) x
+ GROUP BY 1,2,6;
+
+ IF NOT FOUND THEN
+ RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+ END IF;
+
+ END LOOP;
+ RETURN;
+END;
+$function$;
+
+CREATE OR REPLACE FUNCTION asset.opac_ou_record_copy_count(org integer, rid bigint)
+ RETURNS TABLE(depth integer, org_unit integer, visible bigint, available bigint, unshadow bigint, transcendant integer)
+ LANGUAGE plpgsql
+AS $function$
+DECLARE
+ ans RECORD;
+ trans INT;
+BEGIN
+ SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid;
+
+ FOR ans IN SELECT u.id, t.depth FROM actor.org_unit_ancestors(org) AS u JOIN actor.org_unit_type t ON (u.ou_type = t.id) LOOP
+ RETURN QUERY
+ WITH org_list AS (SELECT ARRAY_AGG(id)::BIGINT[] AS orgs FROM actor.org_unit_descendants(ans.id) x),
+ available_statuses AS (SELECT ARRAY_AGG(id) AS ids FROM config.copy_status WHERE is_available),
+ mask AS (SELECT c_attrs FROM asset.patron_default_visibility_mask() x)
+ SELECT ans.depth,
+ ans.id,
+ COUNT( av.id ),
+ SUM( (cp.status = ANY (available_statuses.ids))::INT ),
+ COUNT( av.id ),
+ trans
+ FROM mask,
+ available_statuses,
+ org_list,
+ asset.copy_vis_attr_cache av
+ JOIN asset.copy cp ON (cp.id = av.target_copy AND av.record = rid)
+ JOIN asset.call_number cn ON (cp.call_number = cn.id AND not cn.deleted)
+ WHERE cp.circ_lib = ANY (org_list.orgs) AND av.vis_attr_vector @@ mask.c_attrs::query_int
+ GROUP BY 1,2,6;
+
+ IF NOT FOUND THEN
+ RETURN QUERY SELECT ans.depth, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans;
+ END IF;
+
+ END LOOP;
+
+ RETURN;
+END;
+$function$;
+
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index b2b87b6..01d17a1 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -1,7 +1,7 @@
<html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
<h1 style="text-decoration: underline">Evergreen</h1>
<p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_1_5</p>
<h2>What is Evergreen?</h2>
<blockquote>
<p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..57d05cd 100644
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main");
pref("open-ils.enable_join_tabs", true);
// We'll use this one to help brand some build information into the client, and rely on subversion keywords
-pref("open-ils.repository.headURL","$HeadURL$");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_1_5");
pref("open-ils.repository.author","$Author$");
pref("open-ils.repository.revision","$Revision$");
pref("open-ils.repository.date","$Date$");
diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi
index a954357..ae0bbdf 100644
--- a/Open-ILS/xul/staff_client/windowssetup.nsi
+++ b/Open-ILS/xul/staff_client/windowssetup.nsi
@@ -3,7 +3,7 @@
; HM NIS Edit Wizard helper defines
; Old versions of makensis don't like this, moved to Makefile
;!define /file PRODUCT_VERSION "client/VERSION"
-!define PRODUCT_TAG "Master"
+!define PRODUCT_TAG "3.1"
!define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}"
!define UI_IMAGESET "beta"
;!define UI_IMAGESET "release"
diff --git a/README b/README
deleted file mode 120000
index 1ee2103..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.adoc
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..f479c74
--- /dev/null
+++ b/README
@@ -0,0 +1,685 @@
+Installing the Evergreen server
+===============================
+:toc:
+:numbered:
+
+Preamble: referenced user accounts
+----------------------------------
+
+In subsequent sections, we will refer to a number of different accounts, as
+follows:
+
+ * Linux user accounts:
+ ** The *user* Linux account is the account that you use to log onto the
+ Linux system as a regular user.
+ ** The *root* Linux account is an account that has system administrator
+ privileges. On Debian you can switch to this account from
+ your *user* account by issuing the `su -` command and entering the
+ password for the *root* account when prompted. On Ubuntu you can switch
+ to this account from your *user* account using the `sudo su -` command
+ and entering the password for your *user* account when prompted.
+ ** The *opensrf* Linux account is an account that you create when installing
+ OpenSRF. You can switch to this account from the *root* account by
+ issuing the `su - opensrf` command.
+ ** The *postgres* Linux account is created automatically when you install
+ the PostgreSQL database server. You can switch to this account from the
+ *root* account by issuing the `su - postgres` command.
+ * PostgreSQL user accounts:
+ ** The *evergreen* PostgreSQL account is a superuser account that you will
+ create to connect to the PostgreSQL database server.
+ * Evergreen administrator account:
+ ** The *egadmin* Evergreen account is an administrator account for
+ Evergreen that you will use to test connectivity and configure your
+ Evergreen instance.
+
+Preamble: developer instructions
+--------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must perform one step before they
+can proceed with the `./configure` step.
+
+As the *user* Linux account, issue the following command in the Evergreen
+source directory to generate the configure script and Makefiles:
+
+[source, bash]
+------------------------------------------------------------------------------
+autoreconf -i
+------------------------------------------------------------------------------
+
+Installing prerequisites
+------------------------
+
+ * **PostgreSQL**: The minimum supported version is 9.4.
+ * **Linux**: Evergreen has been tested on Debian Stretch (9),
+ Debian Jessie (8), Debian Wheezy (7), Ubuntu Xenial Xerus (16.04),
+ and Ubuntu Trusty Tahr (14.04).
+ If you are running an older version of these distributions, you may want
+ to upgrade before upgrading Evergreen. For instructions on upgrading these
+ distributions, visit the Debian or Ubuntu websites.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 3.0.0.
+
+
+Evergreen has a number of prerequisite packages that must be installed
+before you can successfully configure, compile, and install Evergreen.
+
+1. Begin by installing the most recent version of OpenSRF (3.0.0 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On some distributions, it is necessary to install PostgreSQL 9.4+ from external
+ repositories.
++
+ * Debian (Wheezy) and Ubuntu (Trusty) comes with older versions of
+ PostgreSQL, so steps are taken to automatically utilize the
+ PostgreSQL community's apt sources.
+ (For complete details, see: https://wiki.postgresql.org/wiki/Apt)
+ * Debian (Jessie/Stretch) and Ubuntu (Xenial) comes with PostgreSQL 9.4+,
+ so no additional steps are required.
++
+3. Issue the following commands as the *root* Linux account to install
+ prerequisites using the `Makefile.install` prerequisite installer,
+ substituting `debian-stretch`, `debian-jessie`, `debian-wheezy`,
+ `ubuntu-xenial`, or `ubuntu-trusty` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+4. Add the libdbi-libdbd libraries to the system dynamic library path by
+ issuing the following commands as the *root* Linux account:
++
+[NOTE]
+You should skip this step if installing on Ubuntu Trusty/Xenial or Debian Jessie/Stretch. The Ubuntu
+and Debian Jessie/Stretch targets use libdbd-pgsql from packages.
++
+.Debian Wheezy
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
+
+[[optional_developer_additions]]
+5. OPTIONAL: Developer additions
++
+To perform certain developer tasks from a Git source code checkout,
+additional packages may be required. As the *root* Linux account:
++
+ * To install packages needed for retrieving and managing web dependencies,
+ use the <osname>-developer Makefile.install target. Currently,
+ this is only needed for building and installing the (preview) browser
+ staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen translations, use
+ the <osname>-translator Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-translator
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen release bundles, use
+ the <osname>-packager Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-packager
+------------------------------------------------------------------------------
+
+Extra steps for web staff client
+--------------------------------
+
+[NOTE]
+Skip this entire section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+Install dependencies for web staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+[NOTE]
+You may skip this section if you have installed the
+<<optional_developer_additions,optional developer additions>>. You will still need to do the following
+steps in <<install_files_for_web_staff_client,Install files for web staff client>>.
+
+1. Install the long-term stability (LTS) release of
+https://nodejs.org[Node.js]. Add the Node.js `/bin` directory to your
+environment variable `PATH`.
+
+[[install_files_for_web_staff_client]]
+Install files for web staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Building, Testing, Minification: The remaining steps all take place within
+ the staff JS web root:
++
+[source,sh]
+------------------------------------------------------------------------------
+cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/
+------------------------------------------------------------------------------
++
+2. Install Project-local Dependencies. npm inspects the 'package.json' file
+ for dependencies and fetches them from the Node package network.
++
+[source,sh]
+------------------------------------------------------------------------------
+npm install # fetch JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build, run tests, concat+minify
+npm run build-prod
+npm run test
+------------------------------------------------------------------------------
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+ command as the *root* Linux account to install Evergreen, build the server
+ portion of the staff client, and copy example configuration files to
+ `/openils/conf`.
+ Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+ of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_3_1_5 install
+------------------------------------------------------------------------------
++
+2. The server portion of the staff client expects `http://hostname/xul/server`
+ to resolve. Issue the following commands as the *root* Linux account to
+ create a symbolic link pointing to the `server` subdirectory of the server
+ portion of the staff client that we just built using the staff client ID
+ 'rel_name':
++
+[source, bash]
+------------------------------------------------------------------------------
+cd /openils/var/web/xul
+ln -sf rel_name/server server
+------------------------------------------------------------------------------
+
+Change ownership of the Evergreen files
+---------------------------------------
+
+All files in the `/openils/` directory and subdirectories must be owned by the
+`opensrf` user. Issue the following command as the *root* Linux account to
+change the ownership on the files:
+
+[source, bash]
+------------------------------------------------------------------------------
+chown -R opensrf:opensrf /openils
+------------------------------------------------------------------------------
+
+Run ldconfig
+------------
+
+On Debian Stretch, run the following command as the root user:
+
+[source, bash]
+------------------------------------------------------------------------------
+ldconfig
+------------------------------------------------------------------------------
+
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
+Configure the Apache Web server
+-------------------------------
+
+. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian Wheezy
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty/Xenial and Debian Jessie/Stretch
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+ a. To enable access to the offline upload / execute interface from any
+ workstation on any network, make the following change (and note that
+ you *must* secure this for a production instance):
+ * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+ * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+. Change the user for the Apache server.
+ * (Debian and Ubuntu): As the *root* Linux account, edit
+ `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to
+ `export APACHE_RUN_USER=opensrf`.
+. As the *root* Linux account, configure Apache with KeepAlive settings
+ appropriate for Evergreen. Higher values can improve the performance of a
+ single client by allowing multiple requests to be sent over the same TCP
+ connection, but increase the risk of using up all available Apache child
+ processes and memory.
+ * (Debian and Ubuntu): Edit `/etc/apache2/apache2.conf`.
+ a. Change `KeepAliveTimeout` to `1`.
+ b. Change `MaxKeepAliveRequests` to `100`.
+. As the *root* Linux account, configure the prefork module to start and keep
+ enough Apache servers available to provide quick responses to clients without
+ running out of memory. The following settings are a good starting point for a
+ site that exposes the default Evergreen catalogue to the web:
++
+.Debian Wheezy (`/etc/apache2/apache2.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxClients 75
+ MaxRequestsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty/Xenial, Debian Jessie/Stretch (`/etc/apache2/mods-available/mpm_prefork.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxRequestWorkers 75
+ MaxConnectionsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+. (Ubuntu Trusty/Xenial, Debian Jessie/Stretch) As the *root* user,
+ enable the mpm_prefork module:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+. (Debian Wheezy): As the *root* Linux account, enable the Evergreen site:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty/Xenial, Debian Jessie/Stretch):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+. (Debian and Ubuntu): As the *root* Linux account, enable Apache to write
+ to the lock directory; this is currently necessary because Apache
+ is running as the `opensrf` user:
++
+[source,bash]
+------------------------------------------------------------------------------
+chown opensrf /var/lock/apache2
+------------------------------------------------------------------------------
+
+Learn more about additional Apache options in the following sections:
+
+ * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+ * <<_apache_access_handler_perl_module,Apache Access Handler Perl Module>>
+
+Configure OpenSRF for the Evergreen application
+-----------------------------------------------
+There are a number of example OpenSRF configuration files in `/openils/conf/`
+that you can use as a template for your Evergreen installation. Issue the
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml
+cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
+------------------------------------------------------------------------------
+
+When you installed OpenSRF, you created four Jabber users on two
+separate domains and edited the `opensrf_core.xml` file accordingly. Please
+refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the
+Evergreen version of the `opensrf_core.xml` file using the same Jabber users
+and domains as you used while installing and testing OpenSRF.
+
+[NOTE]
+The `-b` flag tells the `cp` command to create a backup version of the
+destination file. The backup version of the destination file has a tilde (`~`)
+appended to the file name, so if you have forgotten the Jabber users and
+domains, you can retrieve the settings from the backup version of the files.
+
+`eg_db_config`, described in <<_creating_the_evergreen_database,Creating the Evergreen
+database>>, sets the database connection information in `opensrf.xml` for you.
+
+Configure action triggers for the Evergreen application
+-------------------------------------------------------
+_Action Triggers_ provide hooks for the system to perform actions when a given
+event occurs; for example, to generate reminder or overdue notices, the
+`checkout.due` hook is processed and events are triggered for potential actions
+if there is no checkin time.
+
+To enable the default set of hooks, issue the following command as the
+*opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json
+------------------------------------------------------------------------------
+
+For more information about configuring and running action triggers, see
+<<_processing_action_triggers,Notifications / Action Triggers>>.
+
+Creating the Evergreen database
+-------------------------------
+
+Setting up the PostgreSQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For production use, most libraries install the PostgreSQL database server on a
+dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
+installer does *not* install the PostgreSQL 9 database server that is required
+by every Evergreen system. You can install the packages required by Debian or
+Ubuntu on the machine of your choice using the following commands as the
+*root* Linux account:
+
+.(Debian / Ubuntu) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system. To install Postgres server packages,
+use the make target 'postgres-server-<OSTYPE>'. Choose the most appropriate
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-stretch
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Debian and Ubuntu)
+No extra modules required for these distributions.
+
+You need to create a PostgreSQL superuser to create and access the database.
+Issue the following command as the *postgres* Linux account to create a new
+PostgreSQL superuser named `evergreen`. When prompted, enter the new user's
+password:
+
+[source, bash]
+------------------------------------------------------------------------------
+createuser -s -P evergreen
+------------------------------------------------------------------------------
+
+.Enabling connections to the PostgreSQL database
+
+Your PostgreSQL database may be configured by default to prevent connections,
+for example, it might reject attempts to connect via TCP/IP or from other
+servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf`
+file, found in the `/etc/postgresql/` directory on Debian and Ubuntu.
+A simple way to enable TCP/IP
+connections from localhost to all databases with password authentication, which
+would be suitable for a test install of Evergreen on a single server, is to
+ensure the file contains the following entries _before_ any "host ... ident"
+entries:
+
+------------------------------------------------------------------------------
+host all all ::1/128 md5
+host all all 127.0.0.1/32 md5
+------------------------------------------------------------------------------
+
+When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to
+make the changes take effect. For more information on configuring connectivity
+to PostgreSQL, see
+http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html
+
+Creating the Evergreen database and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have created the *evergreen* PostgreSQL account, you also need to
+create the database and schema, and configure your configuration files to point
+at the database server. Issue the following command as the *root* Linux account
+from inside the Evergreen source directory, replacing <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+with the values you want for the *egadmin* Evergreen administrator account:
+
+[source, bash]
+------------------------------------------------------------------------------
+perl Open-ILS/src/support-scripts/eg_db_config --update-config \
+ --service all --create-database --create-schema --create-offline \
+ --user <user> --password <password> --hostname <hostname> --port <port> \
+ --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass>
+------------------------------------------------------------------------------
+
+This creates the database and schema and configures all of the services in
+your `/openils/conf/opensrf.xml` configuration file to point to that database.
+It also creates the configuration files required by the Evergreen `cgi-bin`
+administration scripts, and sets the user name and password for the *egadmin*
+Evergreen administrator account to your requested values.
+
+You can get a complete set of options for `eg_db_config` by passing the
+`--help` parameter.
+
+Loading sample data
+~~~~~~~~~~~~~~~~~~~
+If you add the `--load-all-sample` parameter to the `eg_db_config` command,
+a set of authority and bibliographic records, call numbers, copies, staff
+and regular users, and transactions will be loaded into your target
+database. This sample dataset is commonly referred to as the _concerto_
+sample data, and can be useful for testing out Evergreen functionality and
+for creating problem reports that developers can easily recreate with their
+own copy of the _concerto_ sample data.
+
+Creating the database on a remote server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In a production instance of Evergreen, your PostgreSQL server should be
+installed on a dedicated server.
+
+PostgreSQL 9.4 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.4 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_control -l --start-all
+------------------------------------------------------------------------------
++
+ ** If you receive the error message `bash: osrf_control: command not found`,
+ then your environment variable `PATH` does not include the `/openils/bin`
+ directory; this should have been set in the *opensrf* Linux account's
+ `.bashrc` configuration file. To manually set the `PATH` variable, edit the
+ configuration file `~/.bashrc` as the *opensrf* Linux account and add the
+ following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+export PATH=$PATH:/openils/bin
+------------------------------------------------------------------------------
++
+3. As the *opensrf* Linux account, generate the Web files needed by the staff
+ client and catalogue and update the organization unit proximity (you need to do
+ this the first time you start Evergreen, and after that each time you change the library org unit configuration.
+):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh
+------------------------------------------------------------------------------
++
+4. As the *root* Linux account, restart the Apache Web server:
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/apache2 restart
+------------------------------------------------------------------------------
++
+If the Apache Web server was running when you started the OpenSRF services, you
+might not be able to successfully log in to the OPAC or staff client until the
+Apache Web server is restarted.
+
+Testing connections to Evergreen
+--------------------------------
+
+Once you have installed and started Evergreen, test your connection to
+Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following
+commands to start `srfsh` and try to log onto the Evergreen server using the
+*egadmin* Evergreen administrator user name and password that you set using the
+`eg_db_config` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+You should see a result like:
+
+ Received Data: "250bf1518c7527a03249858687714376"
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 0.045286
+ ------------------------------------
+
+ Received Data: {
+ "ilsevent":0,
+ "textcode":"SUCCESS",
+ "desc":" ",
+ "pid":21616,
+ "stacktrace":"oils_auth.c:304",
+ "payload":{
+ "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a",
+ "authtime":420
+ }
+
+ }
+
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 1.336568
+ ------------------------------------
+[[install-troubleshooting-1]]
+If this does not work, it's time to do some troubleshooting.
+
+ * As the *opensrf* Linux account, run the `settings-tester.pl` script to see
+ if it finds any system configuration problems. The script is found at
+ `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source
+ tree.
+ * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide].
+ * If you have faithfully followed the entire set of installation steps
+ listed here, you are probably extremely close to a working system.
+ Gather your configuration files and log files and contact the
+ http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development
+mailing list] for assistance before making any drastic changes to your system
+ configuration.
+
+Getting help
+------------
+
+Need help installing or using Evergreen? Join the mailing lists at
+http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode
+IRC network on the #evergreen channel.
+
+License
+-------
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+Unported License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/configure.ac b/configure.ac
index dacb5a3..bc80b57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
export PATH=${PATH}:/usr/sbin
AC_PREREQ(2.61)
-AC_INIT(Open-ILS, trunk, open-ils-dev at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 3.1.5, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [3.1.5])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
diff --git a/docs/installation/server_upgrade.adoc b/docs/installation/server_upgrade.adoc
index 72f4cf6..db59c31 100644
--- a/docs/installation/server_upgrade.adoc
+++ b/docs/installation/server_upgrade.adoc
@@ -7,7 +7,7 @@ Software Prerequisites
~~~~~~~~~~~~~~~~~~~~~~
* **PostgreSQL**: The minimum supported version is 9.4.
- * **Linux**: Evergreen 3.1.1 has been tested on Debian Stretch (9.0),
+ * **Linux**: Evergreen 3.1.5 has been tested on Debian Stretch (9.0),
Debian Jessie (8.0), Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04),
and Ubuntu Trusty Tahr (14.04).
If you are running an older version of these distributions, you may want
@@ -43,12 +43,12 @@ osrf_control --localhost --stop-all
.. Back up the /openils directory.
. Upgrade OpenSRF. Download and install the latest version of OpenSRF from
the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
-. As the *opensrf* user, download and extract Evergreen 3.1.1:
+. As the *opensrf* user, download and extract Evergreen 3.1.5:
+
[source, bash]
-----------------------------------------------
-wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.1.1.tar.gz
-tar xzf Evergreen-ILS-3.1.1.tar.gz
+wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.1.5.tar.gz
+tar xzf Evergreen-ILS-3.1.5.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -58,7 +58,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl
+
[source, bash]
---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-3.1.1
+cd /home/opensrf/Evergreen-ILS-3.1.5
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -82,7 +82,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-3.1.1
+cd /home/opensrf/Evergreen-ILS-3.1.5
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -93,8 +93,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-3.1.1
-make STAFF_CLIENT_STAMP_ID=rel_3_1_1 install
+cd /home/opensrf/Evergreen-ILS-3.1.5
+make STAFF_CLIENT_STAMP_ID=rel_3_1_5 install
------------------------------------------------------------
+
. As the *root* user, change all files to be owned by the opensrf user and group:
@@ -110,7 +110,7 @@ chown -R opensrf:opensrf /openils
-----------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -sf rel_3_1_1/server server
+ln -sf rel_3_1_5/server server
----------------------------------------------------------
+
. As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -130,7 +130,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-3.1.1
+cd /home/opensrf/Evergreen-ILS-3.1.5
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -154,21 +154,21 @@ The diff command can be used to show the differences between the distribution ve
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-3.1.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-3.1.5/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
----------------------------------------------------------
+
.. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-3.1.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-3.1.5/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
----------------------------------------------------------
+
.. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-3.1.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-3.1.5/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -225,8 +225,12 @@ as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-3.1.1/Open-ILS/src/sql/Pg
+cd /home/opensrf/Evergreen-ILS-3.1.5/Open-ILS/src/sql/Pg
psql -U evergreen -h localhost -f version-upgrade/3.1.0-3.1.1-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f version-upgrade/3.1.1-3.1.2-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f version-upgrade/3.1.2-3.1.3-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f version-upgrade/3.1.3-3.1.4-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f version-upgrade/3.1.4-3.1.5-upgrade-db.sql evergreen
----------------------------------------------------------
[TIP]
commit b51e8505f7ad4f9ae246074a803a0e0ddee8452a
Author: blake <blake at mobiusconsortium.org>
Date: Wed Aug 22 16:15:38 2018 -0500
bumping Perl version string for 3.1.5
Signed-off-by: blake <blake at mobiusconsortium.org>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index d7235ce..5c9837e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS.pm
@@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system
=cut
-our $VERSION = '2.4';
+our $VERSION = '3.0105';
1;
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list