projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix A/R report
[freeside.git]
/
rt
/
lib
/
RT
/
ObjectCustomFieldValues.pm
diff --git
a/rt/lib/RT/ObjectCustomFieldValues.pm
b/rt/lib/RT/ObjectCustomFieldValues.pm
index
c6d2191
..
b1cf3ca
100644
(file)
--- a/
rt/lib/RT/ObjectCustomFieldValues.pm
+++ b/
rt/lib/RT/ObjectCustomFieldValues.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
5
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
6
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)
@@
-51,11
+51,10
@@
package RT::ObjectCustomFieldValues;
use strict;
use warnings;
use strict;
use warnings;
+use base 'RT::SearchBuilder';
use RT::ObjectCustomFieldValue;
use RT::ObjectCustomFieldValue;
-use base 'RT::SearchBuilder';
-
sub Table { 'ObjectCustomFieldValues'}
sub _Init {
sub Table { 'ObjectCustomFieldValues'}
sub _Init {
@@
-63,12
+62,12
@@
sub _Init {
# By default, order by SortOrder
$self->OrderByCols(
# By default, order by SortOrder
$self->OrderByCols(
- { ALIAS => 'main',
- FIELD => 'SortOrder',
- ORDER => 'ASC' },
- { ALIAS => 'main',
- FIELD => 'id',
- ORDER => 'ASC' },
+
{ ALIAS => 'main',
+
FIELD => 'SortOrder',
+
ORDER => 'ASC' },
+
{ ALIAS => 'main',
+
FIELD => 'id',
+
ORDER => 'ASC' },
);
return ( $self->SUPER::_Init(@_) );
);
return ( $self->SUPER::_Init(@_) );
@@
-146,7
+145,7
@@
sub HasEntry {
return $item if lc $item->Content eq lc $args->{Content};
}
else {
return $item if lc $item->Content eq lc $args->{Content};
}
else {
- if (
$item->_Value('Content
') eq $args->{Content} ) {
+ if (
($item->_Value('Content') || '
') eq $args->{Content} ) {
if ( defined $item->LargeContent ) {
return $item
if defined $args->{LargeContent}
if ( defined $item->LargeContent ) {
return $item
if defined $args->{LargeContent}
@@
-155,6
+154,8
@@
sub HasEntry {
else {
return $item unless defined $args->{LargeContent};
}
else {
return $item unless defined $args->{LargeContent};
}
+ } elsif ( $item->LargeContent && $args->{Content} ) {
+ return $item if ($item->LargeContent eq $args->{Content});
}
}
}
}
}
}
@@
-185,17
+186,6
@@
sub _DoCount {
return $self->SUPER::_DoCount(@_);
}
return $self->SUPER::_DoCount(@_);
}
-
-=head2 NewItem
-
-Returns an empty new RT::ObjectCustomFieldValue item
-
-=cut
-
-sub NewItem {
- my $self = shift;
- return(RT::ObjectCustomFieldValue->new($self->CurrentUser));
-}
RT::Base->_ImportOverlays();
1;
RT::Base->_ImportOverlays();
1;