diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 21:11:29 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 21:11:29 -0700 |
| commit | 3d0a1bb06b895c5be6e3f0517d355442a6b1e125 (patch) | |
| tree | 84069ebc3254825b952a482e11cdbbbc69f6fe85 /rt/lib/RT/Class.pm | |
| parent | f3b99c11d6eed33f467dda360180a698a85c54e8 (diff) | |
| parent | d62206a94d9d49ef96640e0a8ec492679f8345e9 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/lib/RT/Class.pm')
| -rw-r--r-- | rt/lib/RT/Class.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rt/lib/RT/Class.pm b/rt/lib/RT/Class.pm index 3906b9fed..dfe8eb386 100644 --- a/rt/lib/RT/Class.pm +++ b/rt/lib/RT/Class.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -94,7 +94,7 @@ $RIGHTS = { AdminClass => 'Modify metadata and custom fields for this class', #loc_pair AdminTopics => 'Modify topic hierarchy associated with this class', #loc_pair ShowACL => 'Display Access Control List', #loc_pair - ModifyACL => 'Modify Access Control List', #loc_pair + ModifyACL => 'Create, modify and delete Access Control List entries', #loc_pair DeleteArticle => 'Delete articles in this class', #loc_pair }; @@ -218,7 +218,7 @@ sub ValidateName { return undef unless ($newval); my $obj = RT::Class->new($RT::SystemUser); $obj->Load($newval); - return undef if ( $obj->Id ); + return undef if $obj->id && ( !$self->id || $self->id != $obj->id ); return $self->SUPER::ValidateName($newval); } |