Changeset 9632 for branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm

Timestamp:

05/18/08 12:04:52 (5 months ago)

Author:

erickson

Message:

Merged revisions 9631 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9631 | erickson | 2008-05-18 12:02:28 -0400 (Sun, 18 May 2008) | 1 line

for lack of a more context-specific perm org, checking some global perms agains workstation org

........

Location:

branches/acq-experiment

Files:

• . (modified) (1 prop)
• Open-ILS/src/perlmods/OpenILS/Application/Cat.pm (modified) (4 diffs)

branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm

@@ -195 +195 @@
         my $e = new_editor(authtoken=>$auth, xact=>1);
         return $e->die_event unless $e->checkauth;
-        return $e->die_event unless $e->allowed('CREATE_MARC');
+        return $e->die_event unless $e->allowed('CREATE_MARC', $e->requestor->ws_ou);
 
         my $rec = $e->retrieve_biblio_record_entry($recid)
@@ -274 +274 @@
     my $e = new_editor(xact=>1, authtoken=>$authtoken);
     return $e->die_event unless $e->checkauth;
-    return $e->die_event unless $e->allowed('IMPORT_MARC');
+    return $e->die_event unless $e->allowed('IMPORT_MARC', $e->requestor->ws_ou);
 
         my( $evt, $tcn, $tcn_source, $marcdoc );
@@ -1014 +1014 @@
 sub fix_copy_price {
         my $copy = shift;
-        my $p = $copy->price || 0;
-        $p =~ s/\$//og;
-        $copy->price($p);
+
+    if(defined $copy->price) {
+            my $p = $copy->price || 0;
+            $p =~ s/\$//og;
+            $copy->price($p);
+    }
 
         my $d = $copy->deposit_amount || 0;
@@ -1084 +1087 @@
     my $e = new_editor(xact=>1, authtoken=>$auth);
     return $e->die_event unless $e->checkauth;
-    return $e->die_event unless $e->allowed('DELETE_RECORD');
+    return $e->die_event unless $e->allowed('DELETE_RECORD', $e->requestor->ws_ou);
     my $vols = $e->search_asset_call_number({record=>$rec_id, deleted=>'f'});
     return OpenILS::Event->new('RECORD_NOT_EMPTY', payload=>$rec_id) if @$vols;