[open-ils-commits] [GIT] Evergreen ILS branch master updated. 470c9039a2af7db57ba4162dbf854d604056bf85

[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, master has been updated
       via  470c9039a2af7db57ba4162dbf854d604056bf85 (commit)
       via  380fb3822854e636f439ce996c6b9d46aa604a4c (commit)
      from  710f55165414e22164b073ba35b7775537b9d2ad (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 470c9039a2af7db57ba4162dbf854d604056bf85
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri May 4 14:46:16 2012 -0400

    Stamping upgrade for 'inheritied' typo repair
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 6b29c20..ff67979 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -87,7 +87,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 ('0707', :eg_version); -- berick/dyrcona/senator
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0708', :eg_version); -- dbs/berick
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_inheritied_typo.sql b/Open-ILS/src/sql/Pg/upgrade/0708.data.fix_inheritied_typo.sql
similarity index 74%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_inheritied_typo.sql
rename to Open-ILS/src/sql/Pg/upgrade/0708.data.fix_inheritied_typo.sql
index e9fe94e..183652e 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_inheritied_typo.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0708.data.fix_inheritied_typo.sql
@@ -2,6 +2,12 @@
 --
 -- Fixes a typo in the name of a global flag
 
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0708', :eg_version);
+
 UPDATE config.global_flag
 SET name = 'opac.org_unit.non_inherited_visibility'
 WHERE name = 'opac.org_unit.non_inheritied_visibility';
+
+COMMIT;

commit 380fb3822854e636f439ce996c6b9d46aa604a4c
Author: Dan Scott <dscott at laurentian.ca>
Date:   Fri May 4 14:14:12 2012 -0400

    Fix "inheritied" typo in global flag
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

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 fafa89f..70e401d 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -11550,10 +11550,10 @@ INSERT INTO actor.toolbar(org,label,layout) VALUES
 
 INSERT INTO config.global_flag (name, enabled, label) 
     VALUES (
-        'opac.org_unit.non_inheritied_visibility',
+        'opac.org_unit.non_inherited_visibility',
         FALSE,
         oils_i18n_gettext(
-            'opac.org_unit.non_inheritied_visibility',
+            'opac.org_unit.non_inherited_visibility',
             'Org Units Do Not Inherit Visibility',
             'cgf',
             'label'
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_inheritied_typo.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_inheritied_typo.sql
new file mode 100644
index 0000000..e9fe94e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_inheritied_typo.sql
@@ -0,0 +1,7 @@
+-- Evergreen DB patch XXXX.data.fix_inheritied_typo.sql
+--
+-- Fixes a typo in the name of a global flag
+
+UPDATE config.global_flag
+SET name = 'opac.org_unit.non_inherited_visibility'
+WHERE name = 'opac.org_unit.non_inheritied_visibility';
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
index a0fab7b..fa96bc7 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
@@ -15607,10 +15607,10 @@ SELECT evergreen.upgrade_deps_block_check('0702', :eg_version);
 
 INSERT INTO config.global_flag (name, enabled, label) 
     VALUES (
-        'opac.org_unit.non_inheritied_visibility',
+        'opac.org_unit.non_inherited_visibility',
         FALSE,
         oils_i18n_gettext(
-            'opac.org_unit.non_inheritied_visibility',
+            'opac.org_unit.non_inherited_visibility',
             'Org Units Do Not Inherit Visibility',
             'cgf',
             'label'
diff --git a/Open-ILS/src/templates/opac/parts/org_selector.tt2 b/Open-ILS/src/templates/opac/parts/org_selector.tt2
index 3e32040..31ba30d 100644
--- a/Open-ILS/src/templates/opac/parts/org_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/org_selector.tt2
@@ -8,7 +8,7 @@
 
 BLOCK build_org_selector;
     node_stack = [{org => org_unit || ctx.aouct_tree || ctx.aou_tree}];
-    inherited_vis = ctx.get_cgf('opac.org_unit.non_inheritied_visibility').enabled == 'f';
+    inherited_vis = ctx.get_cgf('opac.org_unit.non_inherited_visibility').enabled == 'f';
 
     IF !name; 
         name = 'loc';

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    4 ++--
 .../Pg/upgrade/0708.data.fix_inheritied_typo.sql   |   13 +++++++++++++
 .../sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql  |    4 ++--
 Open-ILS/src/templates/opac/parts/org_selector.tt2 |    2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0708.data.fix_inheritied_typo.sql


hooks/post-receive
-- 
Evergreen ILS