diff options
Diffstat (limited to 'rt/share/html/Search/Elements/PickCFs')
| -rw-r--r-- | rt/share/html/Search/Elements/PickCFs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/rt/share/html/Search/Elements/PickCFs b/rt/share/html/Search/Elements/PickCFs index 9abab4443..4b9a88b77 100644 --- a/rt/share/html/Search/Elements/PickCFs +++ b/rt/share/html/Search/Elements/PickCFs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -80,12 +80,19 @@ while ( my $CustomField = $CustomFields->Next ) { $line{'Field'} = $CustomField->Name; # Op - if ($CustomField->Type eq 'Date') { + if ($CustomField->Type =~ /^Date(Time)?$/ ) { $line{'Op'} = { Type => 'component', Path => '/Elements/SelectDateRelation', Arguments => {}, }; + } + elsif ($CustomField->Type =~ /^IPAddress(Range)?$/ ) { + $line{'Op'} = { + Type => 'component', + Path => '/Elements/SelectIPRelation', + Arguments => {}, + }; } else { $line{'Op'} = { Type => 'component', @@ -99,11 +106,12 @@ while ( my $CustomField = $CustomFields->Next ) { } # Value - if ($CustomField->Type eq 'Date') { + if ($CustomField->Type =~ /^Date(Time)?$/) { + my $is_datetime = $1 ? 1 : 0; $line{'Value'} = { Type => 'component', Path => '/Elements/SelectDate', - Arguments => {}, + Arguments => { $is_datetime ? (ShowTime => 1) : (ShowTime => 0), }, }; } else { $line{'Value'} = { |