[open-ils-commits] r17854 - in branches/rel_2_0/Open-ILS/src: perlmods/OpenILS/Application sql/Pg sql/Pg/upgrade (senator)

[svn at svn.open-ils.org]

Author: senator
Date: 2010-09-20 18:51:28 -0400 (Mon, 20 Sep 2010)
New Revision: 17854

Added:
   branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0409.data.receive-serial-perm.sql
Modified:
   branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Serial.pm
   branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
   branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
Backport r17853 from trunk


Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Serial.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Serial.pm	2010-09-20 22:47:35 UTC (rev 17853)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Serial.pm	2010-09-20 22:51:28 UTC (rev 17854)
@@ -1247,6 +1247,7 @@
 
     my $e = new_editor("authtoken" => $auth, "xact" => 1);
     return $e->die_event unless $e->checkauth;
+    return $e->die_event unless $e->allowed("RECEIVE_SERIAL");
 
     my $user_id = $e->requestor->id;
 

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-09-20 22:47:35 UTC (rev 17853)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-09-20 22:51:28 UTC (rev 17854)
@@ -68,7 +68,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0408'); -- gmc
+INSERT INTO config.upgrade_log (version) VALUES ('0409'); -- senator
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-09-20 22:47:35 UTC (rev 17853)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-09-20 22:51:28 UTC (rev 17854)
@@ -1953,8 +1953,10 @@
  ( 482, 'ADMIN_SERIAL_DISTRIBUTION', oils_i18n_gettext( 482, 
     'ADMIN_SERIAL_DISTRIBUTION', 'ppl', 'description' )),
  ( 483, 'ADMIN_SERIAL_STREAM', oils_i18n_gettext( 483, 
-    'ADMIN_SERIAL_STREAM', 'ppl', 'description' ));
+    'ADMIN_SERIAL_STREAM', 'ppl', 'description' )),
+ ( 484, 'RECEIVE_SERIAL', oils_i18n_gettext(484, 'Receive serial items', '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: branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0409.data.receive-serial-perm.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0409.data.receive-serial-perm.sql	                        (rev 0)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0409.data.receive-serial-perm.sql	2010-09-20 22:51:28 UTC (rev 17854)
@@ -0,0 +1,8 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0409'); -- senator
+
+INSERT INTO permission.perm_list (id, code, description) VALUES
+    (484, 'RECEIVE_SERIAL', oils_i18n_gettext(484, 'Receive serial items', 'ppl', 'description'));
+
+COMMIT;