[open-ils-commits] r8106 - in branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application: . Cat

[svn at svn.open-ils.org]

Author: erickson
Date: 2007-11-21 11:02:30 -0500 (Wed, 21 Nov 2007)
New Revision: 8106

Modified:
   branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
   branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
Log:
backporting use of  UPDATE_VOLUME vs. VOLUME_UPDATE perm

Modified: branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
===================================================================
--- branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm	2007-11-21 16:01:16 UTC (rev 8105)
+++ branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm	2007-11-21 16:02:30 UTC (rev 8106)
@@ -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: branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
===================================================================
--- branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm	2007-11-21 16:01:16 UTC (rev 8105)
+++ branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm	2007-11-21 16:02:30 UTC (rev 8106)
@@ -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);