From f5e6ea6c3847c78dafdc6e0d84241f58d005017b Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Wed, 26 Sep 2018 17:01:35 -0400 Subject: [PATCH] Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Chris Sharp --- ChangeLog | 914 ++++++++++++++++++++- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../version-upgrade/3.0.11-3.0.12-upgrade-db.sql | 401 +++++++++ .../staff_client/chrome/content/main/about.html | 2 +- .../xul/staff_client/defaults/preferences/prefs.js | 2 +- Open-ILS/xul/staff_client/windowssetup.nsi | 2 +- README | 693 +++++++++++++++- configure.ac | 4 +- 9 files changed, 2011 insertions(+), 10 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/3.0.11-3.0.12-upgrade-db.sql mode change 120000 => 100644 README diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..98ebf9d5e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,911 @@ -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 14fb5063f427bd50b4fe1bbd7eff2b5a54749819 +Author: Chris Sharp +Date: Wed Sep 26 17:01:32 2018 -0400 + + Updating upgrade docs for 3.0.12. + + Signed-off-by: Chris Sharp + +16 32 docs/installation/server_upgrade.adoc + +commit e045dd61ea3885e32a99dce74a2ba04389751ef8 +Author: Chris Sharp +Date: Wed Sep 26 16:59:21 2018 -0400 + + Bumping Perl version string for 3.0.12 + + Signed-off-by: Chris Sharp + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit 89b6c8bc7436fe6a0a5e4705c0082831749e9d62 +Author: Chris Sharp +Date: Wed Sep 26 16:59:21 2018 -0400 + + Translation updates - po files + + Signed-off-by: Chris Sharp + +39 17 build/i18n/po/webstaff/ar-JO.po +39 17 build/i18n/po/webstaff/cs-CZ.po +39 17 build/i18n/po/webstaff/en-GB.po +39 17 build/i18n/po/webstaff/es-ES.po +39 17 build/i18n/po/webstaff/hy-AM.po +39 17 build/i18n/po/webstaff/ru-RU.po +1093 0 new_upgrades.txt +1091 0 old_upgrades.txt + create mode 100644 new_upgrades.txt + create mode 100644 old_upgrades.txt + +commit 06f028d32d288a44f1b2f78314ff5b1c45d52ba8 +Author: Mike Rylander +Date: Mon Aug 27 12:08:37 2018 -0400 + + LP#1786987: Locale-less org tree cache object becomes stale + + The autogen.sh script calls a function that flushes all org tree objects + cached by locale, but does not flush the one used when the locale is + unkown. This commit forces that flushing to occur. + + berick: Definition of my $cache pushed up above first use. + + Signed-off-by: Mike Rylander + Signed-off-by: Bill Erickson + +4 1 Open-ILS/src/perlmods/lib/OpenILS/Utils/Configure.pm + +commit 093d831fc1f7eeb27bbe2c06d4c44c370781cf3e +Author: Jane Sandberg +Date: Wed Sep 26 09:05:54 2018 -0700 + + Docs: Adding release notes for 3.0.12 + + Signed-off-by: Jane Sandberg + +59 0 docs/RELEASE_NOTES_3_0.adoc + +commit 4a5521ec38cdef5d47dd76b0b6bf994ba8998995 +Author: Bill Erickson +Date: Mon Sep 24 16:19:33 2018 -0400 + + LP#1794176 Avoid capturing grid cell tooltip/display values + + Remove the grid-tooltip logic that captured the cell content into a + template-level variable so the content only needed to be generated once + for both the tooltip and cell display. This logic fails to handle cases + where the cell content is dynamic, typically the result of row + attributes being modified via external process. + + Signed-off-by: Bill Erickson + + Conflicts: + Open-ILS/src/templates/staff/share/t_autogrid.tt2 + + Signed-off-by: Dan Wells + +6 7 Open-ILS/src/templates/staff/share/t_autogrid.tt2 +7 0 Open-ILS/web/js/ui/default/staff/services/grid.js + +commit ea7de510338bd4c880ee41b9b5ab1ca3102f354f +Author: Mike Rylander +Date: Wed Sep 19 11:16:39 2018 -0400 + + LP#1791335: Retain stat cats on item transfer + + For some reason, parts were protected during item transfer, but stat cats were + not. This commit protects them by fleshing stat cat entries in the outer + item transfer method. + + Signed-off-by: Mike Rylander + Signed-off-by: Bill Erickson + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm + +commit d2d255ccde1704a4e0e1ff02a2888ba836322d67 +Author: Galen Charlton +Date: Fri Sep 21 16:46:17 2018 -0400 + + LP#1791340: expand on comment about backdated checkin times + + Signed-off-by: Galen Charlton + +4 0 Open-ILS/web/js/ui/default/staff/circ/checkin/app.js + +commit f106953c692ec0bdfb7a8aaa865a8d69ae56c4ef +Author: Dan Wells +Date: Fri Sep 21 10:45:59 2018 -0400 + + LP#1791340 Webstaff: Don't backdate when we're not + + There was code in the webstaff checkin interface which attempted to + remove the backdate parameter when it wasn't needed, as its mere + presence has a negative effect on the checkin process. This fail-safe + was not working, however. + + Instead, let's build on the same check function used for the display, + so we can be more sure that if the user doesn't see that they are + backdating, the interface will not treat it as a backdate, and + vice-versa. + + Signed-off-by: Dan Wells + Signed-off-by: Galen Charlton + +4 4 Open-ILS/web/js/ui/default/staff/circ/checkin/app.js + +commit 5ae6a7bf715019fb78eb2d8da1c9693faa533477 +Author: Galen Charlton +Date: Thu Sep 20 18:26:47 2018 -0400 + + LP#1745427: account for change in prediction patterns + + This patch fixes a bug in the web staff client where changing + the active prediction pattern for a subscription would not + reset the base issue when predicting the next run of issues. + + To test + ------- + 1. Set up a subscription in the web staff client with a prediction + pattern (e.g., monthly). Predict some issues. + 2. Create/select a new prediction pattern for a new publishing schedule, + e.g., quarterly. + 3. Activate the new pattern and deactivate the old pattern. + 4. Click Predict New Issues. + 5. Enter in the new publication date/enumerations/chronology as needed. + 6. Enter a prediction count and select Save. Note that new issues + appear to be based on the previous pattern. + 7. Apply the patch, delete the issues created in step 6, then repeat + steps 4-6. This time, new issues should be created using the new + prediction pattern. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +16 7 Open-ILS/web/js/ui/default/staff/serials/services/core.js + +commit 915a3746879b472649c553717eb579de3bfab0af +Author: Mike Rylander +Date: Wed Sep 19 10:26:04 2018 -0400 + + LP#1781480: Include group owner ancestor badges + + This commit lightly refactors the badge org logic and includes the ancestors + of location group owners in the list of badge orgs, instead of only the direct + owners. + + Signed-off-by: Mike Rylander + Signed-off-by: Jeanette Lundgren + Signed-off-by: Jason Stephenson + +5 12 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm + +commit d363b8eefae87fb90b803d1b42eb9d061557cf2f +Author: Mike Rylander +Date: Mon Sep 17 11:33:29 2018 -0400 + + LP#1781480: Closures remeber values in subtle ways... + + ... and we must take care to avoid that. This commit forces a state variable + to be statically assigned an empty list rather than depending on the idiomatic + undef to vivicate an empty list. This is important for all OpenSRF methods, + and manifests here as a search "remembering" a previously chosen location + group. A comment to that point is included for our future selves. + + The core probably arises from the fact that, in the end, OpenSRF methods are + generated closures. + + Signed-off-by: Mike Rylander + Signed-off-by: Jeanette Lundgren + Signed-off-by: Jason Stephenson + +10 3 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/metabib.pm + +commit fc105fc32494a73c872c0b2e8a9362e2fc2d9f33 +Author: Mike Rylander +Date: Fri Aug 3 17:25:33 2018 -0400 + + LP#1732761: Chain the promises to avoid races + + It looks like there's a race condition gathering locations for larger copy + sets. Here we chain the promises to remove the race by serialization. + + Signed-off-by: Mike Rylander + Signed-off-by: Kathy Lussier + Signed-off-by: Jason Stephenson + + Conflicts: + Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js + +32 32 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js + +commit 918533b7cff1e7f123e1025d52ccdc1a87e40063 +Author: Mike Rylander +Date: Mon Jul 9 16:31:50 2018 -0400 + + LP#1732761: Fetch locations immediately for display + + This commit closes a race condition where location labels cannot be rendered + for the "multiple locations" widget because fetching them takes longer than + the initial render of the attribute editor. + + Signed-off-by: Mike Rylander + Signed-off-by: Kathy Lussier + Signed-off-by: Jason Stephenson + +25 3 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js + +commit 9a7b44e12bbd20d1639d146c669c9282bad49875 +Author: Mike Rylander +Date: Tue Jul 3 16:57:27 2018 -0400 + + LP#1732761: Batch item edit and multiple values per field + + Previous to this commit, the display of multiple different values for a field + in the item attribute editor was simply to display no value. Here we add a UI + component that presents the list of unique values, the number of selected + copies that use each value, and the ability to select just those copies using + a particular value by clicking on the desired value. + + Signed-off-by: Mike Rylander + Signed-off-by: Kathy Lussier + Signed-off-by: Jason Stephenson + + Conflicts: + Open-ILS/src/templates/staff/cat/volcopy/index.tt2 + Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 + +8 0 Open-ILS/src/templates/staff/cat/volcopy/index.tt2 +54 0 Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 +11 0 Open-ILS/src/templates/staff/share/t_listcounts.tt2 +89 0 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js +19 0 Open-ILS/web/js/ui/default/staff/services/grid.js +44 0 Open-ILS/web/js/ui/default/staff/services/ui.js + create mode 100644 Open-ILS/src/templates/staff/share/t_listcounts.tt2 + +commit 76fa907a2fd76bbfb3899f302109f9d51c6d756e +Author: Bill Erickson +Date: Wed Aug 29 14:05:09 2018 -0400 + + LP#1740412 Double grid tooltip max width + + Bump the max-width of the grid tooltip from 200 to 400px to accommodate + longer messages. Shorter messages will continue using narrower + tooltips. + + Signed-off-by: Bill Erickson + Signed-off-by: Michele Morgan + Signed-off-by: Kathy Lussier + Signed-off-by: John Amundson + Signed-off-by: Jason Stephenson + +4 0 Open-ILS/src/templates/staff/css/style.css.tt2 +2 0 Open-ILS/src/templates/staff/share/t_autogrid.tt2 + +commit d2ab77bc8a2e59d3ad535868525b1a99fbe4ebdd +Author: Bill Erickson +Date: Fri Aug 24 10:30:34 2018 -0400 + + LP#1740412 Grid cell tooltips moved to top-left + + Avoid rendering the tooltip in the middle of a section of overflowed + text, since it can lead to tooltips being pushed far to the right. + Render at top left of cell instead. + + Signed-off-by: Bill Erickson + Signed-off-by: Michele Morgan + Signed-off-by: Kathy Lussier + Signed-off-by: John Amundson + Signed-off-by: Jason Stephenson + +2 0 Open-ILS/src/templates/staff/share/t_autogrid.tt2 + +commit e8115509bd907248bdb1088e68fcacd5dc15d899 +Author: Bill Erickson +Date: Thu Aug 23 13:52:38 2018 -0400 + + LP#1740412 Grid cell tooltips limited to long content + + Only display grid cell tooltips when the content of the cell overflows + its container. + + Signed-off-by: Bill Erickson + Signed-off-by: Michele Morgan + Signed-off-by: Kathy Lussier + Signed-off-by: John Amundson + Signed-off-by: Jason Stephenson + +5 2 Open-ILS/src/templates/staff/share/t_autogrid.tt2 +26 0 Open-ILS/web/js/ui/default/staff/services/grid.js + +commit b1e0da12b30a3a960fe7834f5862c02f5828846f +Author: Bill Erickson +Date: Mon Jun 25 12:19:36 2018 -0400 + + LP#1740412 Grid cell content tooltips + + Display a tooltip (popover), containing the full grid contents, when + mousing over a grid cell. This allows users to see the full contents of + a cell without having to resize the grid column. + + This applies to text contents and pre-compiled HTML contents. + + Signed-off-by: Bill Erickson + Signed-off-by: Michele Morgan + Signed-off-by: Kathy Lussier + Signed-off-by: John Amundson + Signed-off-by: Jason Stephenson + +8 0 Open-ILS/src/templates/staff/css/style.css.tt2 +10 3 Open-ILS/src/templates/staff/share/t_autogrid.tt2 + +commit 965c65519462ce9bf3273b97a88e51d5a5ec0b26 +Author: Kathy Lussier +Date: Thu Sep 20 10:05:28 2018 -0400 + + LP#1783345: Make one more change in case + + One button was missed when normalizing case in the add to bucket modal. + + Signed-off-by: Kathy Lussier + +1 1 Open-ILS/src/templates/staff/cat/catalog/t_add_to_bucket.tt2 + +commit 963fff43f5f90634d37148a0e64bb1d47a07ce2a +Author: Sam Link +Date: Tue Jul 31 10:35:34 2018 -0400 + + Bug #1783345 - Normalized add to bucket modal + + The text cases in the add to bucket modal have been normalized to + sentence case. + + Signed-off-by: Kathy Lussier + +4 4 Open-ILS/src/templates/staff/cat/catalog/t_add_to_bucket.tt2 + +commit 14aafba138d53e9456853064698b773f34aa2520 +Author: Kathy Lussier +Date: Tue Sep 18 14:53:47 2018 -0400 + + LP#1787274: Stamping upgrade script for no dupe transits + + Signed-off-by: Kathy Lussier + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +73 0 Open-ILS/src/sql/Pg/upgrade/1133.schema.no-dupe-transits.sql +0 73 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no-dupe-transits.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/1133.schema.no-dupe-transits.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no-dupe-transits.sql + +commit 14467fdb4f55d4d82b1396867ee58d12a7261e59 +Author: Bill Erickson +Date: Tue Sep 18 11:21:26 2018 -0400 + + LP#1787274 One active transit pgtap tests + + Signed-off-by: Bill Erickson + Signed-off-by: Kathy Lussier + +39 0 Open-ILS/src/sql/Pg/live_t/lp1787274-no-dupe-transits.pg + create mode 100644 Open-ILS/src/sql/Pg/live_t/lp1787274-no-dupe-transits.pg + +commit f6c840db69108234d754acdbd8335cbd8c605d4d +Author: Bill Erickson +Date: Mon Sep 17 18:16:42 2018 -0400 + + LP#1787274 Active copy transit unique constraint + + Adds constraint triggers to action.*transit_copy tables to prevent + creation of new transits for a copies when an existing transit of any + type exists for the copy with a NULL dest_recv_time and cancel_time + values (i.e. an open transit). + + Signed-off-by: Bill Erickson + Signed-off-by: Kathy Lussier + +25 0 Open-ILS/src/sql/Pg/090.schema.action.sql +4 0 Open-ILS/src/sql/Pg/095.schema.booking.sql +73 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no-dupe-transits.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.no-dupe-transits.sql + +commit f44a91fadb5de774f1cbdf1e1db605f688942e15 +Author: Bill Erickson +Date: Mon Sep 17 18:16:28 2018 -0400 + + LP#1787274 Prevent multiple active copy checkins + + In the staff client checkin service, track which copies are currently + in-flight to the checkin API call and prevent additional checkin API + calls for any copy that is currently in flight. + + Signed-off-by: Bill Erickson + Signed-off-by: Kathy Lussier + +13 2 Open-ILS/web/js/ui/default/staff/circ/services/circ.js + +commit 43730edd4ac24af9fe132dc9005b5060055b1c60 +Author: Jason Boyer +Date: Thu Jun 21 15:57:41 2018 -0400 + + LP1735816: Delete Copy Notes in the Web Client + + A combination of calling convention errors and + template picky-ness prevented the deletion of + copy notes in the web client. This patch returns + that ability. + + Signed-off-by: Jason Boyer + Signed-off-by: Amy Constantino + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm +5 8 Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2 +29 20 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js + +commit 4939e9dc6c8a280a23106e3aac81d54e4f485171 +Author: Galen Charlton +Date: Fri Jun 29 14:45:27 2018 -0400 + + LP#1642344: XUL report cloning + + This patch allows report templates of version 4 and earlier + (which would have been created by the XUL staff client) to + be upgraded to template version 5 (used by the web staff + client) when the user clones a report. This closes a limitation + introduced in the reporter module for the web staff client. + + Note that during the conversion, inner joins are used by + default when IDL classes have a 'has_a' relation rather than + defaulting to left outer joins, improving correctness of the + generated SQL query. + + To test + ------- + [0] Apply the patch. + [1] In a test database that has reporter templates created + by (or for) the XUL staff client, create clones of + those templates. + [2] Verify that the output of reports created using the new + templates matches output of reports from the original + templates. + + Signed-off-by: Galen Charlton + Signed-off-by: Terran McCanna + Signed-off-by: Mike Rylander + +114 15 Open-ILS/web/js/ui/default/staff/reporter/template/app.js +24 0 Open-ILS/web/js/ui/default/staff/test/unit/egReporter.js +2 3 Open-ILS/web/reports/oils_rpt_folder_window.js + +commit b8605e04530bdd927323575d6e7ae84869efcb1c +Author: Mike Rylander +Date: Fri Sep 14 10:06:33 2018 -0400 + + LP#1739286: Belt and suspenders on radio button flags + + Signed-off-by: Mike Rylander + +1 0 Open-ILS/web/js/ui/default/staff/cat/services/z3950.js + +commit f8bd33c8363fe2c2fc231a25fec0fe59da5554b8 +Author: Jason Etheridge +Date: Tue Jul 10 19:46:04 2018 -0400 + + lp1739286 default search box in Z39.50 + + This change tweaks the layout of search fields in the web client Z39.50 + interface and adds radio buttons for the default search field to auto-focus. + The behavior is "sticky" without the need for an explicit Save action. If the + current default field is not present due to a given combination of selected + services, then no field will be focused by default. + + Signed-off-by: Jason Etheridge + Signed-off-by: Chris Sharp + Signed-off-by: Mike Rylander + +15 5 Open-ILS/src/templates/staff/cat/z3950/t_search_fields.tt2 +20 0 Open-ILS/web/js/ui/default/staff/cat/services/z3950.js + +commit 5faf5955c73b95d50577cfdc72b867a2becdbd41 +Author: Jane Sandberg +Date: Mon Sep 10 10:07:54 2018 -0700 + + LP1727464: Adding record ID to the title link in the checkout interface + + Signed-off-by: Jane Sandberg + Signed-off-by: Garry Collum + Signed-off-by: Galen Charlton + +1 1 Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 + +commit 96f7a65fb1edbb6b6656e2b5d97b230730aee677 +Author: Kathy Lussier +Date: Wed Aug 29 10:58:20 2018 -0400 + + LP#1738688: Add cancel time to Most Recent Transits + + Adds the transit cancel time to the Most Recent Transits section of + the Item Status Holds / Transit tab. + + Test plan: + Place an item in transit and then cancel the transit. Retrieve the item in + Item Status / Detail View. In the Holds / Transit tab, there is no indication + the transit has been canceled before loading the patch. Post-patch, the + cancel time will display. + + Signed-off-by: Kathy Lussier + Signed-off-by: John Amundson + Signed-off-by: Galen Charlton + +6 0 Open-ILS/src/templates/staff/cat/item/t_holds_pane.tt2 + +commit b107cd7e095b50643c08c55d9932df7ebe757169 +Author: Galen Charlton +Date: Thu Sep 13 10:19:36 2018 -0400 + + LP#1786534: sync schema update with rel_3_x actor.usr_merge + + Signed-off-by: Galen Charlton + +0 34 Open-ILS/src/sql/Pg/upgrade/1130.schema.actor_usr_merge-bail-on-same-user.sql + +commit 5550e3f3ec789202b326ecd300042e6bb47733ac +Author: Galen Charlton +Date: Thu Sep 13 10:16:04 2018 -0400 + + LP#1786534: stamp schema update + + Signed-off-by: Galen Charlton + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +361 0 Open-ILS/src/sql/Pg/upgrade/1130.schema.actor_usr_merge-bail-on-same-user.sql +0 361 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor_usr_merge-bail-on-same-user.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/1130.schema.actor_usr_merge-bail-on-same-user.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor_usr_merge-bail-on-same-user.sql + +commit 70ac617accaed852c6471fcd3ee44c7c139a0d3f +Author: Galen Charlton +Date: Thu Sep 13 10:12:17 2018 -0400 + + LP#1786534: make update script reflect other recent changes in actor.usr_merge + + Signed-off-by: Galen Charlton + +35 1 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor_usr_merge-bail-on-same-user.sql + +commit 9ca85be79f32a35cd6e8d0159a02b84c61fb3031 +Author: Jason Stephenson +Date: Fri Aug 10 15:10:04 2018 -0400 + + LP 1786534: Don't merge a user with itself. + + It's possible to merge a user with itself using the actor.usr_merge + database function. This does not produce a useful result. One ends + up with a user that is flagged deleted, has a null card field, and is + likely to have their addresses and other cards deleted from the + database. + + A simple check at the top of the database function to bail if the + src_usr and dest_usr are the same prevents this from happening. That + is the change that this commit makes. + + Signed-off-by: Jason Stephenson + Signed-off-by: Michele Morgan + Signed-off-by: Galen Charlton + +6 0 Open-ILS/src/sql/Pg/999.functions.global.sql +327 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor_usr_merge-bail-on-same-user.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.actor_usr_merge-bail-on-same-user.sql + +commit 04c79c3d914ca59a92f8fd4ff05b9de5ffcdd010 +Author: Chris Sharp +Date: Tue Nov 7 16:49:37 2017 -0500 + + LP#1269574 - Exclude backordered copies from deletion. + + When canceling a lineitem with a cancel reason that + keep debits = true, make sure we don't delete those copies. + + Signed-off-by: Chris Sharp + Signed-off-by: John Amundson + Signed-off-by: Jason Stephenson + +3 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm + +commit b19cb09c8d15818cfbf8507646671334539aadb8 +Author: Cesar Velez +Date: Mon Aug 27 16:07:48 2018 -0400 + + LP#1776917 - fix patron bill grid lacking bill ID + + Without the required attribute in the grid template + declaration, the Bill# column *had* to be enabled for + bill payments to work. This adds required attribute to + the Bill #, so that it's fetched regardless of whether + displayed or not, so posting payments work correctly. + + Signed-off by: Cesar Velez + Signed-off-by: John Amundson + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 + +commit f1d584b38e553f2976c2aa1fed1a7050602de6c8 +Author: Jane Sandberg +Date: Mon Sep 10 11:23:12 2018 -0700 + + LP 1743654: Removing a duplicate flesh_fields array entry + + Signed-off-by: Jane Sandberg + Signed-off-by: Jonh Amundson + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/web/js/ui/default/staff/circ/services/item.js + +commit 5d23da65b31d50d3f9a3b8bba7854673437024b0 +Author: Jane Sandberg +Date: Mon Sep 10 11:16:51 2018 -0700 + + LP1743654: Fleshing out the Created By column in Item Status + + To test: + 1) Scan an item into Item Status. + 2) Turn on the Created By column. + 3) Note that the Created By column shows the ID of the user + that created the record. + 4) Apply this commit and repeat steps 1-2. + 5) Note that the Created By column now shows the creator's + user name as a link, which opens the creator's record in + a new tab. + + Signed-off-by: Jane Sandberg + Signed-off-by: John Amundson + Signed-off-by: Jason Stephenson + +8 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 ac155bc1943e19b8786b221e723273bb14bfa4ce +Author: Steven Callender +Date: Tue Sep 11 15:20:55 2018 -0400 + + LP1792014: KPAC fix for opac.holds.org_unit_not_pickup_lib in org_selector. + + Signed-off-by: Steven Callender + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/kpac/getit.tt2 + +commit 70a06816d44ef04376ebb4d07b8ddd58c336f1c9 +Author: Jane Sandberg +Date: Mon Sep 10 11:42:34 2018 -0700 + + LP1775640: Adds deposit columns to Item Status and Holdings View grids + + Signed-off-by: Jane Sandberg + Signed-off-by: Beth Willis + Signed-off-by: Ben Shum + +2 0 Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 +2 0 Open-ILS/src/templates/staff/cat/item/t_list.tt2 + +commit 7f56d000bc2a7b95776bbfe76cd3bf595dd84ea7 +Author: Jason Stephenson +Date: Mon Sep 10 16:39:45 2018 -0400 + + Lp 1746251: Fix Circulation Modifier typos. + + Change "Circulation Modifer" to "Circulation Modifier" in two files. + This commit only addresses the obvious typos. I leave the Circ + Modifier versus Circulation Modifier debate as an open question. One + of my concerns is changing them all to one string may require some + reorganization of interfaces to avoid clunkiness. + + Signed-off-by: Jason Stephenson + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/staff/admin/serials/t_attr_edit.tt2 +1 1 Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 + +commit 0590a3a4203aa4fd77a8e357ea0c253fb907e6d0 +Author: Jane Sandberg +Date: Mon Sep 10 09:23:29 2018 -0700 + + LP1665052: Fix checkin workstation display on recent circs view + + To test: + 1) Go to Item Status > Detail View > Recent Circ History for + an item that is currently checked out. + 2) Note that the Checkin Workstation field says + "{{circ.checkin_workstation.name()}}" + 3) Apply this commit. + 4) Note that the Checkin Workstation field is empty if an + item is an item hasn't been checked in, but is filled with + the appropriate workstation name after it has been checked + in. + + Signed-off-by: Jane Sandberg + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2 + +commit 366b24a6b5401511c08ad68abbb3da28c800ccd6 +Author: Jane Sandberg +Date: Sun Jun 3 15:50:40 2018 -0700 + + LP1010635: Make bre dates populate in Item Status grid + + To test: + 1) Enable the Date Record Created and Date Record Last Edited columns + in Item Status. + 2) Scan an item barcode into Item Status. Note that the two columns + you enabled are empty. + 3) Apply this commit. + 4) Reload the Item Status screen, and scan your barcode again. The + dates should now be populated. + + Signed-off-by: Jane Sandberg + Signed-off-by: Garry Collum + Signed-off-by: Galen Charlton + +1 1 Open-ILS/web/js/ui/default/staff/circ/services/item.js + +commit 4aa082f83156fc6e37bf593b034b282b30d724c4 +Author: Bill Erickson +Date: Mon Jul 30 17:23:49 2018 -0400 + + LP#1724083 Webstaff approve pending patron address + + Add support for approving pending patron addresses in the webstaff + patron edit interface. + + To test: + [1] Enable the pending address org unit setting. + [2] Log into the catalog and "edit" an address. + [3] Edit same user in staff client and use the Approve action. + + Signed-off-by: Bill Erickson + Signed-off-by: Garry Collum + Signed-off-by: Galen Charlton + +29 0 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 +7 0 Open-ILS/src/templates/staff/css/circ.css.tt2 +41 0 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js + +commit d0caef0b3d80fc2c1f7407a18241017c3b5f881b +Author: Dan Scott +Date: Sun Jun 3 14:34:04 2018 -0400 + + LP#1774886 Distinguish Phys Char Wizard with an edit icon + + As both authority fields and the Physical Characteristics Wizard for 007 use + the same glyphicons-link class, it's not obvious to new users of the MARC + editor that the icons result in radically different actions. + + Change the 007 icon to glyphicons-edit to reflect that it opens an editor + interface. + + Signed-off-by: Dan Scott + Signed-off-by: Jane Sandberg + Signed-off-by: Galen Charlton + +1 1 Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js + +commit afb1cc861077980655df372ec84975d7dff98b1e +Author: Galen Charlton +Date: Wed Sep 5 10:56:43 2018 -0400 + + LP#1781235: fix changing primary user barcode in web client + + This patch fixes a bug where the patron card dialog would + not allow the user to change the primary barcode under certain + circumstances. The fix is to ensure that the radio buttons + controlling the selection of the primary card are bound to + exactly one scope variable; otherwise, the /last/ barcode in the + list that had a primary value set after user interaction would + be the winner. + + To test + ------- + [1] Use the 'replace barcode' feature in the patron editor to + create a test patron with 3 barcodes: + + - barcode A + - barcode B + - barcode C (which as last created, would be primary) + + [2] Attempt to make barcode A the primary barcode again using + the 'See All' patron card dialog in the patron editor. + [3] Note that the change of primary barcode doesn't stick + upon saving the patron record. + [4] Apply the patch and repeat steps 1-3. This time, the + primary barcode should be changed as expected. + [5] Verify that other patron edit actions and registering a + new patron record continue to work as expected. + + Signed-off-by: Galen Charlton + Signed-off-by: John Amundson + Signed-off-by: Jason Stephenson + +3 2 Open-ILS/src/templates/staff/circ/patron/t_patron_cards_dialog.tt2 +18 8 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js + +commit 8a8597148b8574e357472f5ef259300b0023ff79 +Author: Jeff Davis +Date: Wed Aug 29 11:51:24 2018 -0700 + + LP#1781641: make staff-applied patron blocks overridable on web client checkout/renew + + To test + ------- + [1] Apply a blocking penalty such as STAFF_CHR to a patron record. + [2] Attempt to check out an item; note that there is no option to + force the action. + [3] Apply the patch and repeat #2. This time, the staff user + should be given an option to force the action. + [4] Verify that forcing the checkout respects whether or not + the operator has (e.g.) the STAFF_CHR.override permission. + + Signed-off-by: Jeff Davis + Signed-off-by: Joan Kranich + Signed-off-by: Galen Charlton + +16 2 Open-ILS/web/js/ui/default/staff/circ/services/circ.js + +commit 88793ce760471eae4116722e8975b1b5a376dbc4 +Author: Dan Wells +Date: Wed Aug 29 18:18:25 2018 -0400 + + Forward-port 3.0.11 upgrade script + + Signed-off-by: Dan Wells + +95 0 Open-ILS/src/sql/Pg/version-upgrade/3.0.10-3.0.11-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/3.0.10-3.0.11-upgrade-db.sql + +commit 7fb93d4429e2226e998fe6676c7da7fa72d733d8 +Author: Bill Erickson +Date: Fri Jul 27 14:30:07 2018 -0400 + + LP#978095 ACQ use last-canceled copy reason if best + + Only use an alternate keep-debits cancel reason if the currently + canceled copy is not using a keep-debits reason. + + Also clarify in the docs that if another keep-debits reason is selected, + it's essentially chosen at random, not necessarily the "last" copy. + + Signed-off-by: Bill Erickson + Signed-off-by: Mike Rylander + +4 5 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm +11 1 docs/RELEASE_NOTES_NEXT/Acquisitions/autocancel_lineitems_when_all_copies_are_canceled.adoc + +commit f8783e3b2acaa377158deae9fa1becae06da0e8e +Author: Jason Etheridge +Date: Fri Feb 2 11:30:36 2018 -0500 + + lp978095 auto-canceling lineitems + + "Acq: lineitems display as "on order" even after all copies have been cancelled" + + When a copy (lineitem detail) on a lineitem is canceled through the UI, all of + the sibling copies are examined, and if they also happen to be canceled, then a + cancel attempt is made on the parent lineitem. + + The cancel reason fed to the lineitem cancelation attempt will be the last + cancel reason on an examined sibling lineitem where Keep Debits is True, or + failing that, the cancel reason used wih the copy just canceled. + + The UI will refresh to the lineitem view when such an auto-cancelation happens. + + Signed-off-by: Jason Etheridge + Signed-off-by: Bill Erickson + Signed-off-by: Mike Rylander + +36 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm +3 0 Open-ILS/web/js/ui/default/acq/common/li_table.js +3 0 docs/RELEASE_NOTES_NEXT/Acquisitions/autocancel_lineitems_when_all_copies_are_canceled.adoc + create mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/autocancel_lineitems_when_all_copies_are_canceled.adoc diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index d750216454..c65530c1b8 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-0-12"; } __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 367d9ec743..8129a4d380 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 ('1133', :eg_version); -- berick/kmlussier +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.0.12', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.0.11-3.0.12-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.0.11-3.0.12-upgrade-db.sql new file mode 100644 index 0000000000..ff4fac370c --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.0.11-3.0.12-upgrade-db.sql @@ -0,0 +1,401 @@ +--Upgrade Script for 3.0.11 to 3.0.12 +\set eg_version '''3.0.12''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.0.12', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('1130', :eg_version); + +CREATE OR REPLACE FUNCTION actor.usr_merge( src_usr INT, dest_usr INT, del_addrs BOOLEAN, del_cards BOOLEAN, deactivate_cards BOOLEAN ) RETURNS VOID AS $$ +DECLARE + suffix TEXT; + bucket_row RECORD; + picklist_row RECORD; + queue_row RECORD; + folder_row RECORD; +BEGIN + + -- Bail if src_usr equals dest_usr because the result of merging a + -- user with itself is not what you want. + IF src_usr = dest_usr THEN + RETURN; + END IF; + + -- do some initial cleanup + UPDATE actor.usr SET card = NULL WHERE id = src_usr; + UPDATE actor.usr SET mailing_address = NULL WHERE id = src_usr; + UPDATE actor.usr SET billing_address = NULL WHERE id = src_usr; + + -- actor.* + IF del_cards THEN + DELETE FROM actor.card where usr = src_usr; + ELSE + IF deactivate_cards THEN + UPDATE actor.card SET active = 'f' WHERE usr = src_usr; + END IF; + UPDATE actor.card SET usr = dest_usr WHERE usr = src_usr; + END IF; + + + IF del_addrs THEN + DELETE FROM actor.usr_address WHERE usr = src_usr; + ELSE + UPDATE actor.usr_address SET usr = dest_usr WHERE usr = src_usr; + END IF; + + UPDATE actor.usr_note SET usr = dest_usr WHERE usr = src_usr; + -- dupes are technically OK in actor.usr_standing_penalty, should manually delete them... + UPDATE actor.usr_standing_penalty SET usr = dest_usr WHERE usr = src_usr; + PERFORM actor.usr_merge_rows('actor.usr_org_unit_opt_in', 'usr', src_usr, dest_usr); + PERFORM actor.usr_merge_rows('actor.usr_setting', 'usr', src_usr, dest_usr); + + -- permission.* + PERFORM actor.usr_merge_rows('permission.usr_perm_map', 'usr', src_usr, dest_usr); + PERFORM actor.usr_merge_rows('permission.usr_object_perm_map', 'usr', src_usr, dest_usr); + PERFORM actor.usr_merge_rows('permission.usr_grp_map', 'usr', src_usr, dest_usr); + PERFORM actor.usr_merge_rows('permission.usr_work_ou_map', 'usr', src_usr, dest_usr); + + + -- container.* + + -- For each *_bucket table: transfer every bucket belonging to src_usr + -- into the custody of dest_usr. + -- + -- In order to avoid colliding with an existing bucket owned by + -- the destination user, append the source user's id (in parenthesese) + -- to the name. If you still get a collision, add successive + -- spaces to the name and keep trying until you succeed. + -- + FOR bucket_row in + SELECT id, name + FROM container.biblio_record_entry_bucket + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE container.biblio_record_entry_bucket + SET owner = dest_usr, name = name || suffix + WHERE id = bucket_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + + FOR bucket_row in + SELECT id, name + FROM container.call_number_bucket + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE container.call_number_bucket + SET owner = dest_usr, name = name || suffix + WHERE id = bucket_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + + FOR bucket_row in + SELECT id, name + FROM container.copy_bucket + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE container.copy_bucket + SET owner = dest_usr, name = name || suffix + WHERE id = bucket_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + + FOR bucket_row in + SELECT id, name + FROM container.user_bucket + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE container.user_bucket + SET owner = dest_usr, name = name || suffix + WHERE id = bucket_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + + UPDATE container.user_bucket_item SET target_user = dest_usr WHERE target_user = src_usr; + + -- vandelay.* + -- transfer queues the same way we transfer buckets (see above) + FOR queue_row in + SELECT id, name + FROM vandelay.queue + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE vandelay.queue + SET owner = dest_usr, name = name || suffix + WHERE id = queue_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + + -- money.* + PERFORM actor.usr_merge_rows('money.collections_tracker', 'usr', src_usr, dest_usr); + PERFORM actor.usr_merge_rows('money.collections_tracker', 'collector', src_usr, dest_usr); + UPDATE money.billable_xact SET usr = dest_usr WHERE usr = src_usr; + UPDATE money.billing SET voider = dest_usr WHERE voider = src_usr; + UPDATE money.bnm_payment SET accepting_usr = dest_usr WHERE accepting_usr = src_usr; + + -- action.* + UPDATE action.circulation SET usr = dest_usr WHERE usr = src_usr; + UPDATE action.circulation SET circ_staff = dest_usr WHERE circ_staff = src_usr; + UPDATE action.circulation SET checkin_staff = dest_usr WHERE checkin_staff = src_usr; + UPDATE action.usr_circ_history SET usr = dest_usr WHERE usr = src_usr; + + UPDATE action.hold_request SET usr = dest_usr WHERE usr = src_usr; + UPDATE action.hold_request SET fulfillment_staff = dest_usr WHERE fulfillment_staff = src_usr; + UPDATE action.hold_request SET requestor = dest_usr WHERE requestor = src_usr; + UPDATE action.hold_notification SET notify_staff = dest_usr WHERE notify_staff = src_usr; + + UPDATE action.in_house_use SET staff = dest_usr WHERE staff = src_usr; + UPDATE action.non_cataloged_circulation SET staff = dest_usr WHERE staff = src_usr; + UPDATE action.non_cataloged_circulation SET patron = dest_usr WHERE patron = src_usr; + UPDATE action.non_cat_in_house_use SET staff = dest_usr WHERE staff = src_usr; + UPDATE action.survey_response SET usr = dest_usr WHERE usr = src_usr; + + -- acq.* + UPDATE acq.fund_allocation SET allocator = dest_usr WHERE allocator = src_usr; + UPDATE acq.fund_transfer SET transfer_user = dest_usr WHERE transfer_user = src_usr; + + -- transfer picklists the same way we transfer buckets (see above) + FOR picklist_row in + SELECT id, name + FROM acq.picklist + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE acq.picklist + SET owner = dest_usr, name = name || suffix + WHERE id = picklist_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + + UPDATE acq.purchase_order SET owner = dest_usr WHERE owner = src_usr; + UPDATE acq.po_note SET creator = dest_usr WHERE creator = src_usr; + UPDATE acq.po_note SET editor = dest_usr WHERE editor = src_usr; + UPDATE acq.provider_note SET creator = dest_usr WHERE creator = src_usr; + UPDATE acq.provider_note SET editor = dest_usr WHERE editor = src_usr; + UPDATE acq.lineitem_note SET creator = dest_usr WHERE creator = src_usr; + UPDATE acq.lineitem_note SET editor = dest_usr WHERE editor = src_usr; + UPDATE acq.lineitem_usr_attr_definition SET usr = dest_usr WHERE usr = src_usr; + + -- asset.* + UPDATE asset.copy SET creator = dest_usr WHERE creator = src_usr; + UPDATE asset.copy SET editor = dest_usr WHERE editor = src_usr; + UPDATE asset.copy_note SET creator = dest_usr WHERE creator = src_usr; + UPDATE asset.call_number SET creator = dest_usr WHERE creator = src_usr; + UPDATE asset.call_number SET editor = dest_usr WHERE editor = src_usr; + UPDATE asset.call_number_note SET creator = dest_usr WHERE creator = src_usr; + + -- serial.* + UPDATE serial.record_entry SET creator = dest_usr WHERE creator = src_usr; + UPDATE serial.record_entry SET editor = dest_usr WHERE editor = src_usr; + + -- reporter.* + -- It's not uncommon to define the reporter schema in a replica + -- DB only, so don't assume these tables exist in the write DB. + BEGIN + UPDATE reporter.template SET owner = dest_usr WHERE owner = src_usr; + EXCEPTION WHEN undefined_table THEN + -- do nothing + END; + BEGIN + UPDATE reporter.report SET owner = dest_usr WHERE owner = src_usr; + EXCEPTION WHEN undefined_table THEN + -- do nothing + END; + BEGIN + UPDATE reporter.schedule SET runner = dest_usr WHERE runner = src_usr; + EXCEPTION WHEN undefined_table THEN + -- do nothing + END; + BEGIN + -- transfer folders the same way we transfer buckets (see above) + FOR folder_row in + SELECT id, name + FROM reporter.template_folder + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE reporter.template_folder + SET owner = dest_usr, name = name || suffix + WHERE id = folder_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + EXCEPTION WHEN undefined_table THEN + -- do nothing + END; + BEGIN + -- transfer folders the same way we transfer buckets (see above) + FOR folder_row in + SELECT id, name + FROM reporter.report_folder + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE reporter.report_folder + SET owner = dest_usr, name = name || suffix + WHERE id = folder_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + EXCEPTION WHEN undefined_table THEN + -- do nothing + END; + BEGIN + -- transfer folders the same way we transfer buckets (see above) + FOR folder_row in + SELECT id, name + FROM reporter.output_folder + WHERE owner = src_usr + LOOP + suffix := ' (' || src_usr || ')'; + LOOP + BEGIN + UPDATE reporter.output_folder + SET owner = dest_usr, name = name || suffix + WHERE id = folder_row.id; + EXCEPTION WHEN unique_violation THEN + suffix := suffix || ' '; + CONTINUE; + END; + EXIT; + END LOOP; + END LOOP; + EXCEPTION WHEN undefined_table THEN + -- do nothing + END; + + -- Finally, delete the source user + DELETE FROM actor.usr WHERE id = src_usr; + +END; +$$ LANGUAGE plpgsql; + + + +SELECT evergreen.upgrade_deps_block_check('1133', :eg_version); + +\qecho Applying a unique constraint to action.transit_copy. This will +\qecho only effect newly created transits. Admins are encouraged to manually +\qecho remove any existing duplicate transits by applying values for cancel_time +\qecho or dest_recv_time, or by deleting the offending transits. Below is a +\qecho query to locate duplicate transits. Note dupes may exist accross +\qecho parent (action.transit_copy) and child tables (action.hold_transit_copy, +\qecho action.reservation_transit_copy) +\qecho +\qecho WITH dupe_transits AS ( +\qecho SELECT COUNT(*), target_copy FROM action.transit_copy +\qecho WHERE dest_recv_time IS NULL AND cancel_time IS NULL +\qecho GROUP BY 2 HAVING COUNT(*) > 1 +\qecho ) SELECT atc.* +\qecho FROM dupe_transits +\qecho JOIN action.transit_copy atc USING (target_copy) +\qecho WHERE dest_recv_time IS NULL AND cancel_time IS NULL; +\qecho + +/* +Unique indexes are not inherited by child tables, so they will not prevent +duplicate inserts on action.transit_copy and action.hold_transit_copy, +for example. Use check constraints instead to enforce unique-per-copy +transits accross all transit types. +*/ + +-- Create an index for speedy check constraint lookups. +CREATE INDEX active_transit_for_copy + ON action.transit_copy (target_copy) + WHERE dest_recv_time IS NULL AND cancel_time IS NULL; + +-- Check for duplicate transits across all transit types +CREATE OR REPLACE FUNCTION action.copy_transit_is_unique() + RETURNS TRIGGER AS $func$ +BEGIN + PERFORM * FROM action.transit_copy + WHERE target_copy = NEW.target_copy + AND dest_recv_time IS NULL + AND cancel_time IS NULL; + IF FOUND THEN + RAISE EXCEPTION 'Copy id=% is already in transit', NEW.target_copy; + END IF; + RETURN NULL; +END; +$func$ LANGUAGE PLPGSQL STABLE; + +-- Apply constraint to all transit tables +CREATE CONSTRAINT TRIGGER transit_copy_is_unique_check + AFTER INSERT ON action.transit_copy + FOR EACH ROW EXECUTE PROCEDURE action.copy_transit_is_unique(); + +CREATE CONSTRAINT TRIGGER hold_transit_copy_is_unique_check + AFTER INSERT ON action.hold_transit_copy + FOR EACH ROW EXECUTE PROCEDURE action.copy_transit_is_unique(); + +CREATE CONSTRAINT TRIGGER reservation_transit_copy_is_unique_check + AFTER INSERT ON action.reservation_transit_copy + FOR EACH ROW EXECUTE PROCEDURE action.copy_transit_is_unique(); + +/* +-- UNDO +DROP TRIGGER transit_copy_is_unique_check ON action.transit_copy; +DROP TRIGGER hold_transit_copy_is_unique_check ON action.hold_transit_copy; +DROP TRIGGER reservation_transit_copy_is_unique_check ON action.reservation_transit_copy; +DROP INDEX action.active_transit_for_copy; +*/ + + +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 b2b87b683f..b70e9614f5 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 @@

