[Rt-commit] rt branch, admin_ui, updated. 53e5e71ba5eb8c3d92b6ceee9ffd1e9992316268
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Thu Dec 3 01:55:18 EST 2009
The branch, admin_ui has been updated
via 53e5e71ba5eb8c3d92b6ceee9ffd1e9992316268 (commit)
from eda0d968226f8cd661eed8e24be95cddbb0597d7 (commit)
Summary of changes:
lib/RT/Action/EditGroupRights.pm | 11 +++--------
lib/RT/Action/EditRights.pm | 11 ++++-------
lib/RT/Action/EditUserRights.pm | 6 ++----
lib/RT/Action/EditWatchers.pm | 11 +++--------
lib/RT/View/Admin/Queues.pm | 3 +--
5 files changed, 13 insertions(+), 29 deletions(-)
- Log -----------------------------------------------------------------
commit 53e5e71ba5eb8c3d92b6ceee9ffd1e9992316268
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Dec 3 14:55:10 2009 +0800
get rid of ->new(current_user => Jifty->web->current_user) for new added code
diff --git a/lib/RT/Action/EditGroupRights.pm b/lib/RT/Action/EditGroupRights.pm
index 2393f96..44a5e68 100644
--- a/lib/RT/Action/EditGroupRights.pm
+++ b/lib/RT/Action/EditGroupRights.pm
@@ -14,9 +14,7 @@ sub arguments {
my @groups;
{
- my $groups =
- RT::Model::GroupCollection->new(
- current_user => Jifty->web->current_user );
+ my $groups = RT::Model::GroupCollection->new;
$groups->limit_to_system_internal_groups();
while ( my $group = $groups->next ) {
push @groups, $group;
@@ -24,9 +22,7 @@ sub arguments {
}
{
- my $groups =
- RT::Model::GroupCollection->new(
- current_user => Jifty->web->current_user );
+ my $groups = RT::Model::GroupCollection->new;
$groups->limit_to_user_defined_groups();
while ( my $group = $groups->next ) {
push @groups, $group;
@@ -35,8 +31,7 @@ sub arguments {
{
my $groups =
- RT::Model::GroupCollection->new(
- current_user => Jifty->web->current_user );
+ RT::Model::GroupCollection->new;
$groups->limit_to_roles( object => $self->object );
while ( my $group = $groups->next ) {
push @groups, $group;
diff --git a/lib/RT/Action/EditRights.pm b/lib/RT/Action/EditRights.pm
index 111c8d1..62c65d3 100644
--- a/lib/RT/Action/EditRights.pm
+++ b/lib/RT/Action/EditRights.pm
@@ -38,8 +38,7 @@ sub take_action {
$self->object( RT->system );
}
elsif ( $RT::Model::ACE::OBJECT_TYPES{$object_type} ) {
- my $object =
- $object_type->new( current_user => Jifty->web->current_user );
+ my $object = $object_type->new;
my $object_id = $self->argument_value('object_id');
$object->load($object_id);
unless ( $object->id ) {
@@ -71,8 +70,7 @@ sub take_action {
@rights = grep $_, @rights;
- my $principal =
- RT::Model::Principal->new( current_user => Jifty->web->current_user );
+ my $principal = RT::Model::Principal->new;
$principal->load($principal_id);
my $current_rights = $self->default_value($principal_id);
@@ -121,9 +119,8 @@ sub default_value {
my $principal_id = shift;
my $object = $self->object;
- my $acl_obj =
- RT::Model::ACECollection->new( current_user => Jifty->web->current_user );
- my $ACE = RT::Model::ACE->new( current_user => Jifty->web->current_user );
+ my $acl_obj = RT::Model::ACECollection->new;
+ my $ACE = RT::Model::ACE->new;
$acl_obj->limit_to_object($object);
$acl_obj->limit_to_principal( id => $principal_id );
$acl_obj->order_by( column => 'right_name' );
diff --git a/lib/RT/Action/EditUserRights.pm b/lib/RT/Action/EditUserRights.pm
index 701ef67..42bb110 100644
--- a/lib/RT/Action/EditUserRights.pm
+++ b/lib/RT/Action/EditUserRights.pm
@@ -12,14 +12,12 @@ sub arguments {
return {} unless $self->object;
my $args = $self->SUPER::arguments( @_ );
- my $privileged =
- RT::Model::Group->new( current_user => Jifty->web->current_user );
+ my $privileged = RT::Model::Group->new;
$privileged->load_system_internal('privileged');
my $users = $privileged->members;
while ( my $user = $users->next ) {
- my $group =
- RT::Model::Group->new( current_user => Jifty->web->current_user );
+ my $group = RT::Model::Group->new;
$group->load_acl_equivalence( $user->member );
my $name = 'rights_' . $group->principal_id;
diff --git a/lib/RT/Action/EditWatchers.pm b/lib/RT/Action/EditWatchers.pm
index e4d3fd6..7dcc4bc 100644
--- a/lib/RT/Action/EditWatchers.pm
+++ b/lib/RT/Action/EditWatchers.pm
@@ -52,8 +52,7 @@ sub take_action {
$self->object( RT->system );
}
elsif ( $RT::Model::ACE::OBJECT_TYPES{$object_type} ) {
- my $object =
- $object_type->new( current_user => Jifty->web->current_user );
+ my $object = $object_type->new;
my $object_id = $self->argument_value('object_id');
$object->load($object_id);
unless ( $object->id ) {
@@ -129,9 +128,7 @@ sub available_values {
my $self = shift;
my $sub_type = shift;
if ( $sub_type eq 'users' ) {
- my $users =
- RT::Model::UserCollection->new(
- current_user => Jifty->web->current_user );
+ my $users = RT::Model::UserCollection->new;
#XXX do we need to limit to only privileged people?
$users->limit_to_privileged;
@@ -147,9 +144,7 @@ sub available_values {
return \@users;
}
else {
- my $groups =
- RT::Model::GroupCollection->new(
- current_user => Jifty->web->current_user );
+ my $groups = RT::Model::GroupCollection;
$groups->limit_to_user_defined_groups;
$groups->order_by( { column => 'name', order => 'ASC' } );
my @groups;
diff --git a/lib/RT/View/Admin/Queues.pm b/lib/RT/View/Admin/Queues.pm
index 036eea5..c486a24 100644
--- a/lib/RT/View/Admin/Queues.pm
+++ b/lib/RT/View/Admin/Queues.pm
@@ -174,8 +174,7 @@ sub queue {
return;
}
- my $queue = RT::Model::Queue->new( current_user =>
- Jifty->web->current_user );
+ my $queue = RT::Model::Queue->new;
my ( $ret, $msg ) = $queue->load( $id );
unless ( $ret ) {
Jifty->log->fatal( "failed to load queue $id: $msg" );
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list