diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2019-06-14 21:38:46 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2019-06-14 21:38:46 -0400 |
| commit | ac3296dc4d9c1c7ff3646df6496a4f49d9e07b9b (patch) | |
| tree | 4310ac8668adfdfeba3578f224f464692a5b80f5 /httemplate | |
| parent | 978a10cd56e76e763b15f21c533d507d5bc84dec (diff) | |
RT# 83450 - added location to virtual ap and added script to force update of all virtual ap
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/edit/part_export.cgi | 3 | ||||
| -rw-r--r-- | httemplate/elements/progress-init.html | 2 | ||||
| -rw-r--r-- | httemplate/view/svc_export/run_script.cgi | 10 |
3 files changed, 6 insertions, 9 deletions
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi index f8a46c7fd..30e4218e2 100644 --- a/httemplate/edit/part_export.cgi +++ b/httemplate/edit/part_export.cgi @@ -296,7 +296,7 @@ my $widget = new HTML::Widgets::SelectLayers( $html .= '<TR><TD ALIGN="left" COLSPAN=2>' . include('/elements/progress-init.html', $part_export->exporttype, - [ $script.'_exportnum', $script.'_script' ], + [ $script.'_exportnum' ], rooturl().'view/svc_export/run_script.cgi', { 'error_url' => rooturl().$exports->{$layer}{scripts}{$script}->{error_url}."exportnum=".$part_export->{Hash}->{exportnum}, @@ -307,7 +307,6 @@ my $widget = new HTML::Widgets::SelectLayers( $script, ) . '<INPUT TYPE="hidden" NAME="'.$script.'_exportnum" VALUE="'.$part_export->{Hash}->{exportnum}.'"> - <INPUT TYPE="hidden" NAME="'.$script.'_script" VALUE="'.$script.'"> <A HREF="#" onClick="'.$script.'process();">'.$exports->{$layer}{scripts}{$script}->{html_label}.'</A></TD></TR>'; } diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html index 2a62c5e99..de3c6b761 100644 --- a/httemplate/elements/progress-init.html +++ b/httemplate/elements/progress-init.html @@ -126,6 +126,8 @@ function <%$key%>process () { } } + Hash.push('key', '<%$key%>'); + // jsrsPOST = true; // jsrsExecute( '<% $action %>', <%$key%>myCallback, 'start_job', Hash ); diff --git a/httemplate/view/svc_export/run_script.cgi b/httemplate/view/svc_export/run_script.cgi index ba58bbdd7..f0524991b 100644 --- a/httemplate/view/svc_export/run_script.cgi +++ b/httemplate/view/svc_export/run_script.cgi @@ -14,17 +14,13 @@ my %param = (); } } -my $exportnum; -my $method; -for (grep /^*_script$/, keys %param) { - $exportnum = $param{$param{$_}.'_exportnum'}; - $method = $param{$param{$_}.'_script'}; -} +my $run_script = $param{'key'}; +my $exportnum = $param{$run_script.'_exportnum'}; my $part_export = qsearchs('part_export', { 'exportnum'=> $exportnum, } ) or die "unknown exportnum $exportnum"; -my $class = 'FS::part_export::'.$part_export->{Hash}->{exporttype}.'::'.$method; +my $class = 'FS::part_export::'.$part_export->{Hash}->{exporttype}.'::'.$run_script; my $server = new FS::UI::Web::JSRPC $class, $cgi; |