[open-ils-commits] r14880 - in trunk/Open-ILS/src/sql/Pg: . upgrade (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-11-12 09:18:56 -0500 (Thu, 12 Nov 2009)
New Revision: 14880

Added:
   trunk/Open-ILS/src/sql/Pg/upgrade/0077.data.holds_local_avail_and_override.sql
Modified:
   trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
   trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
Patch from Joe Atzberger to add org settings and perms for alert/deny if local copy is available for a hold

Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2009-11-12 06:03:26 UTC (rev 14879)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2009-11-12 14:18:56 UTC (rev 14880)
@@ -51,7 +51,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0076'); -- senator
+INSERT INTO config.upgrade_log (version) VALUES ('0077'); -- atz
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2009-11-12 06:03:26 UTC (rev 14879)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2009-11-12 14:18:56 UTC (rev 14880)
@@ -1230,8 +1230,11 @@
     (347,'UPDATE_PAYMENT_NOTE', oils_i18n_gettext(347,'Allows staff to edit the note for a payment on a transaction', 'ppl', 'description')),
     (348, 'UPDATE_RECORD', oils_i18n_gettext(348, 'Allow a user to update and undelete records.', 'ppl', 'description')),
     (349, 'UPDATE_PATRON_CLAIM_NEVER_CHECKED_OUT_COUNT', oils_i18n_gettext(349,'Allows staff to manually change a patron''s claims never checkout out count', 'ppl', 'description')),
-	(350, 'ADMIN_COPY_LOCATION_ORDER', oils_i18n_gettext(350, 'Allow a user to create/view/update/delete a copy location order', 'ppl', 'description'));
+    (350, 'ADMIN_COPY_LOCATION_ORDER', oils_i18n_gettext(350, 'Allow a user to create/view/update/delete a copy location order', 'ppl', 'description')),
 
+-- additional permissions
+    (351, 'HOLD_LOCAL_AVAIL_OVERRIDE', oils_i18n_gettext(351, 'Allow a user to place a hold despite the availability of a local copy', 'ppl', 'description'));
+
 SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);
 
 INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm) VALUES

Added: trunk/Open-ILS/src/sql/Pg/upgrade/0077.data.holds_local_avail_and_override.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0077.data.holds_local_avail_and_override.sql	                        (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0077.data.holds_local_avail_and_override.sql	2009-11-12 14:18:56 UTC (rev 14880)
@@ -0,0 +1,22 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0077');   -- atz
+
+INSERT INTO config.org_unit_setting_type (name, label, description, datatype)
+    VALUES 
+        ('circ.holds.alert_if_local_avail',
+         'Holds: Local available alert',
+         'If local copy is available, alert the person making the hold',
+         'bool'),
+
+        ('circ.holds.deny_if_local_avail',
+         'Holds: Local available block',
+         'If local copy is available, deny the creation of the hold',
+         'bool')
+    ;
+
+INSERT INTO permission.perm_list VALUES 
+(351, 'HOLD_LOCAL_AVAIL_OVERRIDE', oils_i18n_gettext(351, 'Allow a user to place a hold despite the availability of a local copy', 'ppl', 'description'));
+
+COMMIT;
+