Show
Ignore:
Timestamp:
04/25/08 16:29:24 (2 months ago)
Author:
erickson
Message:

The ability to perform record merges is now controlled by a single
permission and not individual perms on volumes/copies that may have to
be updated as part of the merge.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm

    r8824 r9451  
    3939        my( $editor, $master, $records ) = @_; 
    4040 
     41    # bib records are global objects, so no org context required. 
     42    return (undef, $editor->die_event)  
     43        unless $editor->allowed('MERGE_BIB_RECORDS'); 
     44 
    4145        my $vol; 
    4246        my $evt; 
    … …  
    134138                                $record->editor($reqr->id); 
    135139                                $record->edit_date('now'); 
    136                                 $editor->update_biblio_record_entry($record, {checkperm => 1}) 
     140                                $editor->update_biblio_record_entry($record) 
    137141                                        or return $editor->die_event; 
    138142                        } 
    … …  
    143147                        $record->editor($reqr->id); 
    144148                        $record->edit_date('now'); 
    145                         $editor->update_biblio_record_entry($record, {checkperm => 1}) 
     149                        $editor->update_biblio_record_entry($record) 
    146150                                or return $editor->die_event; 
    147151                } 
    … …  
    217221                $_->editor($editor->requestor->id); 
    218222                $_->edit_date('now'); 
    219                 return (undef,$editor->die_event) unless $editor->allowed('UPDATE_VOLUME', $_->owning_lib); 
    220223                $editor->update_asset_call_number($_) or return (undef, $editor->die_event); 
    221224        merge_volume_holds($editor, $bigcn, $_->id);