[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_5 updated. 6145fdb54b4d7f7d4acd8487c66dfaa2406731e1

[Evergreen Git]

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, rel_2_5 has been updated
       via  6145fdb54b4d7f7d4acd8487c66dfaa2406731e1 (commit)
       via  15845afca54695bf052d70f3b05bc1aaf242731f (commit)
      from  0267f38e93a5fc15f14b4821f6e45fa8860b6edd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6145fdb54b4d7f7d4acd8487c66dfaa2406731e1
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Thu May 22 11:24:41 2014 -0400

    LP#1314920 Stamping upgrade script
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 4c956ee..a5f6c9a 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0880', :eg_version); -- miker/sreyseng/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0881', :eg_version); -- phasefx/dbwells
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql b/Open-ILS/src/sql/Pg/upgrade/0881.data.YAOUS-desc-update.sql
similarity index 75%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql
rename to Open-ILS/src/sql/Pg/upgrade/0881.data.YAOUS-desc-update.sql
index 280bd65..858b706 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0881.data.YAOUS-desc-update.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0881', :eg_version);
 
 UPDATE config.org_unit_setting_type
     SET description = replace(replace(description,'Original','Physical'),'"ol"','"physical_loc"')

commit 15845afca54695bf052d70f3b05bc1aaf242731f
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu May 1 04:15:55 2014 -0400

    LP#1314920 change the desc for the org hiding setting
    
    so that it references physical_loc instead of ol
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index c5bc4a2..da207e0 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -3982,7 +3982,7 @@ INSERT into config.org_unit_setting_type
         'Org Unit Hiding Depth',
         'coust', 'label'),
     oils_i18n_gettext('opac.org_unit_hiding.depth',
-        'This will hide certain org units in the public OPAC if the Original Location (url param "ol") for the OPAC inherits this setting.  This setting specifies an org unit depth, that together with the OPAC Original Location determines which section of the Org Hierarchy should be visible in the OPAC.  For example, a stock Evergreen installation will have a 3-tier hierarchy (Consortium/System/Branch), where System has a depth of 1 and Branch has a depth of 2.  If this setting contains a depth of 1 in such an installation, then every library in the System in which the Original Location belongs will be visible, and everything else will be hidden.  A depth of 0 will effectively make every org visible.  The embedded OPAC in the staff client ignores this setting.',
+        'This will hide certain org units in the public OPAC if the Physical Location (url param "physical_loc") for the OPAC inherits this setting.  This setting specifies an org unit depth, that together with the OPAC Physical Location determines which section of the Org Hierarchy should be visible in the OPAC.  For example, a stock Evergreen installation will have a 3-tier hierarchy (Consortium/System/Branch), where System has a depth of 1 and Branch has a depth of 2.  If this setting contains a depth of 1 in such an installation, then every library in the System in which the Physical Location belongs will be visible, and everything else will be hidden.  A depth of 0 will effectively make every org visible.  The embedded OPAC in the staff client ignores this setting.',
         'coust', 'description'),
     'integer', null)
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql
new file mode 100644
index 0000000..280bd65
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.YAOUS-desc-update.sql
@@ -0,0 +1,9 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+UPDATE config.org_unit_setting_type
+    SET description = replace(replace(description,'Original','Physical'),'"ol"','"physical_loc"')
+    WHERE name = 'opac.org_unit_hiding.depth';
+
+COMMIT;

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    2 +-
 .../sql/Pg/upgrade/0881.data.YAOUS-desc-update.sql |    9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0881.data.YAOUS-desc-update.sql


hooks/post-receive
-- 
Evergreen ILS