[Rt-commit] r18915 - in rt/3.999/trunk: lib/RT lib/RT/Model share/html/User/Elements
ruz at bestpractical.com
ruz at bestpractical.com
Mon Mar 23 09:54:11 EDT 2009
Author: ruz
Date: Mon Mar 23 09:54:10 2009
New Revision: 18915
Removed:
rt/3.999/trunk/share/html/User/Groups/
Modified:
rt/3.999/trunk/lib/RT/Model/Group.pm
rt/3.999/trunk/lib/RT/Model/GroupCollection.pm
rt/3.999/trunk/lib/RT/System.pm
rt/3.999/trunk/share/html/User/Elements/Tabs
Log:
* drop support for personal groups
Modified: rt/3.999/trunk/lib/RT/Model/Group.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/Group.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/Group.pm Mon Mar 23 09:54:10 2009
@@ -141,10 +141,6 @@
return _( "user %1", $user->object->name );
} elsif ( $self->domain eq 'UserDefined' ) {
return _( "group '%1'", $self->name );
- } elsif ( $self->domain eq 'Personal' ) {
- my $user = RT::Model::User->new( current_user => $self->current_user );
- $user->load( $self->instance );
- return _( "personal group '%1' for user '%2'", $self->name, $user->name );
} elsif ( $self->domain eq 'RT::System-Role' ) {
return _( "system %1", $self->type );
} elsif ( $self->domain eq 'RT::Model::Queue-Role' ) {
@@ -235,31 +231,6 @@
);
}
-
-
-=head2 load_personal {name => name, User => USERID}
-
-Loads a personal group from the database.
-
-=cut
-
-sub load_personal {
- my $self = shift;
- my %args = (
- name => undef,
- user => undef,
- @_
- );
-
- $self->load_by_cols(
- "domain" => 'Personal',
- "instance" => $args{'user'},
- "type" => '',
- "name" => $args{'name'}
- );
-}
-
-
=head2 load_system_internal name
Loads a Pseudo group from the database. The only argument is
@@ -478,52 +449,6 @@
return ($id);
}
-
-
-=head2 create_personal { principal_id => PRINCIPAL_ID, name => "name", description => "description"}
-
-A helper subroutine which creates a personal group.
-
-Returns a tuple of (Id, Message). If id is 0, the create failed
-
-=cut
-
-sub create_personal {
- my $self = shift;
- my %args = (
- name => undef,
- description => undef,
- principal_id => $self->current_user->id,
- @_
- );
- if ( $self->current_user->id == $args{'principal_id'} ) {
-
- unless ( $self->current_user_has_right('AdminOwnPersonalGroups') ) {
- Jifty->log->warn( $self->current_user->name . " Tried to create a group without permission." );
- return ( 0, _('Permission Denied') );
- }
-
- } else {
- unless ( $self->current_user_has_right('AdminAllPersonalGroups') ) {
- Jifty->log->warn( $self->current_user->name . " Tried to create a group without permission." );
- return ( 0, _('Permission Denied') );
- }
-
- }
-
- return (
- $self->_create(
- domain => 'Personal',
- type => '',
- instance => $args{'principal_id'},
- name => $args{'name'},
- description => $args{'description'}
- )
- );
-}
-
-
-
=head2 create_role { object => OBJ, domain => DOMAIN, type => TYPE, instance => ID }
A helper subroutine which creates a role group. Takes the following arguments:
@@ -624,21 +549,11 @@
sub set_disabled {
my $self = shift;
my $val = shift;
- if ( $self->domain eq 'Personal' ) {
- if ( $self->current_user->id == $self->instance ) {
- unless ( $self->current_user_has_right('AdminOwnPersonalGroups') ) {
- return ( 0, _('Permission Denied') );
- }
- } else {
- unless ( $self->current_user_has_right('AdminAllPersonalGroups') ) {
- return ( 0, _('Permission Denied') );
- }
- }
- } else {
- unless ( $self->current_user_has_right('AdminGroup') ) {
- return ( 0, _('Permission Denied') );
- }
+
+ unless ( $self->current_user_has_right('AdminGroup') ) {
+ return ( 0, _('Permission Denied') );
}
+
Jifty->handle->begin_transaction();
$self->principal->set_disabled($val);
@@ -714,7 +629,7 @@
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.
+may contain as well system groups and other.
=cut
@@ -832,32 +747,17 @@
my $self = shift;
my $new_member = shift;
- if ( $self->domain eq 'Personal' ) {
- if ( $self->current_user->id == $self->instance ) {
- unless ( $self->current_user_has_right('AdminOwnPersonalGroups') ) {
- return ( 0, _('Permission Denied') );
- }
- } else {
- unless ( $self->current_user_has_right('AdminAllPersonalGroups') ) {
- return ( 0, _('Permission Denied') );
- }
- }
- }
-
- else {
-
- # We should only allow membership changes if the user has the right
- # to modify group membership or the user is the principal in question
- # and the user has the right to modify his own membership
- unless ( ( $new_member == $self->current_user->user_object->id && $self->current_user_has_right('ModifyOwnMembership') )
- || $self->current_user_has_right('AdminGroupMembership') )
- {
-
- #User has no permission to be doing this
- return ( 0, _("Permission Denied") );
- }
+ # We should only allow membership changes if the user has the right
+ # to modify group membership or the user is the principal in question
+ # and the user has the right to modify his own membership
+ unless ( ( $new_member == $self->current_user->user_object->id && $self->current_user_has_right('ModifyOwnMembership') )
+ || $self->current_user_has_right('AdminGroupMembership') )
+ {
+ #User has no permission to be doing this
+ return ( 0, _("Permission Denied") );
}
+
$self->_add_member( principal_id => $new_member );
}
@@ -996,25 +896,12 @@
# We should only allow membership changes if the user has the right
# to modify group membership or the user is the principal in question
# and the user has the right to modify his own membership
+ unless ( ( $member_id == $self->current_user->id && $self->current_user_has_right('ModifyOwnMembership') )
+ || $self->current_user_has_right('AdminGroupMembership') )
+ {
- if ( $self->domain eq 'Personal' ) {
- if ( $self->current_user->id == $self->instance ) {
- unless ( $self->current_user_has_right('AdminOwnPersonalGroups') ) {
- return ( 0, _('Permission Denied') );
- }
- } else {
- unless ( $self->current_user_has_right('AdminAllPersonalGroups') ) {
- return ( 0, _('Permission Denied') );
- }
- }
- } else {
- unless ( ( ( $member_id == $self->current_user->id ) && $self->current_user_has_right('ModifyOwnMembership') )
- || $self->current_user_has_right('AdminGroupMembership') )
- {
-
- #User has no permission to be doing this
- return ( 0, _("Permission Denied") );
- }
+ #User has no permission to be doing this
+ return ( 0, _("Permission Denied") );
}
$self->_delete_member($member_id);
}
@@ -1067,20 +954,8 @@
@_
);
- if ( $self->domain eq 'Personal' ) {
- if ( $self->current_user->id == $self->instance ) {
- unless ( $self->current_user_has_right('AdminOwnPersonalGroups') ) {
- return ( 0, _('Permission Denied') );
- }
- } else {
- unless ( $self->current_user_has_right('AdminAllPersonalGroups') ) {
- return ( 0, _('Permission Denied') );
- }
- }
- } else {
- unless ( $self->current_user_has_right('AdminGroup') ) {
- return ( 0, _('Permission Denied') );
- }
+ unless ( $self->current_user_has_right('AdminGroup') ) {
+ return ( 0, _('Permission Denied') );
}
my $Old = $self->SUPER::_value( $args{'column'} );
Modified: rt/3.999/trunk/lib/RT/Model/GroupCollection.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/GroupCollection.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/GroupCollection.pm Mon Mar 23 09:54:10 2009
@@ -164,28 +164,6 @@
}
-
-=head2 limit_to_personal_groups_for PRINCIPAL_ID
-
-Return only Personal Groups for the user whose principal id
-is PRINCIPAL_ID
-
-=cut
-
-sub limit_to_personal_groups_for {
- my $self = shift;
- my $princ = shift;
-
- $self->limit( column => 'domain', operator => '=', value => 'Personal' );
- $self->limit(
- column => 'instance',
- operator => '=',
- value => $princ
- );
-}
-
-
-
=head2 limit_to_roles_for_queue QUEUE_ID
Limits the set of groups found to role groups for queue QUEUE_ID
Modified: rt/3.999/trunk/lib/RT/System.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/System.pm (original)
+++ rt/3.999/trunk/lib/RT/System.pm Mon Mar 23 09:54:10 2009
@@ -76,8 +76,6 @@
# XXX TODO Can't localize these outside of having an object around.
our $RIGHTS = {
SuperUser => 'Do anything and everything', # loc_pair
- AdminAllPersonalGroups => "Create, delete and modify the members of any user's personal groups", # loc_pair
- AdminOwnPersonalGroups => 'Create, delete and modify the members of personal groups', # loc_pair
AdminUsers => 'Create, delete and modify users', # loc_pair
ModifySelf => "Modify one's own RT account", # loc_pair
ShowConfigTab => "show Configuration tab", # loc_pair
Modified: rt/3.999/trunk/share/html/User/Elements/Tabs
==============================================================================
--- rt/3.999/trunk/share/html/User/Elements/Tabs (original)
+++ rt/3.999/trunk/share/html/User/Elements/Tabs Mon Mar 23 09:54:10 2009
@@ -61,9 +61,6 @@
b => { title => _('About me'),
path => 'User/Prefs.html',
},
- g => { title => _('Personal Groups'),
- path => 'User/Groups/',
- },
f => { title => _('Search options'),
path => 'Prefs/SearchOptions.html',
},
More information about the Rt-commit
mailing list