From 2732d39a361a0035bb60b21ce8936ee29b574ff5 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 16 Mar 2009 21:19:57 +0000 Subject: [PATCH] fleshing new creator/editor tracking fiels in PO, picklist, and lineitem git-svn-id: svn://svn.open-ils.org/ILS/trunk@12549 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../src/perlmods/OpenILS/Application/Acq/Financials.pm | 3 +++ .../src/perlmods/OpenILS/Application/Acq/Lineitem.pm | 6 ++++++ .../src/perlmods/OpenILS/Application/Acq/Picklist.pm | 16 ++++++++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm index 11c202f0a7..1727b41592 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm @@ -547,7 +547,10 @@ sub create_purchase_order { my $e = new_editor(xact=>1, authtoken=>$auth); return $e->die_event unless $e->checkauth; + $p_order->creator($e->requestor->id); + $p_order->editor($e->requestor->id); $p_order->owner($e->requestor->id); + $p_order->edit_time('now'); $p_order->ordering_agency($e->requestor->ws_ou); return $e->die_event unless $e->allowed('CREATE_PURCHASE_ORDER', $p_order->ordering_agency); diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm index f3cfb8dc50..d672c0d37f 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm @@ -42,6 +42,7 @@ sub create_lineitem { # indicate the picklist was updated $picklist->edit_time('now'); + $picklist->editor($e->requestor->id); $e->update_acq_picklist($picklist) or return $e->die_event; } @@ -155,6 +156,8 @@ sub create_lineitem_assets_impl { return $record; } + $li->editor($e->requestor->id); + $li->edit_time('now'); $li->eg_bib_id($record->id); $e->update_acq_lineitem($li) or return $e->die_event; } @@ -361,6 +364,8 @@ sub update_lineitem { $li->marc($e->retrieve_acq_lineitem($li->id)->marc) unless $li->marc; + $li->editor($e->requestor->id); + $li->edit_time('now'); $e->update_acq_lineitem($li) or return $e->die_event; $e->commit; return 1; @@ -597,6 +602,7 @@ sub update_li_edit_time { # return OpenILS::Event->new('ACQ_LINEITEM_APPROVED', payload => $li->id) # if $li->state eq 'approved'; $li->edit_time('now'); + $li->editor($e->requestor->id); $e->update_acq_lineitem($li) or return $e->die_event; return undef; } diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm index 18849c46a4..bd212e798c 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Picklist.pm @@ -66,6 +66,8 @@ sub update_picklist { } return OpenILS::Event->new('BAD_PARAMS') unless $o_picklist->org_unit == $picklist->org_unit; + $picklist->edit_time('now'); + $picklist->editor($e->requestor->id); $e->update_acq_picklist($picklist) or return $e->die_event; $e->commit; return 1; @@ -428,9 +430,17 @@ sub zsearch { unless($picklist) { $picklist = Fieldmapper::acq::picklist->new; $picklist->owner($e->requestor->id); + $picklist->creator($e->requestor->id); + $picklist->editor($e->requestor->id); + $picklist->edit_time('now'); $picklist->name($name); $picklist->org_unit($e->requestor->ws_ou); $e->create_acq_picklist($picklist) or return $e->die_event; + + } else { + $picklist->editor($e->requestor->id); + $picklist->edit_time('now'); + $e->update_acq_picklist($picklist) or return $e->die_event; } my $ses = OpenSRF::AppSession->create('open-ils.search'); @@ -439,8 +449,6 @@ sub zsearch { while(my $resp = $req->recv(timeout=>60)) { my $result = $resp->content; - #use Data::Dumper; - #$logger->info("results = ".Dumper($resp)); my $count = $result->{count}; my $total = (($count < $search->{limit}) ? $count : $search->{limit})+1; my $ctr = 0; @@ -451,6 +459,10 @@ sub zsearch { $li->picklist($picklist->id); $li->source_label($result->{service}); $li->selector($e->requestor->id); + $li->creator($e->requestor->id); + $li->editor($e->requestor->id); + $li->edit_time('now'); + $li->create_time('now'); $li->marc($rec->{marcxml}); $li->eg_bib_id($rec->{bibid}) if $rec->{bibid}; $e->create_acq_lineitem($li) or return $e->die_event; -- 2.11.0