diff options
Diffstat (limited to 'rt/lib/RT/ObjectCustomFieldValues.pm')
| -rw-r--r-- | rt/lib/RT/ObjectCustomFieldValues.pm | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/rt/lib/RT/ObjectCustomFieldValues.pm b/rt/lib/RT/ObjectCustomFieldValues.pm index 486265e26..a2ec317e8 100644 --- a/rt/lib/RT/ObjectCustomFieldValues.pm +++ b/rt/lib/RT/ObjectCustomFieldValues.pm @@ -115,10 +115,10 @@ sub LimitToObject { } -=head2 HasEntry VALUE +=head2 HasEntry CONTENT LARGE_CONTENT -If this collection has an entry with content that eq VALUE then -returns the entry, otherwise returns undef. +If this collection has an entry with content that eq CONTENT and large content +that eq LARGE_CONTENT then returns the entry, otherwise returns undef. =cut @@ -126,11 +126,37 @@ returns the entry, otherwise returns undef. sub HasEntry { my $self = shift; my $value = shift; + my $large_content = shift; return undef unless defined $value && length $value; + my %canon_value; #TODO: this could cache and optimize a fair bit. foreach my $item ( @{$self->ItemsArrayRef} ) { - return $item if lc $item->Content eq lc $value; + my $cf = $item->CustomFieldObj; + my $args = $canon_value{ $cf->Type }; + if ( !$args ) { + $args = { Content => $value, LargeContent => $large_content }; + my ($ok, $msg) = $cf->_CanonicalizeValue( $args ); + next unless $ok; + $canon_value{ $cf->Type } = $args; + } + + if ( $cf->Type eq 'Select' ) { + # select is case insensitive + return $item if lc $item->Content eq lc $args->{Content}; + } + else { + if ( $item->_Value('Content') eq $args->{Content} ) { + if ( defined $item->LargeContent ) { + return $item + if defined $args->{LargeContent} + && $item->LargeContent eq $args->{LargeContent}; + } + else { + return $item unless defined $args->{LargeContent}; + } + } + } } return undef; } |