[Rt-commit] [svn] r1852 - in rt/branches/PLATANO-EXPERIMENTAL-CSS: . lib/RT

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Thu Nov 11 03:44:01 2004
New Revision: 1852

Modified:
   rt/branches/PLATANO-EXPERIMENTAL-CSS/   (props changed)
   rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/CustomField_Overlay.pm
Log:
 r9114 at tinbook:  jesse | 2004-11-11T03:02:17.607069Z
  r6196 at tinbook:  jesse | 2004-11-07T03:37:32.303504Z
  Squash warnings when trying to check acls on nonexisten custom fields
  
 


Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/CustomField_Overlay.pm
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/CustomField_Overlay.pm	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/CustomField_Overlay.pm	Thu Nov 11 03:44:01 2004
@@ -348,21 +348,18 @@
 
 =cut
 
+*ValuesObj = \&Values;
+
 sub Values {
     my $self = shift;
 
     my $cf_values = RT::CustomFieldValues->new($self->CurrentUser);
-    if ( $self->CurrentUserHasRight( 'SeeCustomField') ) {
+    if ($self->id && $self->CurrentUserHasRight( 'SeeCustomField') ) {
         $cf_values->LimitToCustomField($self->Id);
     }
     return ($cf_values);
 }
 
-sub ValuesObj {
-    my $self = shift;
-    return $self->Values(@_);
-}
-
 # }}}
 
 # }}}
@@ -674,8 +671,8 @@
     my $field = shift;
 
     # we need to do the rights check
-    unless ( $self->CurrentUserHasRight( 'SeeCustomField') ) {
-	return (undef);
+    unless ( $self->id && $self->CurrentUserHasRight( 'SeeCustomField') ) {
+	    return (undef);
     }
     return ( $self->__Value($field) );