[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 741c1140d76f5d604d9926bcbc52662173ca1b3b

[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  741c1140d76f5d604d9926bcbc52662173ca1b3b (commit)
       via  7ee63181783ee3cf7fa773aa52dbe2f4baa6712d (commit)
      from  b8ec73d3f50e2c1b87ed8f112feab645fa69fd10 (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 741c1140d76f5d604d9926bcbc52662173ca1b3b
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 28685a1..6f68922 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 ('0839', :eg_version); -- eeevil/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 7ee63181783ee3cf7fa773aa52dbe2f4baa6712d
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 1cc8f98..4bdfffc 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -10823,6 +10823,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