From 140a8d3af4eeee434a84d719a4c609d73e471f5e Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 27 Oct 2008 21:58:55 +0000 Subject: [PATCH] more moving of code out to the common packages git-svn-id: svn://svn.open-ils.org/ILS/trunk@10929 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Cat.pm | 11 ----------- .../OpenILS/Application/Cat/AssetCommon.pm | 14 +++++++++++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm index 9239b102b8..d7278d8a9b 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm @@ -607,17 +607,6 @@ sub update_volume { -sub copy_perm_org { - my( $vol, $copy ) = @_; - my $org = $vol->owning_lib; - if( $vol->id == OILS_PRECAT_CALL_NUMBER ) { - $org = ref($copy->circ_lib) ? $copy->circ_lib->id : $copy->circ_lib; - } - $logger->debug("using copy perm org $org"); - return $org; -} - - __PACKAGE__->register_method ( method => 'delete_bib_record', api_name => 'open-ils.cat.biblio.record_entry.delete'); diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm index 7f09f2c017..29258c6012 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm @@ -179,7 +179,7 @@ sub update_fleshed_copies { } return $editor->event unless - $editor->allowed('UPDATE_COPY', copy_perm_org($vol, $copy)); + $editor->allowed('UPDATE_COPY', $class->copy_perm_org($vol, $copy)); $copy->editor($editor->requestor->id); $copy->edit_date('now'); @@ -220,7 +220,7 @@ sub delete_copy { my($class, $editor, $override, $vol, $copy ) = @_; return $editor->event unless - $editor->allowed('DELETE_COPY',copy_perm_org($vol, $copy)); + $editor->allowed('DELETE_COPY', $class->copy_perm_org($vol, $copy)); my $stat = $U->copy_status($copy->status)->id; @@ -393,4 +393,12 @@ sub remove_empty_objects { } - +sub copy_perm_org { + my($class, $vol, $copy) = @_; + my $org = $vol->owning_lib; + if( $vol->id == OILS_PRECAT_CALL_NUMBER ) { + $org = ref($copy->circ_lib) ? $copy->circ_lib->id : $copy->circ_lib; + } + $logger->debug("using copy perm org $org"); + return $org; +} -- 2.43.2