projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
starting to work...
[freeside.git]
/
rt
/
share
/
html
/
Search
/
Elements
/
PickCFs
diff --git
a/rt/share/html/Search/Elements/PickCFs
b/rt/share/html/Search/Elements/PickCFs
index
9abab44
..
4b9a88b
100644
(file)
--- a/
rt/share/html/Search/Elements/PickCFs
+++ b/
rt/share/html/Search/Elements/PickCFs
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <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
$line{'Field'} = $CustomField->Name;
# Op
- if ($CustomField->Type
eq 'Date'
) {
+ if ($CustomField->Type
=~ /^Date(Time)?$/
) {
$line{'Op'} = {
Type => 'component',
Path => '/Elements/SelectDateRelation',
Arguments => {},
};
$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',
} else {
$line{'Op'} = {
Type => 'component',
@@
-99,11
+106,12
@@
while ( my $CustomField = $CustomFields->Next ) {
}
# Value
}
# Value
- if ($CustomField->Type eq 'Date') {
+ if ($CustomField->Type =~ /^Date(Time)?$/) {
+ my $is_datetime = $1 ? 1 : 0;
$line{'Value'} = {
Type => 'component',
Path => '/Elements/SelectDate',
$line{'Value'} = {
Type => 'component',
Path => '/Elements/SelectDate',
- Arguments => {},
+ Arguments => {
$is_datetime ? (ShowTime => 1) : (ShowTime => 0),
},
};
} else {
$line{'Value'} = {
};
} else {
$line{'Value'} = {