[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 6ea45e80f34eadec2a2477c7f45df41c1669e32e
Evergreen Git
git at git.evergreen-ils.org
Fri May 25 14:56:48 EDT 2012
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_2 has been updated
via 6ea45e80f34eadec2a2477c7f45df41c1669e32e (commit)
via 671976a54756dd226205ac2fc756f03cf9a29267 (commit)
from a5ee0ed4d2d0fa029e86050fdb7a826363b109d9 (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 6ea45e80f34eadec2a2477c7f45df41c1669e32e
Author: Bill Erickson <berick at esilibrary.com>
Date: Fri May 25 14:54:23 2012 -0400
Stamping upgrade for ACQ org setting group
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 d541c58..cb05532 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 ('0711', :eg_version); -- senator
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0715', :eg_version); -- dbs/berick
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_acq_config_group.sql b/Open-ILS/src/sql/Pg/upgrade/0715.data.add_acq_config_group.sql
similarity index 74%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_acq_config_group.sql
rename to Open-ILS/src/sql/Pg/upgrade/0715.data.add_acq_config_group.sql
index a094b8a..00269a2 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_acq_config_group.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0715.data.add_acq_config_group.sql
@@ -1,6 +1,12 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0715', :eg_version);
+
INSERT INTO config.settings_group (name, label) VALUES
('acq', oils_i18n_gettext('config.settings_group.system', 'Acquisitions', 'coust', 'label'));
UPDATE config.org_unit_setting_type
SET grp = 'acq'
WHERE name LIKE 'acq%';
+
+COMMIT;
commit 671976a54756dd226205ac2fc756f03cf9a29267
Author: Dan Scott <dan at coffeecode.net>
Date: Wed Apr 11 21:56:56 2012 -0400
Group acquisition OU settings in a new "Acquisitions" group
As seen in LP867465, the current grouping of acquisition OU settings
under the generic "lib" group leads to confusion about which
context "default shelf location" and the like apply to. Creating a new
"Acquisitions" group will help clarify that current ambiguity.
Signed-off-by: Dan Scott <dan at coffeecode.net>
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 87c3eff..e828667 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -2463,8 +2463,9 @@ INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatyp
INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype)
VALUES ('opac.default_pickup_location', TRUE, 'Default Hold Pickup Location', 'Default location for holds pickup', 'integer');
--- Add groups for org_unitu settings
+-- Add groups for org_unit settings
INSERT INTO config.settings_group (name, label) VALUES
+('acq', oils_i18n_gettext('config.settings_group.system', 'Acquisitions', 'coust', 'label')),
('sys', oils_i18n_gettext('config.settings_group.system', 'System', 'coust', 'label')),
('gui', oils_i18n_gettext('config.settings_group.gui', 'GUI', 'coust', 'label')),
('lib', oils_i18n_gettext('config.settings_group.lib', 'Library', 'coust', 'label')),
@@ -2492,7 +2493,7 @@ INSERT INTO config.settings_group (name, label) VALUES
INSERT into config.org_unit_setting_type
( name, grp, label, description, datatype, fm_class ) VALUES
-( 'acq.copy_creator_uses_receiver', 'lib',
+( 'acq.copy_creator_uses_receiver', 'acq',
oils_i18n_gettext('acq.copy_creator_uses_receiver',
'Set copy creator as receiver',
'coust', 'label'),
@@ -2501,7 +2502,7 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'bool', null)
-,( 'acq.default_circ_modifier', 'lib',
+,( 'acq.default_circ_modifier', 'acq',
oils_i18n_gettext('acq.default_circ_modifier',
'Default circulation modifier',
'coust', 'label'),
@@ -2510,7 +2511,7 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'string', null)
-,( 'acq.default_copy_location', 'lib',
+,( 'acq.default_copy_location', 'acq',
oils_i18n_gettext('acq.default_copy_location',
'Default copy location',
'coust', 'label'),
@@ -2519,7 +2520,7 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'link', 'acpl')
-,( 'acq.fund.balance_limit.block', 'finance',
+,( 'acq.fund.balance_limit.block', 'acq',
oils_i18n_gettext('acq.fund.balance_limit.block',
'Fund Spending Limit for Block',
'coust', 'label'),
@@ -2528,7 +2529,7 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'integer', null)
-,( 'acq.fund.balance_limit.warn', 'finance',
+,( 'acq.fund.balance_limit.warn', 'acq',
oils_i18n_gettext('acq.fund.balance_limit.warn',
'Fund Spending Limit for Warning',
'coust', 'label'),
@@ -2537,7 +2538,7 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'integer', null)
-,( 'acq.holds.allow_holds_from_purchase_request', 'lib',
+,( 'acq.holds.allow_holds_from_purchase_request', 'acq',
oils_i18n_gettext('acq.holds.allow_holds_from_purchase_request',
'Allows patrons to create automatic holds from purchase requests.',
'coust', 'label'),
@@ -2546,7 +2547,7 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'bool', null)
-,( 'acq.tmp_barcode_prefix', 'lib',
+,( 'acq.tmp_barcode_prefix', 'acq',
oils_i18n_gettext('acq.tmp_barcode_prefix',
'Temporary barcode prefix',
'coust', 'label'),
@@ -2555,7 +2556,7 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'string', null)
-,( 'acq.tmp_callnumber_prefix', 'lib',
+,( 'acq.tmp_callnumber_prefix', 'acq',
oils_i18n_gettext('acq.tmp_callnumber_prefix',
'Temporary call number prefix',
'coust', 'label'),
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_acq_config_group.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_acq_config_group.sql
new file mode 100644
index 0000000..a094b8a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_acq_config_group.sql
@@ -0,0 +1,6 @@
+INSERT INTO config.settings_group (name, label) VALUES
+('acq', oils_i18n_gettext('config.settings_group.system', 'Acquisitions', 'coust', 'label'));
+
+UPDATE config.org_unit_setting_type
+ SET grp = 'acq'
+ WHERE name LIKE 'acq%';
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 19 ++++++++++---------
.../Pg/upgrade/0715.data.add_acq_config_group.sql | 12 ++++++++++++
3 files changed, 23 insertions(+), 10 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0715.data.add_acq_config_group.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list