diff options
| -rw-r--r-- | FS/FS/Schema.pm | 1 | ||||
| -rw-r--r-- | FS/FS/part_export.pm | 3 | ||||
| -rwxr-xr-x | httemplate/browse/part_export.cgi | 6 | ||||
| -rwxr-xr-x | httemplate/browse/part_svc.cgi | 11 | ||||
| -rw-r--r-- | httemplate/edit/part_export.cgi | 8 | ||||
| -rwxr-xr-x | httemplate/edit/part_svc.cgi | 8 |
6 files changed, 32 insertions, 5 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 6ed7756..4c85da1 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -2024,6 +2024,7 @@ sub tables_hashref { 'part_export' => { 'columns' => [ 'exportnum', 'serial', '', '', '', '', + 'exportname', 'varchar', 'NULL', $char_d, '', '', 'machine', 'varchar', '', $char_d, '', '', 'exporttype', 'varchar', '', $char_d, '', '', 'nodomain', 'char', 'NULL', 1, '', '', diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm index 588606d..6f5aedc 100644 --- a/FS/FS/part_export.pm +++ b/FS/FS/part_export.pm @@ -50,6 +50,8 @@ fields are currently supported: =item exportnum - primary key +=item exportname - Descriptive name + =item machine - Machine name =item exporttype - Export type @@ -159,6 +161,7 @@ sub check { my $self = shift; my $error = $self->ut_numbern('exportnum') + || $self->ut_textn('exportname') || $self->ut_domain('machine') || $self->ut_alpha('exporttype') ; diff --git a/httemplate/browse/part_export.cgi b/httemplate/browse/part_export.cgi index 1cd2013..8e28f4f 100755 --- a/httemplate/browse/part_export.cgi +++ b/httemplate/browse/part_export.cgi @@ -35,7 +35,11 @@ function part_export_areyousure(href) { <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><A HREF="<% $p %>edit/part_export.cgi?<% $part_export->exportnum %>"><% $part_export->exportnum %></A></TD> - <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"><% $part_export->exporttype %> to <% $part_export->machine %> (<A HREF="<% $p %>edit/part_export.cgi?<% $part_export->exportnum %>">edit</A> | <A HREF="javascript:part_export_areyousure('<% $p %>misc/delete-part_export.cgi?<% $part_export->exportnum %>')">delete</A>)</TD> + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"> +% if( $part_export->exportname ) { + <B><% $part_export->exportname %>:</B><BR> +% } +<% $part_export->exporttype %> to <% $part_export->machine %> (<A HREF="<% $p %>edit/part_export.cgi?<% $part_export->exportnum %>">edit</A> | <A HREF="javascript:part_export_areyousure('<% $p %>misc/delete-part_export.cgi?<% $part_export->exportnum %>')">delete</A>)</TD> <TD CLASS="inv" BGCOLOR="<% $bgcolor %>"> <% itable() %> diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi index 94afdef..82b1150 100755 --- a/httemplate/browse/part_svc.cgi +++ b/httemplate/browse/part_svc.cgi @@ -129,7 +129,16 @@ function part_export_areyousure(href) { % <TR> - <TD><A HREF="<% $p %>edit/part_export.cgi?<% $part_export->exportnum %>"><% $part_export->exportnum %>: <% $part_export->exporttype %> to <% $part_export->machine %></A></TD> + <TD><A HREF="<% $p %>edit/part_export.cgi?<% $part_export->exportnum %>"> +<% $part_export->exportnum %>: +% if ($part_export->exportname) { +<B><% $part_export->exportname %></B> ( +% } +<% $part_export->exporttype %> to <% $part_export->machine %> +% if ($part_export->exportname) { +) +% } +</A></TD> </TR> % } diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi index a2fad56..32ed1fc 100644 --- a/httemplate/edit/part_export.cgi +++ b/httemplate/edit/part_export.cgi @@ -7,6 +7,12 @@ <% ntable("#cccccc",2) %> <TR> + <TD ALIGN="right">Export name</TD> + <TD> + <INPUT TYPE="text" NAME="exportname" VALUE="<% $part_export->exportname %>"> + </TD> +</TR> +<TR> <TD ALIGN="right">Export host</TD> <TD> <INPUT TYPE="text" NAME="machine" VALUE="<% $part_export->machine %>"> @@ -53,7 +59,7 @@ my $widget = new HTML::Widgets::SelectLayers( 'options' => \%layers, 'form_name' => 'dummy', 'form_action' => 'process/part_export.cgi', - 'form_text' => [qw( exportnum machine )], + 'form_text' => [qw( exportnum exportname machine )], # 'form_checkbox' => [qw()], 'html_between' => "</TD></TR></TABLE>\n", 'layer_callback' => sub { diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi index e14acb5..fcffc4f 100755 --- a/httemplate/edit/part_svc.cgi +++ b/httemplate/edit/part_svc.cgi @@ -114,8 +114,12 @@ that field. % && qsearchs( 'export_svc', { % exportnum => $part_export->exportnum, % svcpart => $clone || $part_svc->svcpart }); -% $html .= '>'. $part_export->exportnum. ': '. $part_export->exporttype. -% ' to '. $part_export->machine. '</TD>'; +% $html .= '>'.$part_export->exportnum. ': '; +% $html .= $part_export->exportname . '<DIV ALIGN="right"><FONT SIZE=-1>' +% if ( $part_export->exportname ); +% $html .= $part_export->exporttype. ' to '. $part_export->machine; +% $html .= '</FONT></DIV>' if ( $part_export->exportname ); +% $html .= '</TD>'; % $count++; % $html .= '</TR><TR>' unless $count % $columns; % } |