X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FShowCustomFields;h=f632e68fe7310cb61b7eda129184e7b1b33ca4dc;hb=03b2044cdbb22cd41cf308c75d92a108e3e70816;hp=387497e29061c932b5ded00cd1e479f7a69e9ffa;hpb=2302507c0ecd6761f4a27923b50295cfe3f35a14;p=freeside.git
diff --git a/rt/share/html/Elements/ShowCustomFields b/rt/share/html/Elements/ShowCustomFields
index 387497e29..f632e68fe 100644
--- a/rt/share/html/Elements/ShowCustomFields
+++ b/rt/share/html/Elements/ShowCustomFields
@@ -49,31 +49,30 @@
% if ($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;
<% $CustomField->Name %>: |
-% unless ( $count ) {
+% if ( $count == 0 ) {
<&|/l&>(no value)&>
-% } elsif ( $count == 1 ) {
-% $print_value->( $CustomField, $Values->First );
-% } else {
+% } elsif ( $count == 1 ) {
+% $print_value->( $CustomField, $Values->First );
+% } else {
-% while ( my $Value = $Values->Next ) {
+% while ( my $Value = $Values->Next ) {
-
-% $print_value->( $CustomField, $Value );
+% $print_value->( $CustomField, $Value );
-% }
+% }
-% }
+% }
|
-% 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) = @_;