[rt-commit] [svn] r566 - in rtfm/trunk: . lib/RT/FM

[jesse at fsck.com]

Author: jesse
Date: Sun Mar 14 17:36:08 2004
New Revision: 566

Modified:
   rtfm/trunk/   (props changed)
   rtfm/trunk/lib/RT/FM/Article_Overlay.pm
   rtfm/trunk/releng.cnf
Log:
Fix for oracle custom fields.
Bumping to 2.0.3rc9

Modified: rtfm/trunk/lib/RT/FM/Article_Overlay.pm
==============================================================================
--- rtfm/trunk/lib/RT/FM/Article_Overlay.pm	(original)
+++ rtfm/trunk/lib/RT/FM/Article_Overlay.pm	Sun Mar 14 17:36:08 2004
@@ -1082,13 +1082,14 @@
     $cf->Load( $args{'Field'} );
 
     #Load up the ObjectKeyword we\'re talking about
-    my $CFObjectValue = new RT::FM::ArticleCFValue( $self->CurrentUser );
-    $CFObjectValue->LoadByCols( Content     => $args{'Content'},
-                                CustomField => $cf->Id,
-                                Article     => $self->id() );
+
+    my $values = RT::FM::ArticleCFValueCollection($self->CurrentUser);
+    $values->LimitToArticle($self->id);
+    $values->LimitToCustomField($self->id);
+    my $CFObjectValue = $values->HasEntryWithContent($args{'Content'}); 
 
     #if we can\'t find it, bail
-    unless ( $CFObjectValue->id ) {
+    unless ($CFObjectValue ) {
         return (
             undef,
             $self->loc(

Modified: rtfm/trunk/releng.cnf
==============================================================================
--- rtfm/trunk/releng.cnf	(original)
+++ rtfm/trunk/releng.cnf	Sun Mar 14 17:36:08 2004
@@ -1,5 +1,5 @@
 PRODUCT			        = RTFM
-TAG			            = 2.0.3rc8
+TAG			            = 2.0.3rc9
 CANONICAL_REPO		    = svn+ssh://svn.bestpractical.com/svn/bps-public/rtfm/
 TAGS		            = tags/
 TRUNK	                = trunk/