import rt 3.4.6

[freeside.git] / rt / lib / RT / CustomField_Overlay.pm

diff --git a/rt/lib/RT/CustomField_Overlay.pm b/rt/lib/RT/CustomField_Overlay.pm
index 9e0ce24..07a953c 100644 (file)
--- a/rt/lib/RT/CustomField_Overlay.pm
+++ b/rt/lib/RT/CustomField_Overlay.pm
@@ -366,7 +366,8 @@ sub AddValue {
         return (0, $self->loc('Permission Denied'));
     }
 
-    unless ($args{'Name'}) {
+    # allow zero value
+    if ( !defined $args{'Name'} || $args{'Name'} eq '' ) {
         return(0, $self->loc("Can't add a custom field value without a name"));
     }
        my $newval = RT::CustomFieldValue->new($self->CurrentUser);
@@ -461,7 +462,7 @@ sub ValuesForTicket {
        my $self = shift;
     my $ticket_id = shift;
     
-    $RT::Logger->debug( ref($self) . " -> ValuesForTicket deprecated in favor of ValuesForObject"); 
+    $RT::Logger->debug( ref($self) . " -> ValuesForTicket deprecated in favor of ValuesForObject at (". join(":",caller).")"); 
     my $ticket = RT::Ticket->new($self->CurrentUser);
     $ticket->Load($ticket_id);
 
@@ -485,7 +486,7 @@ sub AddValueForTicket {
        my %args = ( Ticket => undef,
                  Content => undef,
                     @_ );
-    $RT::Logger->debug( ref($self) . " -> AddValueForTicket deprecated in favor of AddValueForObject"); 
+    $RT::Logger->debug( ref($self) . " -> AddValueForTicket deprecated in favor of AddValueForObject at (". join(":",caller).")");
 
 
     my $ticket = RT::Ticket->new($self->CurrentUser);
@@ -513,7 +514,7 @@ sub DeleteValueForTicket {
                  Content => undef,
                     @_ );
 
-    $RT::Logger->debug( ref($self) . " -> DeleteValueForTicket deprecated in favor of DeleteValueForObject"); 
+    $RT::Logger->debug( ref($self) . " -> DeleteValueForTicket deprecated in favor of DeleteValueForObject at (". join(":",caller).")"); 
 
 
     my $ticket = RT::Ticket->new($self->CurrentUser);
@@ -615,7 +616,7 @@ sub ValidateType {
     my $type = shift;
 
     if ($type =~ s/(?:Single|Multiple)$//) {
-       $RT::Logger->warning( "Prefix 'Single' and 'Multiple' to Type deprecated, use MaxValues instead");
+       $RT::Logger->warning( "Prefix 'Single' and 'Multiple' to Type deprecated, use MaxValues instead at (". join(":",caller).")");
     }
 
     if( $FieldTypes{$type}) {
@@ -631,7 +632,7 @@ sub SetType {
     my $self = shift;
     my $type = shift;
     if ($type =~ s/(?:(Single)|Multiple)$//) {
-       warn "'Single' and 'Multiple' on SetType deprecated, use SetMaxValues instead";
+       $RT::Logger->warning("'Single' and 'Multiple' on SetType deprecated, use SetMaxValues instead at (". join(":",caller).")");
        $self->SetMaxValues($1 ? 1 : 0);
     }
     $self->SUPER::SetType($type);
@@ -738,19 +739,19 @@ Takes a boolean.
 # }}}
 
 sub Queue {
-    $RT::Logger->debug( ref($_[0]) . " -> Queue deprecated");
+    $RT::Logger->debug( ref($_[0]) . " -> Queue deprecated at (". join(":",caller).")");
     
     return 0;
 }
 
 sub SetQueue {
-    $RT::Logger->debug( ref($_[0]) . " -> SetQueue deprecated");
+    $RT::Logger->debug( ref($_[0]) . " -> SetQueue deprecated at (". join(":",caller).")");
 
     return 0;
 }
 
 sub QueueObj {
-    $RT::Logger->debug( ref($_[0]) . " -> QueueObj deprecated");
+    $RT::Logger->debug( ref($_[0]) . " -> QueueObj deprecated at (". join(":",caller).")");
 
     return undef;
 }
@@ -876,10 +877,10 @@ sub AddToObject {
     if ( $ObjectCF->Id ) {
         return ( 0, $self->loc("That is already the current value") );
     }
-    my ( $id, $msg ) =
+    my ( $oid, $msg ) =
       $ObjectCF->Create( ObjectId => $id, CustomField => $self->Id );
 
-    return ( $id, $msg );
+    return ( $oid, $msg );
 }
 
 
@@ -911,9 +912,10 @@ sub RemoveFromObject {
     unless ( $ObjectCF->Id ) {
         return ( 0, $self->loc("This custom field does not apply to that object") );
     }
-    my ( $id, $msg ) = $ObjectCF->Delete;
+    # XXX: Delete doesn't return anything
+    my ( $oid, $msg ) = $ObjectCF->Delete;
 
-    return ( $id, $msg );
+    return ( $oid, $msg );
 }
 
 # {{{ AddValueForObject