X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fedit%2Fpart_export.cgi;h=4dd253be8ceded0f3e8613c4775e496c2d929afd;hb=a72a10f754f7465121d6137bb3dcee0a21ea6443;hp=8b697e14230ca24a7d0774f8202801f93ecf76d0;hpb=ad84bf7cfdb56aa1fe268ea315b7a2f7dd768db2;p=freeside.git
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index 8b697e142..4dd253be8 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -7,9 +7,9 @@
<% ntable("#cccccc",2) %>
- Export host
+ Export name
-
+
@@ -45,25 +45,98 @@ $action ||= $part_export->exportnum ? 'Edit' : 'Add';
#my $exports = FS::part_export::export_info($svcdb);
my $exports = FS::part_export::export_info();
-my %layers = map { $_ => "$_ - ". $exports->{$_}{desc} } keys %$exports;
-$layers{''}='';
+tie my %layers, 'Tie::IxHash',
+ '' => '',
+ map { $_ => "$_ - ". $exports->{$_}{desc} }
+ sort { $a cmp $b }
+ keys %$exports;
+;
my $widget = new HTML::Widgets::SelectLayers(
'selected_layer' => $part_export->exporttype,
'options' => \%layers,
'form_name' => 'dummy',
'form_action' => 'process/part_export.cgi',
- 'form_text' => [qw( exportnum machine )],
+ 'form_text' => [qw( exportnum exportname )],
# 'form_checkbox' => [qw()],
'html_between' => " \n",
'layer_callback' => sub {
my $layer = shift;
+ # create 'config_element' to generate the whole layer with a Mason component
+ if ( my $include = $exports->{$layer}{config_element} ) {
+ # might need to adjust the scope of this at some point
+ return $m->scomp($include,
+ part_export => $part_export,
+ layer => $layer,
+ export_info => $exports->{$layer}
+ );
+ }
my $html = qq! !.
ntable("#cccccc",2);
- $html .= 'Description '.
- $exports->{$layer}{notes}. ' '
- if $layer;
+ if ( $layer ) {
+ $html .= 'Description '.
+ $exports->{$layer}{notes}. ' ';
+
+ if ( $exports->{$layer}{no_machine} ) {
+ $html .= ' '.
+ ' ';
+ } else {
+ $html .= 'Hostname or IP ';
+ my $machine = $part_export->machine;
+ if ( $exports->{$layer}{svc_machine} ) {
+ my( $N_CHK, $Y_CHK) = ( 'CHECKED', '' );
+ my( $machine_DISABLED, $pem_DISABLED) = ( '', 'DISABLED' );
+ my $part_export_machine = '';
+ if ( $cgi->param('svc_machine') eq 'Y'
+ || $machine eq '_SVC_MACHINE'
+ )
+ {
+ $Y_CHK = 'CHECKED';
+ $N_CHK = 'CHECKED';
+ $machine_DISABLED = 'DISABLED';
+ $pem_DISABLED = '';
+ $machine = '';
+ $part_export_machine =
+ $cgi->param('part_export_machine')
+ || join "\n",
+ map $_->machine,
+ grep ! $_->disabled,
+ $part_export->part_export_machine;
+ }
+ my $oc = qq(onChange="${layer}_svc_machine_changed(this)");
+ $html .= qq[
+
+
+
+
+ Selected in each customer service from these choices
+
+
+
+ ];
+ } else {
+ $html .= qq( ).
+ ' ';
+ }
+ $html .= " ";
+ }
+
+ }
foreach my $option ( keys %{$exports->{$layer}{options}} ) {
my $optinfo = $exports->{$layer}{options}{$option};
@@ -77,10 +150,27 @@ my $widget = new HTML::Widgets::SelectLayers(
? $optinfo->{default}
: ''
);
- $html .= qq!$label !;
+ if ( $type eq 'title' ) {
+ $html .= qq! ! .
+ $label .
+ ' ';
+ next;
+ }
+
+ # 'freeform': disables table formatting of options. Instead, each
+ # option can define "before" and "after" strings which are inserted
+ # around the selector.
+ my $freeform = $optinfo->{freeform};
+ if ( $freeform ) {
+ $html .= $optinfo->{before} || '';
+ }
+ else {
+ $html .= qq!$label !;
+ }
if ( $type eq 'select' ) {
my $size = defined($optinfo->{size}) ? " SIZE=" . $optinfo->{size} : '';
- my $multi = defined($optinfo->{multi}) ? ' MULTIPLE' : '';
+ my $multi = ($optinfo->{multi} || $optinfo->{multiple})
+ ? ' MULTIPLE' : '';
$html .= qq!!;
my @values = split '\s+', $value if $multi;
my @options;
@@ -108,7 +198,7 @@ my $widget = new HTML::Widgets::SelectLayers(
$html .= qq!';
} elsif ( $type eq 'text' ) {
- $html .= qq! ';
} elsif ( $type eq 'checkbox' ) {
$html .= qq! {after} || '';
+ }
+ else {
+ $html .= ' ';
+ }
+ }
+
+ if ( $exports->{$layer}{nas} and qsearch('nas',{}) ) {
+ # show NAS checkboxes
+ $html .= 'Export RADIUS clients ';
+
+ $html .= include('/elements/checkboxes-table.html',
+ 'source_obj' => $part_export,
+ 'link_table' => 'export_nas',
+ 'target_table' => 'nas',
+ #hashref => {},
+ 'name_callback' => sub {
+ $_[0]->shortname . ' (' . $_[0]->nasname . ')',
+ },
+ 'default' => 'yes',
+ 'target_link' => $p.'edit/nas.html?',
+ );
+
$html .= ' ';
}
+
$html .= '';
$html .= '