LP#1068287 - new precat permission - make_precat_copy perm check

Misc refactoring.

Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index 872d8b0..756c66f 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -1623,8 +1623,6 @@ sub do_checkout {
     }
 
     if( $self->is_precat ) {
-        return $self->bail_on_events(OpenILS::Event->new('PERM_FAILURE'))
-            unless $self->editor->allowed('CREATE_PRECAT');
         $self->make_precat_copy;
         return if $self->bail_out;
 
@@ -2428,6 +2426,8 @@ sub create_due_date {
 sub make_precat_copy {
     my $self = shift;
     my $copy = $self->copy;
+    return $self->bail_on_events(OpenILS::Event->new('PERM_FAILURE'))
+       unless $self->editor->allowed('CREATE_PRECAT');
 
    if($copy) {
         $logger->debug("circulator: Pre-cat copy already exists in checkout: ID=" . $copy->id);