diff options
Diffstat (limited to 'rt/lib/RT/CustomFields.pm')
| -rw-r--r-- | rt/lib/RT/CustomFields.pm | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/rt/lib/RT/CustomFields.pm b/rt/lib/RT/CustomFields.pm index 5fdac15aa..ba3b01cfb 100644 --- a/rt/lib/RT/CustomFields.pm +++ b/rt/lib/RT/CustomFields.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -68,8 +68,6 @@ package RT::CustomFields; use strict; use warnings; -use DBIx::SearchBuilder::Unique; - use RT::CustomField; use base 'RT::SearchBuilder'; @@ -369,22 +367,20 @@ sub _OCFAlias { } -=head2 Next +=head2 AddRecord -Returns the next custom field that this user can see. +Overrides the collection to ensure that only custom fields the user can +see are returned; also propagates down the L</ContextObject>. =cut -sub Next { +sub AddRecord { my $self = shift; + my ($record) = @_; - my $CF = $self->SUPER::Next(); - return $CF unless $CF; - - $CF->SetContextObject( $self->ContextObject ); - - return $self->Next unless $CF->CurrentUserHasRight('SeeCustomField'); - return $CF; + $record->SetContextObject( $self->ContextObject ); + return unless $record->CurrentUserHasRight('SeeCustomField'); + return $self->SUPER::AddRecord( $record ); } =head2 NewItem |