diff options
author | Christopher Burger <burgerc@freeside.biz> | 2017-06-02 09:08:36 -0400 |
---|---|---|
committer | Christopher Burger <burgerc@freeside.biz> | 2017-06-02 09:08:36 -0400 |
commit | d70f9acc79c2478cd9c148f30ff56f3f1a704ebc (patch) | |
tree | 4bb5f2fe609462a3b9a9c8b9505a2a5e55c71000 /httemplate/elements | |
parent | cbc1e6944fb7154a1ff97ac1bdc5cca947477935 (diff) |
RT# 74122 - updated change history to not show data with out a description
Diffstat (limited to 'httemplate/elements')
-rw-r--r-- | httemplate/elements/change_history_common.html | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/httemplate/elements/change_history_common.html b/httemplate/elements/change_history_common.html index dfcfcb9..5fba236 100644 --- a/httemplate/elements/change_history_common.html +++ b/httemplate/elements/change_history_common.html @@ -44,6 +44,40 @@ % } else { % $bgcolor = $bgcolor1; % } +% +% ## Create Description and check to see it is not empty, no need to display a record with no description, so skip it. +% my $description = ''; +% if ( $item->table eq 'legacy_cust_history' ) { +% $description = $item->description; +% } elsif ( $item->table eq 'h_cust_tag' ) { +% $description = &{ $h_table_descripsub{$item->table} }( $item, $tables{'cust_tag'} ) +% if $single_cust && $h_table_descripsub{$item->table}; +% } else { +% $description = join(', ', +% map { my $value = ( $_ =~ /(^pay(info|cvv)|^ss|_password)$/ ) +% ? 'N/A' +% : $item->get($_); +% $value = time2str($cust_pkg_date_format, $value) +% if $item->table eq 'h_cust_pkg' +% && $cust_pkg_date_fields{$_} +% && $value; +% +% $value = substr($value, 0, 77).'...' if length($value) > 80; +% $value = encode_entities($value); +% "<I>$_</I>:<B>$value</B>"; +% } +% grep { $history_other +% ? ( $item->get($_) ne $history_other->get($_) ) +% : ( $item->get($_) =~ /\S/ ) +% } +% grep { ! /^(history|custnum$)/i } +% $item->fields +% ); +% if ( $single_cust && $h_table_descripsub{$item->table} ) { +% $description = &{ $h_table_descripsub{$item->table} }( $item ); +% } +% } #else +% if (!$description) { next; } <TR> @@ -102,39 +136,7 @@ </TD> <TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>"> -% my $description = ''; -% if ( $item->table eq 'legacy_cust_history' ) { - <% $item->description |h %> -% } elsif ( $item->table eq 'h_cust_tag' ) { -% $description = &{ $h_table_descripsub{$item->table} }( $item, $tables{'cust_tag'} ) -% if $single_cust && $h_table_descripsub{$item->table}; - <% $description %> -% } else { - <% join(', ', - map { my $value = ( $_ =~ /(^pay(info|cvv)|^ss|_password)$/ ) - ? 'N/A' - : $item->get($_); - $value = time2str($cust_pkg_date_format, $value) - if $item->table eq 'h_cust_pkg' - && $cust_pkg_date_fields{$_} - && $value; - - $value = substr($value, 0, 77).'...' if length($value) > 80; - $value = encode_entities($value); - "<I>$_</I>:<B>$value</B>"; - } - grep { $history_other - ? ( $item->get($_) ne $history_other->get($_) ) - : ( $item->get($_) =~ /\S/ ) - } - grep { ! /^(history|custnum$)/i } - $item->fields - ) - %> -% if ( $single_cust && $h_table_descripsub{$item->table} ) { - <% &{ $h_table_descripsub{$item->table} }( $item ) %> -% } -% } + <% $description %> </TD> </TR> |