[Rt-commit] r10303 - in rt/branches/3.999-DANGEROUS: . etc html
html/Admin/Queues html/Elements html/Elements/GnuPG
html/Elements/RT__Model__Queue html/REST/1.0/Forms/queue
html/Search/Elements html/User lib/RT lib/RT/Interface
lib/RT/Model lib/RT/ScripAction lib/t t/mail t/web
jesse at bestpractical.com
jesse at bestpractical.com
Sun Jan 13 15:33:36 EST 2008
Author: jesse
Date: Sun Jan 13 15:33:36 2008
New Revision: 10303
Removed:
rt/branches/3.999-DANGEROUS/html/dhandler
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
rt/branches/3.999-DANGEROUS/etc/initialdata
rt/branches/3.999-DANGEROUS/etc/schema.Informix
rt/branches/3.999-DANGEROUS/etc/schema.Oracle
rt/branches/3.999-DANGEROUS/etc/schema.Pg
rt/branches/3.999-DANGEROUS/etc/schema.SQLite
rt/branches/3.999-DANGEROUS/etc/schema.Sybase
rt/branches/3.999-DANGEROUS/etc/schema.mysql
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html
rt/branches/3.999-DANGEROUS/html/Elements/GnuPG/SignEncryptWidget
rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Queue/ColumnMap
rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default
rt/branches/3.999-DANGEROUS/html/Search/Elements/PickBasics
rt/branches/3.999-DANGEROUS/html/User/Prefs.html
rt/branches/3.999-DANGEROUS/lib/RT/EmailParser.pm
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/UserCollection.pm
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
rt/branches/3.999-DANGEROUS/lib/RT/Test.pm
rt/branches/3.999-DANGEROUS/lib/t/setup_regression.t
rt/branches/3.999-DANGEROUS/share/po/cs.po
rt/branches/3.999-DANGEROUS/share/po/da.po
rt/branches/3.999-DANGEROUS/share/po/de.po
rt/branches/3.999-DANGEROUS/share/po/es.po
rt/branches/3.999-DANGEROUS/share/po/fi.po
rt/branches/3.999-DANGEROUS/share/po/fr.po
rt/branches/3.999-DANGEROUS/share/po/he.po
rt/branches/3.999-DANGEROUS/share/po/hu.po
rt/branches/3.999-DANGEROUS/share/po/id.po
rt/branches/3.999-DANGEROUS/share/po/it.po
rt/branches/3.999-DANGEROUS/share/po/ja.po
rt/branches/3.999-DANGEROUS/share/po/nl.po
rt/branches/3.999-DANGEROUS/share/po/no.po
rt/branches/3.999-DANGEROUS/share/po/pl.po
rt/branches/3.999-DANGEROUS/share/po/pt_br.po
rt/branches/3.999-DANGEROUS/share/po/ru.po
rt/branches/3.999-DANGEROUS/share/po/sv.po
rt/branches/3.999-DANGEROUS/share/po/tr.po
rt/branches/3.999-DANGEROUS/share/po/zh_cn.po
rt/branches/3.999-DANGEROUS/share/po/zh_tw.po
rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t
rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t
rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t
rt/branches/3.999-DANGEROUS/t/web/gnupg-outgoing.t
rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-create.t
rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-update.t
rt/branches/3.999-DANGEROUS/t/web/query_builder.t
rt/branches/3.999-DANGEROUS/t/web/rights1.t
Log:
r74977 at pinglin: jesse | 2008-01-12 23:42:35 -0600
only failing i18n and one gnupg test.
Modified: rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/RT_Config.pm (original)
+++ rt/branches/3.999-DANGEROUS/etc/RT_Config.pm Sun Jan 13 15:33:36 2008
@@ -240,14 +240,14 @@
# RT is designed such that any mail which already has a ticket-id associated
# with it will get to the right place automatically.
-# $correspond_address and $commentAddress are the default addresses
+# $correspond_address and $comment_address are the default addresses
# that will be listed in From: and Reply-To: headers of correspondence
# and comment mail tracked by RT, unless overridden by a queue-specific
# address.
set($correspond_address , 'RT_correspond_addressNotset');
-set($commentAddress , 'RT_commentAddressNotset');
+set($comment_address , 'RT_comment_addressNotset');
# By default, RT sets the outgoing mail's "From:" header to
# "Sendername via RT". setting this option to 0 disables it.
Modified: rt/branches/3.999-DANGEROUS/etc/initialdata
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/initialdata (original)
+++ rt/branches/3.999-DANGEROUS/etc/initialdata Sun Jan 13 15:33:36 2008
@@ -63,7 +63,7 @@
@Queues = ({ name => 'General',
Description => 'The default queue',
correspond_address => "",
- commentAddress => "", },
+ comment_address => "", },
{ name => '___Approvals',
Description => 'A system-internal queue for the approvals system',
disabled => 2, } );
Modified: rt/branches/3.999-DANGEROUS/etc/schema.Informix
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Informix (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Informix Sun Jan 13 15:33:36 2008
@@ -28,7 +28,7 @@
name VARCHAR(200) DEFAULT '' NOT NULL,
Description VARCHAR(255) DEFAULT NULL,
correspond_address VARCHAR(120) DEFAULT NULL,
- commentAddress VARCHAR(120) DEFAULT NULL,
+ comment_address VARCHAR(120) DEFAULT NULL,
InitialPriority INTEGER DEFAULT 0 NOT NULL,
FinalPriority INTEGER DEFAULT 0 NOT NULL,
DefaultDueIn INTEGER DEFAULT 0 NOT NULL,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.Oracle
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Oracle (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Oracle Sun Jan 13 15:33:36 2008
@@ -26,7 +26,7 @@
name VARCHAR2(200) CONSTRAINT Queues_name_Unique UNIQUE NOT NULL,
Description VARCHAR2(255),
correspond_address VARCHAR2(120),
- commentAddress VARCHAR2(120),
+ comment_address VARCHAR2(120),
InitialPriority NUMBER(11,0) DEFAULT 0 NOT NULL,
FinalPriority NUMBER(11,0) DEFAULT 0 NOT NULL,
DefaultDueIn NUMBER(11,0) DEFAULT 0 NOT NULL,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.Pg
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Pg (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Pg Sun Jan 13 15:33:36 2008
@@ -49,7 +49,7 @@
name varchar(200) NOT NULL ,
Description varchar(255) NULL ,
correspond_address varchar(120) NULL ,
- commentAddress varchar(120) NULL ,
+ comment_address varchar(120) NULL ,
InitialPriority integer NOT NULL DEFAULT 0 ,
FinalPriority integer NOT NULL DEFAULT 0 ,
DefaultDueIn integer NOT NULL DEFAULT 0 ,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.SQLite
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.SQLite (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.SQLite Sun Jan 13 15:33:36 2008
@@ -27,7 +27,7 @@
name varchar(200) NOT NULL ,
Description varchar(255) NULL ,
correspond_address varchar(120) NULL ,
- commentAddress varchar(120) NULL ,
+ comment_address varchar(120) NULL ,
InitialPriority integer NULL ,
FinalPriority integer NULL ,
DefaultDueIn integer NULL ,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.Sybase
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Sybase (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Sybase Sun Jan 13 15:33:36 2008
@@ -27,7 +27,7 @@
name varchar(200) NOT NULL ,
Description varchar(255) NULL ,
correspond_address varchar(120) NULL ,
- commentAddress varchar(120) NULL ,
+ comment_address varchar(120) NULL ,
InitialPriority integer NOT NULL ,
FinalPriority integer NOT NULL ,
DefaultDueIn integer NOT NULL ,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.mysql
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.mysql (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.mysql Sun Jan 13 15:33:36 2008
@@ -26,7 +26,7 @@
name varchar(200) NOT NULL ,
Description varchar(255) NULL ,
correspond_address varchar(120) NULL ,
- commentAddress varchar(120) NULL ,
+ comment_address varchar(120) NULL ,
InitialPriority integer NOT NULL DEFAULT 0 ,
FinalPriority integer NOT NULL DEFAULT 0 ,
DefaultDueIn integer NOT NULL DEFAULT 0 ,
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html Sun Jan 13 15:33:36 2008
@@ -71,8 +71,8 @@
<td><input name="correspond_address" value="<% ($Create) ? "" : $QueueObj->correspond_address %>" />
<br /><span><em><&|/l , RT->Config->Get('correspond_address')&>(If left blank, will default to %1)</&></em></span></td>
<td align="right"><&|/l&>comment Address</&>:</td>
-<td><input name="commentAddress" value="<% ($Create) ? "" : $QueueObj->commentAddress %>" />
-<br /><span><em><&|/l , RT->Config->Get('commentAddress')&>(If left blank, will default to %1)</&></em></span></td>
+<td><input name="comment_address" value="<% ($Create) ? "" : $QueueObj->comment_address %>" />
+<br /><span><em><&|/l , RT->Config->Get('comment_address')&>(If left blank, will default to %1)</&></em></span></td>
</tr>
<tr><td align="right"><&|/l&>Priority starts at</&>:</td>
@@ -102,7 +102,7 @@
% if ( my $email = $QueueObj->correspond_address || RT->Config->Get('correspond_address') ) {
<tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', email => $email &></td></tr>
% }
-% if ( my $email = $QueueObj->commentAddress || RT->Config->Get('commentAddress') ) {
+% if ( my $email = $QueueObj->comment_address || RT->Config->Get('comment_address') ) {
<tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', email => $email &></td></tr>
% }
% }
@@ -139,7 +139,7 @@
}
if ( $QueueObj->id ) {
delete $session{'create_in_queues'};
- my @attribs= qw(Description correspond_address commentAddress name
+ my @attribs= qw(Description correspond_address comment_address name
InitialPriority FinalPriority DefaultDueIn Sign Encrypt disabled);
# we're asking about enabled on the web page but really care about disabled
@@ -178,7 +178,7 @@
$Create => undef
$Description => undef
$correspond_address => undef
-$commentAddress => undef
+$comment_address => undef
$InitialPriority => undef
$FinalPriority => undef
$DefaultDueIn => undef
Modified: rt/branches/3.999-DANGEROUS/html/Elements/GnuPG/SignEncryptWidget
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/GnuPG/SignEncryptWidget (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/GnuPG/SignEncryptWidget Sun Jan 13 15:33:36 2008
@@ -79,7 +79,7 @@
my $address = $self->{'SignUsing'};
$address ||= $self->{'UpdateType'} eq "private"
- ? ( $QueueObj->commentAddress || RT->Config->Get('commentAddress') )
+ ? ( $QueueObj->comment_address || RT->Config->Get('comment_address') )
: ( $QueueObj->correspond_address || RT->Config->Get('correspond_address') );
unless ( RT::Crypt::GnuPG::DrySign( $address ) ) {
Modified: rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Queue/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Queue/ColumnMap (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/RT__Model__Queue/ColumnMap Sun Jan 13 15:33:36 2008
@@ -66,7 +66,7 @@
value => sub { return $_[0]->InitialPriority .'-'. $_[0]->FinalPriority },
},
Address => {
- value => sub { return ($_[0]->correspond_address||'-') .'/'. ($_[0]->commentAddress||'-') },
+ value => sub { return ($_[0]->correspond_address||'-') .'/'. ($_[0]->comment_address||'-') },
},
(map {
@@ -76,7 +76,7 @@
} qw(WebPath WebBaseURL WebURL)),
};
-foreach my $col(qw(name Description correspond_address commentAddress InitialPriority FinalPriority DefaultDueIn)) {
+foreach my $col(qw(name Description correspond_address comment_address InitialPriority FinalPriority DefaultDueIn)) {
$QUEUE_COLUMN_MAP->{$col} = { attribute => $col, value => sub { return $_[0]->$col() } };
}
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 Sun Jan 13 15:33:36 2008
@@ -54,9 +54,9 @@
% $Default = 0 unless defined $Default && $Default =~ /^\d+$/;
%foreach my $User ( @users) {
<option <% ( $User->id == $Default) ? "SELECTED" : ''%>
-%if ($valueAttribute eq 'id') {
+%if ($value_attribute eq 'id') {
value="<%$User->id%>"
-%} elsif ($valueAttribute eq 'name') {
+%} elsif ($value_attribute eq 'name') {
value="<%$User->name%>"
%}
><& /Elements/ShowUser, User => $User &></option>
@@ -109,6 +109,6 @@
$TicketObj => undef
$DefaultValue => 1
$DefaultLabel => "-"
-$valueAttribute => 'id'
+$value_attribute => 'id'
$cfqueues => undef
</%ARGS>
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default Sun Jan 13 15:33:36 2008
@@ -57,7 +57,7 @@
my ($c, $o, $k, $e) = ("", [], {}, 0);
my %data = %$changes;
my $queue = RT::Model::Queue->new() ;
-my @fields = qw(name Description correspond_address commentAddress
+my @fields = qw(name Description correspond_address comment_address
InitialPriority FinalPriority DefaultDueIn);
my %fields = map { lc $_ => $_ } @fields;
@@ -76,7 +76,7 @@
id => 'queue/new',
name => '<queue name>',
Description => "",
- commentAddress => "",
+ comment_address => "",
correspond_address => "",
InitialPriority => "",
FinalPriority => "",
Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/PickBasics
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/PickBasics (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/PickBasics Sun Jan 13 15:33:36 2008
@@ -124,7 +124,7 @@
Value => {
Type => 'component',
Path => '/Elements/SelectOwner',
- Arguments => { ValueAttribute => 'name' },
+ Arguments => { value_attribute => 'name' },
},
},
{
Modified: rt/branches/3.999-DANGEROUS/html/User/Prefs.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/User/Prefs.html (original)
+++ rt/branches/3.999-DANGEROUS/html/User/Prefs.html Sun Jan 13 15:33:36 2008
@@ -236,7 +236,7 @@
#TODO: make this report errors properly
-if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$user_object->is_password($Pass1))) {
+if ((defined $Pass1) and ($Pass1 ne '') and ($Pass1 eq $Pass2) and (!$user_object->password_is($Pass1))) {
my ($code, $msg);
($code, $msg) = $user_object->set_password($Pass1);
push @results, _('password: %1', _($msg));
Modified: rt/branches/3.999-DANGEROUS/lib/RT/EmailParser.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/EmailParser.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/EmailParser.pm Sun Jan 13 15:33:36 2008
@@ -308,7 +308,7 @@
$Address = $user->canonicalize_email($Address);
next if ( lc $args{'CurrentUser'}->email eq lc $Address );
next if ( lc $args{'QueueObj'}->correspond_address eq lc $Address );
- next if ( lc $args{'QueueObj'}->commentAddress eq lc $Address );
+ next if ( lc $args{'QueueObj'}->comment_address eq lc $Address );
next if ( $self->IsRTAddress($Address) );
push ( @Addresses, $Address );
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm Sun Jan 13 15:33:36 2008
@@ -883,7 +883,7 @@
$address = $args{'CurrentUser'}->user_object->canonicalize_email( $address );
next if lc $args{'CurrentUser'}->email eq $address;
next if lc $args{'QueueObj'}->correspond_address eq $address;
- next if lc $args{'QueueObj'}->commentAddress eq $address;
+ next if lc $args{'QueueObj'}->comment_address eq $address;
next if IsRTAddress( $address );
push @res, $address;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm Sun Jan 13 15:33:36 2008
@@ -401,7 +401,7 @@
my %data = ();
my $current_user_address = lc $self->current_user->user_object->email;
my $correspond = lc $self->TransactionObj->TicketObj->QueueObj->correspond_address;
- my $comment = lc $self->TransactionObj->TicketObj->QueueObj->commentAddress;
+ my $comment = lc $self->TransactionObj->TicketObj->QueueObj->comment_address;
foreach my $hdr (qw(From To Cc Bcc RT-Send-Cc RT-Send-Bcc)) {
my @Addresses;
my $line = $self->GetHeader($hdr);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm Sun Jan 13 15:33:36 2008
@@ -87,7 +87,7 @@
column name => max_length is 200, type is 'varchar(200)', default is '';
column Description => max_length is 255, type is 'varchar(255)', default is '';
column correspond_address => max_length is 120, type is 'varchar(120)', default is '';
-column commentAddress => max_length is 120, type is 'varchar(120)', default is '';
+column comment_address => max_length is 120, type is 'varchar(120)', default is '';
column InitialPriority => max_length is 11, type is 'int(11)', default is '0';
column FinalPriority => max_length is 11, type is 'int(11)', default is '0';
column DefaultDueIn => max_length is 11, type is 'int(11)', default is '0';
@@ -323,7 +323,7 @@
name (required)
Description
correspond_address
- commentAddress
+ comment_address
InitialPriority
FinalPriority
DefaultDueIn
@@ -339,7 +339,7 @@
name => undef,
correspond_address => '',
Description => '',
- commentAddress => '',
+ comment_address => '',
InitialPriority => 0,
FinalPriority => 0,
DefaultDueIn => 0,
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 Sun Jan 13 15:33:36 2008
@@ -363,7 +363,8 @@
return (undef);
}
- my @from_role = $self->clone->_WhoHaveRoleRightSplitted( %args );
+ my $from_role = $self->clone;
+ $from_role->WhoHaveRoleRight(%args);
my $from_group = $self->clone;
$from_group->WhoHaveGroupRight( %args );
@@ -371,7 +372,7 @@
#XXX: DIRTY HACK
use Jifty::DBI::Collection::Union;
my $union = new Jifty::DBI::Collection::Union;
- $union->add( $_ ) foreach @from_role;
+ $union->add( $from_role ) ;
$union->add( $from_group );
%$self = %$union;
bless $self, ref($union);
@@ -397,48 +398,43 @@
my $groups = $self->_joinGroups( %args );
my $acl = $self->_joinACL( %args );
- $self->limit( alias => $acl,
- column => 'principal_type',
- value => "$groups.Type",
- quote_value => 0,
- );
+ my ($check_roles, $check_objects) = ('','');
- # no system user
- $self->limit( alias => $self->PrincipalsAlias,
- column => 'id',
- operator => '!=',
- value => RT->system_user->id
- );
my @objects = $self->_GetEquivObjects( %args );
- unless ( @objects ) {
- unless ( $args{'IncludeSystemRights'} ) {
- $self->_add_subclause( WhichObjects => "($acl.object_type != 'RT::System')" );
- }
- return;
- }
- my ($groups_clauses, $acl_clauses) = $self->_RoleClauses( $groups, $acl, @objects );
- $self->_add_subclause( "WhichObject", "(". join( ' OR ', @$groups_clauses ) .")" );
- $self->_add_subclause( "WhichRole", "(". join( ' OR ', @$acl_clauses ) .")" );
+ if ( @objects ) {
+ my @role_clauses;
+ my @object_clauses;
+ foreach my $obj ( @objects ) {
+ my $type = ref($obj)? ref($obj): $obj;
+ my $id;
+ $id = $obj->id if ref($obj) && UNIVERSAL::can($obj, 'id') && $obj->id;
- return;
-}
+ my $role_clause = "$groups.Domain = '$type-Role'";
+
+ # if we want mysql 4.0 use indexes here. we MUST convert that
+ # field to integer and drop this quotes.
+ $role_clause .= " AND $groups.Instance = '$id'" if $id;
+ push @role_clauses, "($role_clause)";
+ my $object_clause = "$acl.object_type = '$type'";
+ $object_clause .= " AND $acl.object_id = $id" if $id;
+ push @object_clauses, "($object_clause)";
-sub _WhoHaveRoleRightSplitted {
- my $self = shift;
- my %args = (
- Right => undef,
- Object => undef,
- IncludeSystemRights => undef,
- IncludeSuperusers => undef,
- IncludeSubgroupMembers => 1,
- EquivObjects => [ ],
- @_
- );
- my $groups = $self->_joinGroups( %args );
- my $acl = $self->_joinACL( %args );
+ }
+
+ $check_roles .= join ' OR ', @role_clauses;
+ $check_objects = join ' OR ', @object_clauses;
+ } else {
+ if( !$args{'IncludeSystemRights'} ) {
+ $check_objects = "($acl.object_type != 'RT::System')";
+ }
+ }
+
+ $self->_add_subclause( "WhichObject", "($check_objects)" );
+ $self->_add_subclause( "WhichRole", "($check_roles)" );
+
$self->limit( alias => $acl,
column => 'principal_type',
@@ -452,53 +448,7 @@
operator => '!=',
value => RT->system_user->id
);
-
- my @objects = $self->_GetEquivObjects( %args );
- unless ( @objects ) {
- unless ( $args{'IncludeSystemRights'} ) {
- $self->_add_subclause( WhichObjects => "($acl.object_type != 'RT::System')" );
- }
- return $self;
- }
-
- my ($groups_clauses, $acl_clauses) = $self->_RoleClauses( $groups, $acl, @objects );
- $self->_add_subclause( "WhichRole", "(". join( ' OR ', @$acl_clauses ) .")" );
-
- my @res;
- foreach ( @$groups_clauses ) {
- my $tmp = $self->clone;
- $tmp->_add_subclause( WhichObject => $_ );
- push @res, $tmp;
- }
-
- return @res;
-}
-
-sub _RoleClauses {
- my $self = shift;
- my $groups = shift;
- my $acl = shift;
- my @objects = @_;
-
- my @groups_clauses;
- my @acl_clauses;
- foreach my $obj ( @objects ) {
- my $type = ref($obj)? ref($obj): $obj;
- my $id;
- $id = $obj->id if ref($obj) && UNIVERSAL::can($obj, 'id') && $obj->id;
-
- my $role_clause = "$groups.Domain = '$type-Role'";
- # XXX: Groups.Instance is VARCHAR in DB, we should quote value
- # if we want mysql 4.0 use indexes here. we MUST convert that
- # field to integer and drop this quotes.
- $role_clause .= " AND $groups.Instance = '$id'" if $id;
- push @groups_clauses, "($role_clause)";
-
- my $object_clause = "$acl.object_type = '$type'";
- $object_clause .= " AND $acl.object_id = $id" if $id;
- push @acl_clauses, "($object_clause)";
- }
- return (\@groups_clauses, \@acl_clauses);
+ return
}
# XXX: should be generalized
Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Autoreply.pm Sun Jan 13 15:33:36 2008
@@ -101,8 +101,8 @@
my $replyto;
if ($args{'is_comment'}) {
- $replyto = $self->TicketObj->QueueObj->commentAddress ||
- RT->Config->Get('commentAddress');
+ $replyto = $self->TicketObj->QueueObj->comment_address ||
+ RT->Config->Get('comment_address');
}
else {
$replyto = $self->TicketObj->QueueObj->correspond_address ||
Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm Sun Jan 13 15:33:36 2008
@@ -707,8 +707,8 @@
my $replyto;
if ( $args{'is_comment'} ) {
- $replyto = $self->TicketObj->QueueObj->commentAddress
- || RT->Config->Get('commentAddress');
+ $replyto = $self->TicketObj->QueueObj->comment_address
+ || RT->Config->Get('comment_address');
}
else {
$replyto = $self->TicketObj->QueueObj->correspond_address
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Test.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Test.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Test.pm Sun Jan 13 15:33:36 2008
@@ -161,7 +161,7 @@
my ($val, $msg) = $obj->create( %args );
die "$msg" unless $val;
} else {
- my @fields = qw(correspond_address commentAddress);
+ my @fields = qw(correspond_address comment_address);
foreach my $field ( @fields ) {
next unless exists $args{ $field };
next if $args{ $field } eq $obj->$field;
Modified: rt/branches/3.999-DANGEROUS/lib/t/setup_regression.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/t/setup_regression.t (original)
+++ rt/branches/3.999-DANGEROUS/lib/t/setup_regression.t Sun Jan 13 15:33:36 2008
@@ -18,7 +18,7 @@
my ($id, $msg) = $q->create( name => 'Regression',
Description => 'A regression test queue',
correspond_address => 'correspond at a',
- commentAddress => 'comment at a');
+ comment_address => 'comment at a');
isnt($id, 0, "Queue was Created sucessfully - $msg");
@@ -29,6 +29,6 @@
is($q2->name, 'Regression');
is($q2->Description, 'A regression test queue');
is($q2->correspond_address, 'correspond at a');
-is($q2->commentAddress, 'comment at a');
+is($q2->comment_address, 'comment at a');
Modified: rt/branches/3.999-DANGEROUS/share/po/cs.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/cs.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/cs.po Sun Jan 13 15:33:36 2008
@@ -370,7 +370,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Pro prázdné pole se použije %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/da.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/da.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/da.po Sun Jan 13 15:33:36 2008
@@ -403,7 +403,7 @@
msgstr "(Indtast sagsnummer eller URL'er, adskilt af mellemrum)"
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
#: html/Admin/Queues/Modify.html:75
#: html/Admin/Queues/Modify.html:81
msgid "(If left blank, will default to %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/de.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/de.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/de.po Sun Jan 13 15:33:36 2008
@@ -334,7 +334,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Standardwert: %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/es.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/es.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/es.po Sun Jan 13 15:33:36 2008
@@ -394,7 +394,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Si se deja vacio, pasara por defecto a %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/fi.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/fi.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/fi.po Sun Jan 13 15:33:36 2008
@@ -375,7 +375,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Jos jätetään tyhjäksi, palaa arvoon %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/fr.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/fr.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/fr.po Sun Jan 13 15:33:36 2008
@@ -309,7 +309,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Si à laissé blanc, le défaut sera %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/he.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/he.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/he.po Sun Jan 13 15:33:36 2008
@@ -317,7 +317,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr ""
Modified: rt/branches/3.999-DANGEROUS/share/po/hu.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/hu.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/hu.po Sun Jan 13 15:33:36 2008
@@ -301,7 +301,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Ha üresen marad: %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/id.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/id.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/id.po Sun Jan 13 15:33:36 2008
@@ -315,7 +315,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Jika ditinggalkan kosong, default akan menjadi %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/it.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/it.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/it.po Sun Jan 13 15:33:36 2008
@@ -394,7 +394,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Se non specificato usa: %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/ja.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/ja.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/ja.po Sun Jan 13 15:33:36 2008
@@ -361,7 +361,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr ""
Modified: rt/branches/3.999-DANGEROUS/share/po/nl.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/nl.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/nl.po Sun Jan 13 15:33:36 2008
@@ -365,7 +365,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Indien leeggelaten, wordt voorzien van %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/no.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/no.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/no.po Sun Jan 13 15:33:36 2008
@@ -394,7 +394,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Settes til standard %1 hvis blank)"
Modified: rt/branches/3.999-DANGEROUS/share/po/pl.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/pl.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/pl.po Sun Jan 13 15:33:36 2008
@@ -404,7 +404,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Jeśli pozostawisz puste, domyślnie zostanie ustawione na %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/pt_br.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/pt_br.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/pt_br.po Sun Jan 13 15:33:36 2008
@@ -390,7 +390,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Se deixado em branco, será entendido como %)"
Modified: rt/branches/3.999-DANGEROUS/share/po/ru.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/ru.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/ru.po Sun Jan 13 15:33:36 2008
@@ -403,7 +403,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Если не заполнено, то по умолчанию равно %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/sv.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/sv.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/sv.po Sun Jan 13 15:33:36 2008
@@ -323,7 +323,7 @@
msgstr "(Mata in ärende-ID:n eller URL, separerade med mellanrum)"
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
#: html/Admin/Queues/Modify.html:75
#: html/Admin/Queues/Modify.html:81
msgid "(If left blank, will default to %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/tr.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/tr.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/tr.po Sun Jan 13 15:33:36 2008
@@ -296,7 +296,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(Boş bırakılırsa, varsayılan olarak %1 değerini alacaktır)"
Modified: rt/branches/3.999-DANGEROUS/share/po/zh_cn.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/zh_cn.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/zh_cn.po Sun Jan 13 15:33:36 2008
@@ -429,7 +429,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(如果留白, 则预设为 %1)"
Modified: rt/branches/3.999-DANGEROUS/share/po/zh_tw.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/zh_tw.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/zh_tw.po Sun Jan 13 15:33:36 2008
@@ -429,7 +429,7 @@
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::correspond_address)
-#. ($RT::commentAddress)
+#. ($RT::comment_address)
msgid "(If left blank, will default to %1)"
msgstr "(如果留白, 則預設為 %1)"
Modified: rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t (original)
+++ rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t Sun Jan 13 15:33:36 2008
@@ -37,6 +37,7 @@
my %res = RT::Crypt::GnuPG::SignEncrypt( Entity => $entity, Encrypt => 0, Passphrase => 'test' );
ok( $entity, 'signed entity');
ok( !$res{'logger'}, "log is here as well" );
+ warn $res{'logger'};
my @status = RT::Crypt::GnuPG::ParseStatus( $res{'status'} );
is( scalar @status, 2, 'two records: passphrase, signing');
is( $status[0]->{'Operation'}, 'PassphraseCheck', 'operation is correct');
Modified: rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/cf_select_one.t Sun Jan 13 15:33:36 2008
@@ -74,7 +74,7 @@
($tid, $txnid, $msg) = $ticket->create(
Subject => 'test',
Queue => $queue->id,
- "CustomField-$cfid" => 'asd',
+ "CustomField-$cfid" => 'ASD',
);
ok $tid, "Created ticket";
diag $msg if $msg && $ENV{'TEST_VERBOSE'};
Modified: rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t Sun Jan 13 15:33:36 2008
@@ -11,7 +11,7 @@
RT->Config->set( LogToScreen => 'debug' );
RT->Config->set( LogStackTraces => 'error' );
-RT->Config->set( commentAddress => 'general at example.com');
+RT->Config->set( comment_address => 'general at example.com');
RT->Config->set( correspond_address => 'general at example.com');
RT->Config->set( DefaultSearchResultFormat => qq{
'<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
@@ -62,6 +62,7 @@
);
my ($baseurl, $m) = RT::Test->started_ok;
+diag($baseurl);
ok $m->login, 'logged in';
$m->get_ok("/Admin/Queues/Modify.html?id=$qid");
@@ -220,11 +221,11 @@
ok($m->value('Sign', 2), "sign tick box is checked");
$m->submit;
is($m->status, 200, "request successful");
-
$m->get($baseurl); # ensure that the mail has been processed
@mail = RT::Test->fetch_caught_mails;
ok(@mail, "got some mail");
+die;
for my $mail (@mail) {
unlike $mail, qr/Some other content/, "outgoing mail was encrypted";
Modified: rt/branches/3.999-DANGEROUS/t/web/gnupg-outgoing.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/gnupg-outgoing.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/gnupg-outgoing.t Sun Jan 13 15:33:36 2008
@@ -33,7 +33,7 @@
my $queue = RT::Test->load_or_create_queue(
name => 'Regression',
correspond_address => 'rt-recipient at example.com',
- commentAddress => 'rt-recipient at example.com',
+ comment_address => 'rt-recipient at example.com',
);
ok $queue && $queue->id, 'loaded or created queue';
@@ -148,7 +148,7 @@
$queue = RT::Test->load_or_create_queue(
name => 'Regression',
correspond_address => 'rt-test at example.com',
- commentAddress => 'rt-test at example.com',
+ comment_address => 'rt-test at example.com',
);
ok $queue && $queue->id, 'changed props of the queue';
Modified: rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-create.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-create.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-create.t Sun Jan 13 15:33:36 2008
@@ -31,7 +31,7 @@
my $queue = RT::Test->load_or_create_queue(
name => 'Regression',
correspond_address => 'rt-recipient at example.com',
- commentAddress => 'rt-recipient at example.com',
+ comment_address => 'rt-recipient at example.com',
);
ok $queue && $queue->id, 'loaded or created queue';
Modified: rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-update.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-update.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/gnupg-select-keys-on-update.t Sun Jan 13 15:33:36 2008
@@ -31,7 +31,7 @@
my $queue = RT::Test->load_or_create_queue(
name => 'Regression',
correspond_address => 'rt-recipient at example.com',
- commentAddress => 'rt-recipient at example.com',
+ comment_address => 'rt-recipient at example.com',
);
ok $queue && $queue->id, 'loaded or created queue';
Modified: rt/branches/3.999-DANGEROUS/t/web/query_builder.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/query_builder.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/query_builder.t Sun Jan 13 15:33:36 2008
@@ -35,6 +35,7 @@
$q =~ s/^\s+//g;
$q =~ s/\s+$//g;
$q =~ s/\s+/ /g;
+ warn $q;
return $q;
}
@@ -49,7 +50,7 @@
ok $agent->form_name('BuildQuery'), "found the form once";
$agent->field("ActorField", "Owner");
$agent->field("ActorOp", "=");
- $agent->field("ValueOfActor", "Nobody");
+ $agent->field("ValueOfActor", 'Nobody');
$agent->submit;
is getQueryFromForm, "Owner = 'Nobody'", 'correct query';
}
Modified: rt/branches/3.999-DANGEROUS/t/web/rights1.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/rights1.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/rights1.t Sun Jan 13 15:33:36 2008
@@ -30,7 +30,6 @@
no warnings 'once';
# get the top page
$agent->login($user_obj->name => 'customer');
-
# Test for absence of Configure and Preferences tabs.
ok(!$agent->find_link( url => "$RT::WebPath/Admin/",
text => 'Configuration'), "No config tab" );
@@ -110,4 +109,5 @@
my $input = $agent->current_form->find_input('ValueOfActor');
ok(grep(/customer-$$/, $input->value_names()), "Found self in the actor listing");
+die join(',',$input->value_names);
1;
More information about the Rt-commit
mailing list