backporting use of UPDATE_VOLUME vs. VOLUME_UPDATE perm

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@8106 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
index 0fd5eb3..f1b0578 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
@@ -1296,7 +1296,7 @@ sub batch_volume_transfer {
 
        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 @@ sub find_or_create_volume {
        # 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);

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
index 9804fb2..77e596c 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
@@ -217,7 +217,7 @@ sub merge_volumes {
                $_->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);
        }