From a85e5aefa4f29218c05f4dd801b385b4995a86e3 Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 21 May 2008 03:06:51 +0000 Subject: [PATCH] only check picklist perm if picklist is set git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9648 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../src/perlmods/OpenILS/Application/Acq/Picklist.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm index 3aaa95e2b9..ee89c976e2 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm @@ -473,12 +473,14 @@ sub retrieve_lineitem { $li->lineitem_details($details); } - my $picklist = $e->retrieve_acq_picklist($li->picklist) - or return $e->event; - - if($picklist->owner != $e->requestor->id) { - return $e->event unless - $e->allowed('VIEW_PICKLIST', undef, $picklist); + if($li->picklist) { + my $picklist = $e->retrieve_acq_picklist($li->picklist) + or return $e->event; + + if($picklist->owner != $e->requestor->id) { + return $e->event unless + $e->allowed('VIEW_PICKLIST', undef, $picklist); + } } $li->clear_marc if $$options{clear_marc}; @@ -734,8 +736,8 @@ sub lineitem_search { return $e->event unless $e->checkauth; return $e->event unless $e->allowed('CREATE_PICKLIST'); # XXX needs permissions consideration - my $pls = $e->search_acq_lineitem($search, {idlist=>1}); - for my $li_id (@$pls) { + my $lis = $e->search_acq_lineitem($search, {idlist=>1}); + for my $li_id (@$lis) { if($$options{idlist}) { $conn->respond($li_id); } else { -- 2.11.0