From: erickson Date: Fri, 6 Oct 2006 02:12:59 +0000 (+0000) Subject: added some report events X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6f06b6df513e9a35f78bf8afa9c0719e567c1612;p=Evergreen.git added some report events git-svn-id: svn://svn.open-ils.org/ILS/trunk@6401 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/extras/ils_events.xml b/Open-ILS/src/extras/ils_events.xml index 91f3f4f69f..d45fb00336 100644 --- a/Open-ILS/src/extras/ils_events.xml +++ b/Open-ILS/src/extras/ils_events.xml @@ -685,6 +685,16 @@ No org id was provided + + A report template with the given name and folder already exists + + + + A report with the given name and folder already exists + + + + diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm b/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm index f92e811a9c..7f277e1912 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Reporter.pm @@ -135,6 +135,11 @@ sub create_template { return $e->die_event unless $e->checkauth; return $e->die_event unless $e->allowed('RUN_REPORTS'); $template->owner($e->requestor->id); + + my $existing = $e->search_reporter_template( {owner=>$template->owner, + folder=>$template->folder, name=>$template->name},{idlist=>1}); + return OpenILS::Event->new('REPORT_TEMPLATE_EXISTS') if @$existing; + my $tmpl = $e->create_reporter_template($template) or return $e->die_event; $e->commit; @@ -151,6 +156,11 @@ sub create_report { return $e->die_event unless $e->checkauth; return $e->die_event unless $e->allowed('RUN_REPORTS'); $report->owner($e->requestor->id); + + my $existing = $e->search_reporter_report( {owner=>$report->owner, + folder=>$report->folder, name=>$report->name},{idlist=>1}); + return OpenILS::Event->new('REPORT_REPORT_EXISTS') if @$existing; + my $rpt = $e->create_reporter_report($report) or return $e->die_event; $schedule->report($rpt->id);