[open-ils-commits] r9648 - branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-05-20 23:06:51 -0400 (Tue, 20 May 2008)
New Revision: 9648

Modified:
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm
Log:
only check picklist perm if picklist is set

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm	2008-05-21 03:03:47 UTC (rev 9647)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm	2008-05-21 03:06:51 UTC (rev 9648)
@@ -473,12 +473,14 @@
         $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 @@
     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 {