X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FShowCustomFields;h=387497e29061c932b5ded00cd1e479f7a69e9ffa;hb=2302507c0ecd6761f4a27923b50295cfe3f35a14;hp=3fe51c109af46eca4b7fd9c2f99a46865f7f58ac;hpb=b8988e1d3ac75af63c85e8563e57701030315a9e;p=freeside.git
diff --git a/rt/share/html/Elements/ShowCustomFields b/rt/share/html/Elements/ShowCustomFields
index 3fe51c109..387497e29 100644
--- a/rt/share/html/Elements/ShowCustomFields
+++ b/rt/share/html/Elements/ShowCustomFields
@@ -52,6 +52,7 @@
% while ( my $CustomField = $CustomFields->Next ) {
% my $Values = $Object->CustomFieldValues( $CustomField->Id );
% my $count = $Values->Count;
+% next if $count == 0 and $CustomField->Disabled;
<% $CustomField->Name %>: |
@@ -70,6 +71,10 @@
% }
|
+% if ( $CustomFields->IsLast ) {
+% # switch to the other result set
+% $CustomFields = $HiddenCustomFields;
+% }
% }
% if ($Table) {
@@ -83,6 +88,13 @@ $m->callback(
CustomFields => $CustomFields,
);
+# kludge to allow "Support time" to be displayed even though it's been
+# removed
+my $HiddenCustomFields = RT::CustomFields->new($session{'CurrentUser'});
+$HiddenCustomFields->LimitToChildType(ref $Object);
+$HiddenCustomFields->Limit( FIELD => 'Type', VALUE => 'TimeValue' );
+$HiddenCustomFields->Limit( FIELD => 'Disabled', VALUE => 1 );
+
# don't print anything if there is no custom fields
return unless $CustomFields->First;
$CustomFields->GotoFirstItem;
@@ -127,5 +139,6 @@ my $print_value = sub {
<%ARGS>
$Object => undef
$CustomFields => $Object->CustomFields
+
$Table => 1
%ARGS>