X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FAttributes.pm;h=2a8869a046eb083e496731aa7fc80664e3c95301;hb=07bf36bccc4979b12db49b0f71524de4296f3717;hp=fcbd0b1b4bba129c8fc372873cfed41c6f505c1b;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;p=freeside.git

diff --git a/rt/lib/RT/Attributes.pm b/rt/lib/RT/Attributes.pm
index fcbd0b1b4..2a8869a04 100644
--- a/rt/lib/RT/Attributes.pm
+++ b/rt/lib/RT/Attributes.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -68,11 +68,10 @@ package RT::Attributes;
 use strict;
 use warnings;
 
+use base 'RT::SearchBuilder';
 
 use RT::Attribute;
 
-use base 'RT::SearchBuilder';
-
 sub Table { 'Attributes'}
 
 
@@ -140,23 +139,6 @@ sub Named {
     return (@attributes);   
 }
 
-=head2 WithId ID
-
-Returns the RT::Attribute objects with the id ID
-
-XXX TODO XXX THIS NEEDS A BETTER ACL CHECK
-
-=cut
-
-sub WithId {
-    my $self = shift;
-    my $id = shift;
-
-    my $attr = RT::Attribute->new($self->CurrentUser);
-    $attr->LoadByCols( id => $id );
-    return($attr);
-}
-
 =head2 DeleteEntry { Name =>   Content => , id => }
 
 Deletes attributes with
@@ -210,23 +192,14 @@ sub LimitToObject {
     unless (eval { $obj->id} ){
         return undef;
     }
-    $self->Limit(FIELD => 'ObjectType', OPERATOR=> '=', VALUE => ref($obj), ENTRYAGGREGATOR => 'OR');
-    $self->Limit(FIELD => 'ObjectId', OPERATOR=> '=', VALUE => $obj->id, ENTRYAGGREGATOR => 'OR', QUOTEVALUE => 0);
-
-}
-
-
 
-=head2 NewItem
+    my $type = $obj->isa("RT::CurrentUser") ? "RT::User" : ref($obj);
 
-Returns an empty new RT::Attribute item
-
-=cut
+    $self->Limit(FIELD => 'ObjectType', OPERATOR=> '=', VALUE => $type, ENTRYAGGREGATOR => 'OR');
+    $self->Limit(FIELD => 'ObjectId', OPERATOR=> '=', VALUE => $obj->id, ENTRYAGGREGATOR => 'OR', QUOTEVALUE => 0);
 
-sub NewItem {
-    my $self = shift;
-    return(RT::Attribute->new($self->CurrentUser));
 }
+
 RT::Base->_ImportOverlays();
 
 1;