projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
edit
/
process
/
part_export.cgi
diff --git
a/httemplate/edit/process/part_export.cgi
b/httemplate/edit/process/part_export.cgi
index
6b4d007
..
21150ef
100644
(file)
--- a/
httemplate/edit/process/part_export.cgi
+++ b/
httemplate/edit/process/part_export.cgi
@@
-1,4
+1,13
@@
-<%
+%if ( $error ) {
+% $cgi->param('error', $error );
+<% $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string ) %>
+%} else {
+<% $cgi->redirect(popurl(3). "browse/part_export.cgi") %>
+%}
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
my $exportnum = $cgi->param('exportnum');
my $exportnum = $cgi->param('exportnum');
@@
-6,7
+15,12
@@
my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
#fixup options
#warn join('-', split(',',$cgi->param('options')));
#fixup options
#warn join('-', split(',',$cgi->param('options')));
-my %options = map { $_=>$cgi->param($_) } split(',',$cgi->param('options'));
+my %options = map {
+ my @values = $cgi->param($_);
+ my $value = scalar(@values) > 1 ? join (' ', @values) : $values[0];
+ $value =~ s/\r\n/\n/g; #browsers? (textarea)
+ $_ => $value;
+} split(',', $cgi->param('options'));
my $new = new FS::part_export ( {
map {
my $new = new FS::part_export ( {
map {
@@
-25,11
+39,14
@@
if ( $exportnum ) {
# $exportnum = $new->exportnum;
}
# $exportnum = $new->exportnum;
}
-if ( $error ) {
- $cgi->param('error', $error );
- print $cgi->redirect(popurl(2). "part_export.cgi?". $cgi->query_string );
-} else {
- print $cgi->redirect(popurl(3). "browse/part_export.cgi");
+my $info = FS::part_export::export_info()->{$new->exporttype};
+if ( $info->{nas} ) {
+ my @nasnums = map { /^nasnum(\d+)$/ ? $1 : () } keys %{ $cgi->Vars };
+ $error ||= $new->process_m2m(
+ link_table => 'export_nas',
+ target_table => 'nas',
+ params => \@nasnums
+ );
}
}
-
%
>
+
</%init
>