[Rt-commit] [svn] r708 - rt/branches/rt-3.3/lib/RT

[leira at pallas.eruditorum.org]

Author: leira
Date: Tue Apr 20 22:15:39 2004
New Revision: 708

Modified:
   rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
Log:
CFs are no longer attached to queues.


Modified: rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm	Tue Apr 20 22:15:39 2004
@@ -330,7 +330,7 @@
     my $self = shift;
 
     my $cf_values = RT::CustomFieldValues->new($self->CurrentUser);
-    if ( $self->__Value('Queue') == 0 || $self->CurrentUserHasRight( 'SeeQueue') ) {
+    if ( $self->CurrentUserHasRight( 'SeeCustomField') ) {
         $cf_values->LimitToCustomField($self->Id);
     }
     return ($cf_values);
@@ -651,16 +651,10 @@
     my $self  = shift;
     my $field = shift;
 
-    # We need to expose the queue so that we can do things like ACL checks
-    if ( $field eq 'Queue') {
-          return ( $self->SUPER::_Value($field) );
-     }
-
-
-    #Anybody can see global custom fields, otherwise we need to do the rights check
-        unless ( $self->__Value('Queue') == 0 || $self->CurrentUserHasRight( 'SeeQueue') ) {
-            return (undef);
-        }
+    # we need to do the rights check
+    unless ( $self->CurrentUserHasRight( 'SeeCustomField') ) {
+	return (undef);
+    }
     return ( $self->__Value($field) );
 
 }