[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_3 updated. 5bff92bb5bfab2e141da626957da385113428112

[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_3 has been updated
       via  5bff92bb5bfab2e141da626957da385113428112 (commit)
       via  fe8f940ad3c8fb96ebfb1e747970d4c2124dadb9 (commit)
      from  c729b47f81e6e068b1236309535d99fd11b7d782 (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 5bff92bb5bfab2e141da626957da385113428112
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Oct 8 14:58:37 2013 -0400

    Wrap upgrade script for 0840 circulation column picker.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 6a25b8f..495b55e 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 ('0838', :eg_version); -- senator/dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0840', :eg_version); -- gcollum/dyrcona
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql b/Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql
similarity index 89%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql
rename to Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql
index 81b91bb..50c41fe 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0840', :eg_version);
 
 INSERT INTO config.usr_setting_type (name,grp,opac_visible,label,description,datatype) VALUES (
     'ui.grid_columns.conify.config.circ_matrix_matchpoint',

commit fe8f940ad3c8fb96ebfb1e747970d4c2124dadb9
Author: Garry Collum <gcollum at gmail.com>
Date:   Sun Aug 4 16:10:26 2013 -0400

    lp1193487 Circulation Policy Column Picker not saving configuration.
    
    The circulation policy column picker is not saving its configuration
    because ui.grid_columns.conify.config.circ_matrix_matchpoint is not
    defined in the config.usr_setting_type table.  This updates the sql
    to populate the table.
    
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

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 d4efeff..d4364c4 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -10441,6 +10441,23 @@ INSERT INTO config.usr_setting_type (name,grp,opac_visible,label,description,dat
         'description'
     ),
     'string'
+), (
+    'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+    'gui',
+    FALSE,
+    oils_i18n_gettext(
+        'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+        'Circulation Policy Configuration',
+        'cust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+        'Circulation Policy Configuration Column Settings',
+        'cust',
+        'description'
+    ),
+    'string'
 ) ;
 
 SELECT setval( 'config.sms_carrier_id_seq', 1000 );
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql
new file mode 100644
index 0000000..81b91bb
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql
@@ -0,0 +1,24 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.usr_setting_type (name,grp,opac_visible,label,description,datatype) VALUES (
+    'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+    'gui',
+    FALSE,
+    oils_i18n_gettext(
+        'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+        'Circulation Policy Configuration',
+        'cust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+        'Circulation Policy Configuration Column Settings',
+        'cust',
+        'description'
+    ),
+    'string'
+);
+
+COMMIT;

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |   17 ++++++++++++++
 .../0840.data.circulation-policy-configuration.sql |   24 ++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql


hooks/post-receive
-- 
Evergreen ILS