Evergreen

Target Server ID:

-

$HeadURL$

+

http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_0_12

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 0613a13ddf..113d14a654 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_0_12"); 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 a9543579a8..93eb47ab3b 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.0" !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 1ee2103e6f..0000000000 --- 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 0000000000..31983d1557 --- /dev/null +++ b/README @@ -0,0 +1,692 @@ +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 below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +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 -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 -developer +------------------------------------------------------------------------------ ++ + * To install packages required for building Evergreen translations, use + the -translator Makefile.install target. ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install -translator +------------------------------------------------------------------------------ ++ + * To install packages required for building Evergreen release bundles, use + the -packager Makefile.install target. ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install -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 +<>. You will still need to do the following +steps in <>. + +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`. ++ +2. Install Grunt CLI ++ +[source,sh] +------------------------------------------------------------------------------ +% sudo npm install -g grunt-cli +------------------------------------------------------------------------------ + +[[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 +grunt all +------------------------------------------------------------------------------ + + +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_0_12 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] +------------------------------------------------------------------------------ + + StartServers 15 + MinSpareServers 5 + MaxSpareServers 15 + MaxClients 75 + MaxRequestsPerChild 500 + +------------------------------------------------------------------------------ ++ +.Ubuntu Trusty/Xenial, Debian Jessie/Stretch (`/etc/apache2/mods-available/mpm_prefork.conf`) +[source,bash] +------------------------------------------------------------------------------ + + StartServers 15 + MinSpareServers 5 + MaxSpareServers 15 + MaxRequestWorkers 75 + MaxConnectionsPerChild 500 + +------------------------------------------------------------------------------ ++ +. (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-'. 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 , , +, , and with the appropriate values for your +PostgreSQL database (where and are for the *evergreen* +PostgreSQL account you just created), and replace and +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 --password --hostname --port \ + --database --admin-user --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 +------------------------------------------------------------------------------ + +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 dacb5a36b7..d424953432 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@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [trunk]) +AC_INIT(Open-ILS, 3.0.12, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [3.0.12]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar]) -- 2.11.0