[Rt-commit] r10684 - in rt/branches/3.999-DANGEROUS: . html/Search html/Ticket html/Ticket/Elements lib/RT/Interface
jesse at bestpractical.com
jesse at bestpractical.com
Sun Feb 3 00:56:31 EST 2008
Author: jesse
Date: Sun Feb 3 00:56:28 2008
New Revision: 10684
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/html/Search/Bulk.html
rt/branches/3.999-DANGEROUS/html/Ticket/Create.html
rt/branches/3.999-DANGEROUS/html/Ticket/Display.html
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/EditBasics
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/EditPeople
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs
rt/branches/3.999-DANGEROUS/html/Ticket/Update.html
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t
Log:
r76125 at pinglin: jesse | 2008-02-03 00:55:22 -0500
t/ticket_owner.t now passes
Modified: rt/branches/3.999-DANGEROUS/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Bulk.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Bulk.html Sun Feb 3 00:56:28 2008
@@ -82,7 +82,7 @@
<td valign="top">
<table>
<tr><td class="label"> <&|/l&>Make Owner</&>: </td>
-<td class="value"> <& /Elements/SelectOwner, name => "Owner" &> (<input type="checkbox" class="checkbox" name="ForceOwnerChange" /> <&|/l&>Force change</&>) </td></tr>
+<td class="value"> <& /Elements/SelectOwner, name => "owner" &> (<input type="checkbox" class="checkbox" name="force_owner_change" /> <&|/l&>Force change</&>) </td></tr>
<tr><td class="label"> <&|/l&>add Requestor</&>: </td>
<td class="value"> <input name="AddRequestor" size="20" /> </td></tr>
<tr><td class="label"> <&|/l&>Remove Requestor</&>: </td>
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Create.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Create.html Sun Feb 3 00:56:28 2008
@@ -76,7 +76,7 @@
<&|/l&>Owner</&>:
</td>
<td class="value">
- <& /Elements/SelectOwner, name => "Owner", queue_obj => $queue_obj, Default => $ARGS{Owner}|| RT->nobody->id, DefaultValue => 0 &>
+ <& /Elements/SelectOwner, name => "owner", queue_obj => $queue_obj, Default => $ARGS{owner}|| RT->nobody->id, DefaultValue => 0 &>
</td>
</tr>
<tr>
@@ -256,7 +256,7 @@
};
$clone->{$_} = $cloneticket_obj->$_()
- for qw/Owner subject final_priority time_estimated TimeWorked
+ for qw/owner subject final_priority time_estimated TimeWorked
Status TimeLeft Starts Started Due Resolved/;
my $members = $cloneticket_obj->members;
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Display.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Display.html Sun Feb 3 00:56:28 2008
@@ -127,8 +127,8 @@
$m->callback( Callbackname => 'BeforeProcessArguments',
ticket_obj => $ticket_obj, Tickets => $Tickets,
ActionsRef => \@Actions, args_ref => \%ARGS );
- if ( defined $ARGS{'Action'} ) {
- if ($ARGS{'Action'} =~ /^(steal|kill|take|set_old)$/) {
+ if ( defined $ARGS{'action'} ) {
+ if ($ARGS{'action'} =~ /^(steal|kill|take|set_told)$/) {
my $action = $1;
my ($res, $msg) = $ticket_obj->$action();
push(@Actions, $msg);
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/EditBasics
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/EditBasics (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/EditBasics Sun Feb 3 00:56:28 2008
@@ -62,7 +62,7 @@
<tr>
<td class="label"><&|/l&>Owner</&>:</td>
<td class="value"><& /Elements/SelectOwner,
- name => 'Owner',
+ name => 'owner',
queue_obj => $ticket_obj->queue_obj,
ticket_obj => $ticket_obj,
Default => $ticket_obj->owner_obj->id,
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/EditPeople
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/EditPeople (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/EditPeople Sun Feb 3 00:56:28 2008
@@ -64,7 +64,7 @@
GroupField => $GroupField, privilegedOnly => $privilegedOnly &>
</td><td valign="top">
<h3><&|/l&>Owner</&></h3>
-<&|/l&>Owner</&>: <& /Elements/SelectOwner, name => 'Owner', queue_obj => $Ticket->queue_obj, ticket_obj => $Ticket, Default => $Ticket->owner_obj->id, DefaultValue => 0&>
+<&|/l&>Owner</&>: <& /Elements/SelectOwner, name => 'owner', queue_obj => $Ticket->queue_obj, ticket_obj => $Ticket, Default => $Ticket->owner_obj->id, DefaultValue => 0&>
<h3><&|/l&>Current watchers</&></h3>
<&|/l&>(Check box to delete)</&><br />
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs Sun Feb 3 00:56:28 2008
@@ -147,14 +147,14 @@
if ( $can{'ModifyTicket'} or $Ticket->current_user_has_right('ReplyToTicket') ) {
$actions->{'F'} = {
title => _('Reply'),
- path => "Ticket/Update.html?Action=Respond&id=" . $id,
+ path => "Ticket/Update.html?action=Respond&id=" . $id,
};
}
if ( $can{'ModifyTicket'} ) {
if ( $Ticket->status ne 'resolved' ) {
$actions->{'G'} = {
- path => "Ticket/Update.html?Action=comment&DefaultStatus=resolved&id=" . $id,
+ path => "Ticket/Update.html?action=comment&DefaultStatus=resolved&id=" . $id,
title => _('Resolve') };
}
if ( $Ticket->status ne 'open' ) {
@@ -167,13 +167,13 @@
if ( $Ticket->current_user_has_right('OwnTicket') ) {
if ( $Ticket->owner_obj->id == RT->nobody->id ) {
$actions->{'B'} = {
- path => "Ticket/Display.html?Action=Take&id=" . $id,
+ path => "Ticket/Display.html?action=take&id=" . $id,
title => _('Take'),
} if $can{'ModifyTicket'} or $Ticket->current_user_has_right('TakeTicket');
}
elsif ( $Ticket->owner_obj->id != Jifty->web->current_user->id ) {
$actions->{'C'} = {
- path => "Ticket/Display.html?Action=Steal&id=" . $id,
+ path => "Ticket/Display.html?action=steal&id=" . $id,
title => _('Steal'),
} if $can{'ModifyTicket'} or $Ticket->current_user_has_right('StealTicket');
}
@@ -184,7 +184,7 @@
if ( $can{'ModifyTicket'} or $Ticket->current_user_has_right('CommentOnTicket') ) {
$actions->{'E'} = {
title => _('comment'),
- path => "Ticket/Update.html?Action=comment&id=" . $id,
+ path => "Ticket/Update.html?action=comment&id=" . $id,
};
}
}
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Update.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Update.html Sun Feb 3 00:56:28 2008
@@ -69,11 +69,11 @@
<& /Elements/SelectStatus, name=>"Status", DefaultLabel => _("%1 (Unchanged)", loc($ticket_obj->status)), Default => $ARGS{'Status'} || ($ticket_obj->status eq $DefaultStatus ? undef : $DefaultStatus)&>
<&|/l&>Owner</&>:
<& /Elements/SelectOwner,
- name => "Owner",
+ name => "owner",
ticket_obj => $ticket_obj,
queue_obj => $ticket_obj->queue_obj,
DefaultLabel => _("%1 (Unchanged)", $ticket_obj->owner_obj->name),
- Default => $ARGS{'Owner'}
+ Default => $ARGS{'owner'}
&>
<&|/l&>Worked</&>: <input size="4" name="UpdateTimeWorked" value="<% $ARGS{UpdateTimeWorked}||'' %>" />
<& /Elements/SelectTimeUnits, name => 'UpdateTimeWorked'&>
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 Feb 3 00:56:28 2008
@@ -1183,7 +1183,7 @@
# check if we should apply filter before decoding
my $check_cb = do {
no strict 'refs';
- *{ $class . "::ApplyBeforeDecode" }{CODE};
+ *{ $class . "::apply_before_decode" }{CODE};
};
next unless defined $check_cb;
next
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm Sun Feb 3 00:56:28 2008
@@ -917,12 +917,12 @@
args_ref => $args_ref,
);
- # We special case owner changing, so we can use ForceownerChange
+ # We special case owner changing, so we can use force_owner_change
if ( $args_ref->{'owner'}
&& ( $ticket_obj->owner != $args_ref->{'owner'} ) )
{
my ($ChownType);
- if ( $args_ref->{'ForceownerChange'} ) {
+ if ( $args_ref->{'force_owner_change'} ) {
$ChownType = "Force";
} else {
$ChownType = "Give";
Modified: rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t Sun Feb 3 00:56:28 2008
@@ -38,8 +38,8 @@
$agent_a->content_like(qr/Create a new ticket/i, 'opened create ticket page');
my $form = $agent_a->form_name('TicketCreate');
- is $form->value('Owner'), RT->nobody->id, 'correct owner selected';
- ok !grep($_ == $user_a->id, $form->find_input('Owner')->possible_values),
+ is $form->value('owner'), RT->nobody->id, 'correct owner selected';
+ ok !grep($_ == $user_a->id, $form->find_input('owner')->possible_values),
'user A can not own tickets';
$agent_a->submit;
@@ -61,11 +61,11 @@
$agent_a->content_like(qr/Create a new ticket/i, 'opened create ticket page');
my $form = $agent_a->form_name('TicketCreate');
- is $form->value('Owner'), RT->nobody->id, 'correct owner selected';
+ is $form->value('owner'), RT->nobody->id, 'correct owner selected';
- ok grep($_ == $user_b->id, $form->find_input('Owner')->possible_values),
+ ok grep($_ == $user_b->id, $form->find_input('owner')->possible_values),
'user B is listed as potential owner';
- $agent_a->select('Owner', $user_b->id);
+ $agent_a->select('owner', $user_b->id);
$agent_a->submit;
$agent_a->content_like(qr/Ticket \d+ created in queue/i, 'created ticket');
@@ -99,8 +99,8 @@
diag("Going to ticket $id");
$agent->follow_link_ok(text => 'Basics');
my $form = $agent->form_number(3);
- is $form->value('Owner'), $user_b->id, 'correct owner selected';
- $agent->select('Owner', RT->nobody->id);
+ is $form->value('owner'), $user_b->id, 'correct owner selected';
+ $agent->select('owner', RT->nobody->id);
$agent->submit;
$agent->content_like(
@@ -134,7 +134,7 @@
$agent_a->follow_link_ok(text => 'Reply');
my $form = $agent_a->form_number(3);
- is $form->value('Owner'), '', 'empty value selected';
+ is $form->value('owner'), '', 'empty value selected';
$agent_a->submit;
$ticket = RT::Model::Ticket->new(current_user => RT->system_user );
More information about the Rt-commit
mailing list