[Rt-commit] r10635 - in rt/branches/3.999-DANGEROUS: html/Elements html/Ticket/Elements lib/RT lib/RT/Model lib/RT/ScripAction

ruz at bestpractical.com ruz at bestpractical.com
Thu Jan 31 20:33:48 EST 2008


Author: ruz
Date: Thu Jan 31 20:33:41 2008
New Revision: 10635

Modified:
   rt/branches/3.999-DANGEROUS/docs/design_docs/approval_template
   rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner
   rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowGroupMembers
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupCollection.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/UserCollection.pm
   rt/branches/3.999-DANGEROUS/lib/RT/SavedSearches.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm

Log:
* more lowercasing in User/Group models

Modified: rt/branches/3.999-DANGEROUS/docs/design_docs/approval_template
==============================================================================
--- rt/branches/3.999-DANGEROUS/docs/design_docs/approval_template	(original)
+++ rt/branches/3.999-DANGEROUS/docs/design_docs/approval_template	Thu Jan 31 20:33:41 2008
@@ -8,7 +8,7 @@
    my $groupid = $groups->first->id;
 
    my $adminccs = RT::Model::UserCollection->new(current_user => RT->system_user);
-   $adminccs->who_have_right(Right => 'AdminGroup', IncludeSystemRights => undef, IncludeSuperusers => 0, IncludeSubgroupMembers => 0, object => $groups->first);
+   $adminccs->who_have_right(Right => 'AdminGroup', include_system_rights => undef, include_superusers => 0, include_subgroup_members => 0, object => $groups->first);
 
     my @admins;
     while (my $admin = $adminccs->next) {

Modified: rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner	(original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner	Thu Jan 31 20:33:41 2008
@@ -86,7 +86,7 @@
 
 foreach my $object (@objects) {
 	my $Users = RT::Model::UserCollection->new();
-        $Users->who_have_right(right => 'OwnTicket', object => $object, IncludeSystemRights => 1, IncludeSuperusers => 0); 
+        $Users->who_have_right(right => 'OwnTicket', object => $object, include_system_rights => 1, include_superusers => 0); 
         while (my $User = $Users->next()) {
                 next if ($User->id == RT->nobody->id); # skip nobody here, so we can make them first later
 	      $user_uniq_hash{$User->id()} = $User;

Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowGroupMembers
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowGroupMembers	(original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowGroupMembers	Thu Jan 31 20:33:41 2008
@@ -47,11 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 %# Released under the terms of version 2 of the GNU Public License
 
-% my $Users = $Group->user_members_obj( Recursively => $Recursively );
+% my $Users = $Group->user_members_obj( recursively => $recursively );
 % while ( my $user = $Users->next ) {
 <& /Elements/ShowUser, User => $user, Ticket => $Ticket &><br />
 % }
-% my $Groups = $Group->group_members_obj( Recursively => $Recursively );
+% my $Groups = $Group->group_members_obj( recursively => $recursively );
 % $Groups->limit_to_user_defined_groups;
 % while (my $group = $Groups->next) {
 <&|/l&>Group</&>: <% $group->name %><br />
@@ -59,6 +59,6 @@
 
 <%ARGS>
 $Group       => undef
-$Recursively => 0,
+$recursively => 0,
 $Ticket      => undef
 </%ARGS>

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	Thu Jan 31 20:33:41 2008
@@ -756,11 +756,11 @@
 
 # {{{ GroupMembersObj
 
-=head2 GroupMembersObj [Recursively => 1]
+=head2 GroupMembersObj [recursively => 1]
 
 Returns an L<RT::Model::GroupCollection> object of this group's members.
 By default returns groups including all subgroups, but
-could be changed with C<Recursively> named argument.
+could be changed with C<recursively> named argument.
 
 B<Note> that groups are not filtered by type and result
 may contain as well system groups, personal and other.
@@ -769,11 +769,11 @@
 
 sub group_members_obj {
     my $self = shift;
-    my %args = ( Recursively => 1, @_ );
+    my %args = ( recursively => 1, @_ );
 
     my $groups = RT::Model::GroupCollection->new;
     my $members_table
-        = $args{'Recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
+        = $args{'recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
 
     my $members_alias = $groups->new_alias($members_table);
     $groups->join(
@@ -791,7 +791,7 @@
         alias  => $members_alias,
         column => 'disabled',
         value  => 0,
-    ) if $args{'Recursively'};
+    ) if $args{'recursively'};
 
     return $groups;
 }
@@ -804,19 +804,19 @@
 
 Returns an L<RT::Model::UserCollection> object of this group's members, by default
 returns users including all members of subgroups, but could be
-changed with C<Recursively> named argument.
+changed with C<recursively> named argument.
 
 =cut
 
 sub user_members_obj {
     my $self = shift;
-    my %args = ( Recursively => 1, @_ );
+    my %args = ( recursively => 1, @_ );
 
     #If we don't have rights, don't include any results
     # TODO XXX  WHY IS THERE NO ACL CHECK HERE?
 
     my $members_table
-        = $args{'Recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
+        = $args{'recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
 
     my $users         = RT::Model::UserCollection->new;
     my $members_alias = $users->new_alias($members_table);
@@ -835,7 +835,7 @@
         alias  => $members_alias,
         column => 'disabled',
         value  => 0,
-    ) if $args{'Recursively'};
+    ) if $args{'recursively'};
 
     return ($users);
 }

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupCollection.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupCollection.pm	Thu Jan 31 20:33:41 2008
@@ -260,7 +260,7 @@
 
 # }}}
 
-=head2 WithMember {principal_id => PRINCIPAL_ID, Recursively => undef}
+=head2 WithMember {principal_id => PRINCIPAL_ID, recursively => undef}
 
 Limits the set of groups returned to groups which have
 Principal PRINCIPAL_ID as a member
@@ -271,12 +271,12 @@
     my $self = shift;
     my %args = (
         principal_id => undef,
-        Recursively  => undef,
+        recursively  => undef,
         @_
     );
     my $members;
 
-    if ( $args{'Recursively'} ) {
+    if ( $args{'recursively'} ) {
         $members = $self->new_alias('CachedGroupMembers');
     } else {
         $members = $self->new_alias('GroupMembers');
@@ -300,12 +300,12 @@
     my $self = shift;
     my %args = (
         principal_id => undef,
-        Recursively  => undef,
+        recursively  => undef,
         @_
     );
 
     my $members
-        = $args{'Recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
+        = $args{'recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
     my $members_alias = $self->join(
         type    => 'LEFT',
         column1 => 'id',
@@ -328,7 +328,7 @@
     );
 }
 
-=head2 Withright { right => RIGHTNAME, object => RT::Record, IncludeSystemRights => 1, IncludeSuperusers => 0, equiv_objects => [ ] }
+=head2 Withright { right => RIGHTNAME, object => RT::Record, include_system_rights => 1, include_superusers => 0, equiv_objects => [ ] }
 
 
 Find all groups which have RIGHTNAME for RT::Record. Optionally include global rights and superusers. By default, include the global rights, but not the superusers.
@@ -343,9 +343,9 @@
     my %args = (
         right                  => undef,
         object                 => => undef,
-        IncludeSystemRights    => 1,
-        IncludeSuperusers      => undef,
-        IncludeSubgroupMembers => 0,
+        include_system_rights    => 1,
+        include_superusers      => undef,
+        include_subgroup_members => 0,
         equiv_objects          => [],
         @_
     );
@@ -372,14 +372,14 @@
 sub _join_groups {
     my $self = shift;
     my %args = (@_);
-    return 'main' unless $args{'IncludeSubgroupMembers'};
+    return 'main' unless $args{'include_subgroup_members'};
     return $self->RT::Model::UserCollection::_join_groups(%args);
 }
 
 sub _join_group_members {
     my $self = shift;
     my %args = (@_);
-    return 'main' unless $args{'IncludeSubgroupMembers'};
+    return 'main' unless $args{'include_subgroup_members'};
     return $self->RT::Model::UserCollection::_join_group_members(%args);
 }
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm	Thu Jan 31 20:33:41 2008
@@ -878,19 +878,19 @@
 sub has_group_right {
     my $self = shift;
     my %args = (
-        GroupObj => undef,
-        Group    => undef,
+        group_obj => undef,
+        group    => undef,
         right    => undef,
         @_
     );
 
-    if ( defined $args{'Group'} ) {
-        $args{'GroupObj'} = RT::Model::Group->new;
-        $args{'GroupObj'}->load( $args{'Group'} );
+    if ( defined $args{'group'} ) {
+        $args{'group_obj'} = RT::Model::Group->new;
+        $args{'group_obj'}->load( $args{'group'} );
     }
 
     # {{{ Validate and load up the group_id
-    unless ( ( defined $args{'GroupObj'} ) and ( $args{'GroupObj'}->id ) ) {
+    unless ( ( defined $args{'group_obj'} ) and ( $args{'group_obj'}->id ) ) {
         return undef;
     }
 
@@ -898,7 +898,7 @@
 
     # Figure out whether a user has the right we're asking about.
     my $retval = $self->has_right(
-        object => $args{'GroupObj'},
+        object => $args{'group_obj'},
         right  => $args{'right'},
     );
 
@@ -923,7 +923,7 @@
     $groups->limit_to_user_defined_groups;
     $groups->with_member(
         principal_id => $self->id,
-        Recursively  => 1
+        recursively  => 1
     );
     return $groups;
 }
@@ -1233,7 +1233,7 @@
     # inconsistent with the allowed delegation objects.
     my $acl_to_del
         = RT::Model::ACECollection->new( current_user => RT->system_user );
-    $acl_to_del->delegated_by( Id => $self->id );
+    $acl_to_del->delegated_by( id => $self->id );
     foreach (@allowed_deleg_objects) {
         $acl_to_del->limitnot_object($_);
     }

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/UserCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/UserCollection.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/UserCollection.pm	Thu Jan 31 20:33:41 2008
@@ -233,7 +233,7 @@
 
 # {{{ who_have_right
 
-=head2 who_have_right { right => 'name', object => $rt_object , IncludeSuperusers => undef, IncludeSubgroupMembers => undef, IncludeSystemRights => undef, equiv_objects => [ ] }
+=head2 who_have_right { right => 'name', object => $rt_object , include_superusers => undef, include_subgroup_members => undef, include_system_rights => undef, equiv_objects => [ ] }
 
 
 find all users who the right right for this group, either individually
@@ -247,7 +247,7 @@
 sub _join_group_members {
     my $self = shift;
     my %args = (
-        IncludeSubgroupMembers => 1,
+        include_subgroup_members => 1,
         @_
     );
 
@@ -258,7 +258,7 @@
     # all members of groups recursively. if we don't we'll find only 'direct'
     # members of the group in question
     my $group_members;
-    if ( $args{'IncludeSubgroupMembers'} ) {
+    if ( $args{'include_subgroup_members'} ) {
         $group_members = $self->new_alias('CachedGroupMembers');
     } else {
         $group_members = $self->new_alias('GroupMembers');
@@ -296,7 +296,7 @@
     my $self = shift;
     my %args = (
         right             => undef,
-        IncludeSuperusers => undef,
+        include_superusers => undef,
         @_,
     );
 
@@ -308,7 +308,7 @@
         value => $args{right} || 'NULL',
         entry_aggregator => 'OR'
     );
-    if ( $args{'IncludeSuperusers'} and $args{'right'} ) {
+    if ( $args{'include_superusers'} and $args{'right'} ) {
         $self->limit(
             alias            => $acl,
             column           => 'right_name',
@@ -325,7 +325,7 @@
     my $self = shift;
     my %args = (
         object              => undef,
-        IncludeSystemRights => undef,
+        include_system_rights => undef,
         equiv_objects       => [],
         @_
     );
@@ -346,7 +346,7 @@
         }
     }
 
-    if ( $args{'IncludeSystemRights'} ) {
+    if ( $args{'include_system_rights'} ) {
         push @objects, 'RT::System';
     }
     push @objects, @{ $args{'equiv_objects'} };
@@ -359,9 +359,9 @@
     my %args = (
         right                  => undef,
         object                 => undef,
-        IncludeSystemRights    => undef,
-        IncludeSuperusers      => undef,
-        IncludeSubgroupMembers => 1,
+        include_system_rights    => undef,
+        include_superusers      => undef,
+        include_subgroup_members => 1,
         equiv_objects          => [],
         @_
     );
@@ -398,9 +398,9 @@
     my %args = (
         right                  => undef,
         object                 => undef,
-        IncludeSystemRights    => undef,
-        IncludeSuperusers      => undef,
-        IncludeSubgroupMembers => 1,
+        include_system_rights    => undef,
+        include_superusers      => undef,
+        include_subgroup_members => 1,
         equiv_objects          => [],
         @_
     );
@@ -436,7 +436,7 @@
         $check_roles .= join ' OR ', @role_clauses;
         $check_objects = join ' OR ', @object_clauses;
     } else {
-        if ( !$args{'IncludeSystemRights'} ) {
+        if ( !$args{'include_system_rights'} ) {
             $check_objects = "($acl.object_type != 'RT::System')";
         }
     }
@@ -480,9 +480,9 @@
     my %args = (
         right                  => undef,
         object                 => undef,
-        IncludeSystemRights    => undef,
-        IncludeSuperusers      => undef,
-        IncludeSubgroupMembers => 1,
+        include_system_rights    => undef,
+        include_superusers      => undef,
+        include_subgroup_members => 1,
         equiv_objects          => [],
         @_
     );
@@ -509,13 +509,13 @@
 
         $check_objects = join ' OR ', @object_clauses;
     } else {
-        if ( !$args{'IncludeSystemRights'} ) {
+        if ( !$args{'include_system_rights'} ) {
             $check_objects = "($acl.object_type != 'RT::System')";
         }
     }
     $self->_add_subclause( "Whichobject", "($check_objects)" );
 
-    $self->_join_group_members_for_group_rights( %args, ACLAlias => $acl );
+    $self->_join_group_members_for_group_rights( %args, aclalias => $acl );
 
     # Find only members of groups that have the right.
     $self->limit(
@@ -536,7 +536,7 @@
 
 # {{{ who_belong_to_groups
 
-=head2 who_belong_to_groups { Groups => ARRAYREF, IncludeSubgroupMembers => 1 }
+=head2 who_belong_to_groups { Groups => ARRAYREF, include_subgroup_members => 1 }
 
 =cut
 
@@ -544,8 +544,8 @@
 sub who_belong_to_groups {
     my $self = shift;
     my %args = (
-        Groups                 => undef,
-        IncludeSubgroupMembers => 1,
+        groups                 => undef,
+        include_subgroup_members => 1,
         @_
     );
 
@@ -555,7 +555,7 @@
 
     my $group_members = $self->_join_group_members(%args);
 
-    foreach my $groupid ( @{ $args{'Groups'} } ) {
+    foreach my $groupid ( @{ $args{'groups'} } ) {
         $self->limit(
             alias            => $group_members,
             column           => 'group_id',

Modified: rt/branches/3.999-DANGEROUS/lib/RT/SavedSearches.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/SavedSearches.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/SavedSearches.pm	Thu Jan 31 20:33:41 2008
@@ -171,7 +171,7 @@
     $groups->limit_to_user_defined_groups;
     $groups->with_member(
         principal_id => $self->current_user->id,
-        Recursively  => 1
+        recursively  => 1
     );
 
     return ( $CurrentUser->user_object, @{ $groups->items_array_ref() } );

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm	Thu Jan 31 20:33:41 2008
@@ -141,9 +141,9 @@
     $adminccs->who_have_right(
 	right => "AdminGroup",
 	object =>$groups->first,
-	IncludeSystemRights => undef,
-	IncludeSuperusers => 0,
-	IncludeSubgroupMembers => 0,
+	include_system_rights => undef,
+	include_superusers => 0,
+	include_subgroup_members => 0,
     );
  
      my @admins;


More information about the Rt-commit mailing list