also unhide support time on transactions, #30921

1 files changed, 16 insertions, 18 deletions

diff --git a/rt/share/html/Elements/ShowCustomFields b/rt/share/html/Elements/ShowCustomFields
index 387497e..f632e68 100644
--- a/rt/share/html/Elements/ShowCustomFields
+++ b/rt/share/html/Elements/ShowCustomFields
@@ -49,31 +49,30 @@
 % if ($Table) {
 <table>
 % }
-% while ( my $CustomField = $CustomFields->Next ) {
-% my $Values = $Object->CustomFieldValues( $CustomField->Id );
-% my $count = $Values->Count;
-% next if $count == 0 and $CustomField->Disabled;
+% foreach my $set ($CustomFields, $HiddenCustomFields) {
+%   $set->GotoFirstItem;
+%   while ( my $CustomField = $set->Next ) {
+%     my $Values = $Object->CustomFieldValues( $CustomField->Id );
+%     my $count = $Values->Count;
+%     next if $count == 0 and $CustomField->Disabled;
   <tr id="CF-<%$CustomField->id%>-ShowRow">
     <td class="label"><% $CustomField->Name %>:</td>
     <td class="value">
-% unless ( $count ) {
+%     if ( $count == 0 ) {
 <i><&|/l&>(no value)</&></i>
-% } elsif ( $count == 1 ) {
-%   $print_value->( $CustomField, $Values->First );
-% } else {
+%     } elsif ( $count == 1 ) {
+%       $print_value->( $CustomField, $Values->First );
+%     } else {
 <ul>
-% while ( my $Value = $Values->Next ) {
+%       while ( my $Value = $Values->Next ) {
 <li>
-% $print_value->( $CustomField, $Value );
+%         $print_value->( $CustomField, $Value );
 </li>
-% }
+%       }
 </ul>
-% }
+%     }
     </td>
   </tr>
-%   if ( $CustomFields->IsLast ) {
-%     # switch to the other result set
-%     $CustomFields = $HiddenCustomFields;
 %   }
 % }
 % if ($Table) {
@@ -93,11 +92,10 @@ $m->callback(
 my $HiddenCustomFields = RT::CustomFields->new($session{'CurrentUser'});
 $HiddenCustomFields->LimitToChildType(ref $Object);
 $HiddenCustomFields->Limit( FIELD => 'Type', VALUE => 'TimeValue' );
-$HiddenCustomFields->Limit( FIELD => 'Disabled', VALUE => 1 );
+$HiddenCustomFields->LimitToDeleted;
 
 # don't print anything if there is no custom fields
-return unless $CustomFields->First;
-$CustomFields->GotoFirstItem;
+return unless $CustomFields->Count > 0 or $HiddenCustomFields->Count > 0;
 
 my $print_value = sub {
     my ($cf, $value) = @_;