[open-ils-commits] r7972 - in trunk/Open-ILS/src: perlmods/OpenILS/Application perlmods/OpenILS/Application/Cat sql/Pg

[svn at svn.open-ils.org]

Author: erickson
Date: 2007-11-03 14:59:05 -0400 (Sat, 03 Nov 2007)
New Revision: 7972

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
   trunk/Open-ILS/src/sql/Pg/006.data.permissions.sql
Log:
Turned all instances of VOLUME_UPDATE into UPDATE_VOLUME permission checks
UPDATE_VOLUME was the original permission and conforms to the permission naming scheme
no longer creating the VOLUME_UPDATE permission in the DB




Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm	2007-11-02 13:41:59 UTC (rev 7971)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm	2007-11-03 18:59:05 UTC (rev 7972)
@@ -217,7 +217,7 @@
 		$_->deleted('t');
 		$_->editor($editor->requestor->id);
 		$_->edit_date('now');
-		return (undef,$editor->event) unless $editor->allowed('VOLUME_UPDATE', $_->owning_lib);
+		return (undef,$editor->event) unless $editor->allowed('UPDATE_VOLUME', $_->owning_lib);
 		$editor->update_asset_call_number($_) or return (undef, $editor->event);
 	}
 

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm	2007-11-02 13:41:59 UTC (rev 7971)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm	2007-11-03 18:59:05 UTC (rev 7972)
@@ -1296,7 +1296,7 @@
 
 	my $e = new_editor(authtoken => $auth, xact =>1);
 	return $e->event unless $e->checkauth;
-	return $e->event unless $e->allowed('VOLUME_UPDATE', $o_lib);
+	return $e->event unless $e->allowed('UPDATE_VOLUME', $o_lib);
 
 	my $dorg = $e->retrieve_actor_org_unit($o_lib)
 		or return $e->event;
@@ -1477,7 +1477,7 @@
 	# Otherwise, create a new volume with the given attributes
 	# -----------------------------------------------------------------
 
-	return $e->die_event unless $e->allowed('VOLUME_UPDATE', $org_id);
+	return $e->die_event unless $e->allowed('UPDATE_VOLUME', $org_id);
 
 	$vol = Fieldmapper::asset::call_number->new;
 	$vol->owning_lib($org_id);

Modified: trunk/Open-ILS/src/sql/Pg/006.data.permissions.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/006.data.permissions.sql	2007-11-02 13:41:59 UTC (rev 7971)
+++ trunk/Open-ILS/src/sql/Pg/006.data.permissions.sql	2007-11-03 18:59:05 UTC (rev 7972)
@@ -138,7 +138,6 @@
 INSERT INTO permission.perm_list VALUES (142, 'CIRC_EXCEEDS_COPY_RANGE.override', '');
 INSERT INTO permission.perm_list VALUES (143, 'ITEM_ON_HOLDS_SHELF.override', '');
 INSERT INTO permission.perm_list VALUES (144, 'COPY_NOT_AVAILABLE.override', 'Allow staff to force checkout of Missing/Lost type items');
-INSERT INTO permission.perm_list VALUES (145, 'VOLUME_UPDATE', '');
 INSERT INTO permission.perm_list VALUES (146, 'HOLD_EXISTS.override', 'allows users to place multiple holds on a single title');
 INSERT INTO permission.perm_list VALUES (147, 'RUN_REPORTS', 'Allows a users to run reports');
 INSERT INTO permission.perm_list VALUES (148, 'SHARE_REPORT_FOLDER', 'Allows a user to share report his own folders');