From 6f00514388038706a2e981704122cdaef2a861da Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 8 Nov 2010 21:42:44 +0000 Subject: export names, RT#9827 --- httemplate/browse/part_export.cgi | 6 +++++- httemplate/browse/part_svc.cgi | 11 ++++++++++- httemplate/edit/part_export.cgi | 8 +++++++- httemplate/edit/part_svc.cgi | 8 ++++++-- 4 files changed, 28 insertions(+), 5 deletions(-) (limited to 'httemplate') diff --git a/httemplate/browse/part_export.cgi b/httemplate/browse/part_export.cgi index 1cd201360..8e28f4fc6 100755 --- a/httemplate/browse/part_export.cgi +++ b/httemplate/browse/part_export.cgi @@ -35,7 +35,11 @@ function part_export_areyousure(href) { <% $part_export->exportnum %> - <% $part_export->exporttype %> to <% $part_export->machine %> (edit | delete) + +% if( $part_export->exportname ) { + <% $part_export->exportname %>:
+% } +<% $part_export->exporttype %> to <% $part_export->machine %> (edit | delete) <% itable() %> diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi index 94afdef15..82b1150cc 100755 --- a/httemplate/browse/part_svc.cgi +++ b/httemplate/browse/part_svc.cgi @@ -129,7 +129,16 @@ function part_export_areyousure(href) { % - <% $part_export->exportnum %>: <% $part_export->exporttype %> to <% $part_export->machine %> + +<% $part_export->exportnum %>:  +% if ($part_export->exportname) { +<% $part_export->exportname %> ( +% } +<% $part_export->exporttype %> to <% $part_export->machine %> +% if ($part_export->exportname) { +) +% } + % } diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi index a2fad56a3..32ed1fc94 100644 --- a/httemplate/edit/part_export.cgi +++ b/httemplate/edit/part_export.cgi @@ -6,6 +6,12 @@ <% ntable("#cccccc",2) %> + + Export name + + + + Export host @@ -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' => "\n", 'layer_callback' => sub { diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi index 2e79af996..50bc79c02 100755 --- a/httemplate/edit/part_svc.cgi +++ b/httemplate/edit/part_svc.cgi @@ -116,8 +116,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. ''; +% $html .= '>'.$part_export->exportnum. ': '; +% $html .= $part_export->exportname . '
' +% if ( $part_export->exportname ); +% $html .= $part_export->exporttype. ' to '. $part_export->machine; +% $html .= '
' if ( $part_export->exportname ); +% $html .= ''; % $count++; % $html .= '' unless $count % $columns; % } -- cgit v1.2.1