[Rt-commit] r10550 - in rt/branches/3.999-DANGEROUS: html/Admin/Tools/Shredder/Elements/Object html/Elements html/REST/1.0/Forms/ticket html/REST/1.0/Forms/transaction html/REST/1.0/ticket html/Ticket html/Ticket/Attachment html/Ticket/Elements html/Tools lib/RT lib/RT/Condition lib/RT/Interface lib/RT/Model lib/RT/ScripAction lib/RT/Shredder sbin t/api t/mail t/shredder
ruz at bestpractical.com
ruz at bestpractical.com
Tue Jan 29 09:34:22 EST 2008
Author: ruz
Date: Tue Jan 29 09:34:20 2008
New Revision: 10550
Modified:
rt/branches/3.999-DANGEROUS/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
rt/branches/3.999-DANGEROUS/html/Elements/ShowLink
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/comment
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/history
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/transaction/default
rt/branches/3.999-DANGEROUS/html/REST/1.0/ticket/comment
rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/dhandler
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/FindAttachments
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/LoadTextAttachments
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Reminders
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowAttachments
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowDependencies
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowHistory
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowRequestor
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction
rt/branches/3.999-DANGEROUS/html/Ticket/ShowEmailRecord.html
rt/branches/3.999-DANGEROUS/html/Tools/MyDay.html
rt/branches/3.999-DANGEROUS/lib/RT/Condition/CloseTicket.pm
rt/branches/3.999-DANGEROUS/lib/RT/Condition/OwnerChange.pm
rt/branches/3.999-DANGEROUS/lib/RT/Condition/PriorityChange.pm
rt/branches/3.999-DANGEROUS/lib/RT/Condition/QueueChange.pm
rt/branches/3.999-DANGEROUS/lib/RT/Condition/ReopenTicket.pm
rt/branches/3.999-DANGEROUS/lib/RT/Condition/StatusChange.pm
rt/branches/3.999-DANGEROUS/lib/RT/Date.pm
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/lib/RT/Model/ACE.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/AttachmentCollection.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/CachedGroupMember.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/AutoOpen.pm
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Attachment.pm
rt/branches/3.999-DANGEROUS/lib/RT/StyleGuide.pod
rt/branches/3.999-DANGEROUS/lib/RT/URI.pm
rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in
rt/branches/3.999-DANGEROUS/t/api/ticket.t
rt/branches/3.999-DANGEROUS/t/api/uri-t.t
rt/branches/3.999-DANGEROUS/t/mail/gateway.t
rt/branches/3.999-DANGEROUS/t/shredder/01ticket.t
rt/branches/3.999-DANGEROUS/t/ticket/linking.t
Log:
* more conversions: TransactionId, Parent
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment Tue Jan 29 09:34:20 2008
@@ -48,6 +48,6 @@
<%ARGS>
$Object => undef
</%ARGS>
-<a href="<% RT->config->get('WebBaseURL') %>/Ticket/Attachment/<% $Object->TransactionId %>/<% $Object->id %>/">
+<a href="<% RT->config->get('WebBaseURL') %>/Ticket/Attachment/<% $Object->transaction_id %>/<% $Object->id %>/">
Attachment(id:<% $Object->id %>, Filename: <% $Object->filename || '(no value)' %>)
</a>
Modified: rt/branches/3.999-DANGEROUS/html/Elements/ShowLink
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/ShowLink (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/ShowLink Tue Jan 29 09:34:20 2008
@@ -49,7 +49,7 @@
% if ($URI->IsLocal) {
% my $member = $URI->object;
% if (UNIVERSAL::isa($member, "RT::Model::Ticket")) {
-<%$member->id%>: (<%$member->owner_obj->name%>) <%$member->subject%> [<% _($member->Status) %>]
+<%$member->id%>: (<%$member->owner_obj->name%>) <%$member->subject%> [<% _($member->status) %>]
% } elsif ( UNIVERSAL::can($member, 'name')) {
<%$URI->resolver->AsString%>: <%$member->name%>
% } else {
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments Tue Jan 29 09:34:20 2008
@@ -94,8 +94,8 @@
push @data, [ subject => $attachment->subject ];
push @data, [ Creator => $attachment->Creator ];
push @data, [ Created => $attachment->Created ];
- push @data, [ Transaction => $attachment->TransactionId ];
- push @data, [ Parent => $attachment->Parent ];
+ push @data, [ Transaction => $attachment->transaction_id ];
+ push @data, [ Parent => $attachment->parent ];
push @data, [ MessageId => $attachment->MessageId ];
push @data, [ Filename => $attachment->filename ];
push @data, [ content_type => $attachment->content_type ];
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/comment
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/comment (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/comment Tue Jan 29 09:34:20 2008
@@ -141,7 +141,7 @@
my ($n, $s) = $ticket->$action(MIMEObj => $ent,
CcMessageTo => $cc,
BccMessageTo => $bcc,
- TimeTaken => $changes{time_worked} || 0);
+ time_taken => $changes{time_worked} || 0);
$c = "# ".$s;
if ($changes{Status}) {
my ($status_n, $status_s) = $ticket->set_status($changes{'Status'} );
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/history
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/history (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/history Tue Jan 29 09:34:20 2008
@@ -119,11 +119,11 @@
push @data, [ id => $t->id ];
push @data, [ Ticket => $t->ticket ]
if (!%$fields || exists $fields->{lc 'Ticket'});
- push @data, [ TimeTaken => $t->TimeTaken ]
- if (!%$fields || exists $fields->{lc 'TimeTaken'});
+ push @data, [ time_taken => $t->time_taken ]
+ if (!%$fields || exists $fields->{lc 'time_taken'});
push @data, [ type => $t->type ]
if (!%$fields || exists $fields->{lc 'type'});
- push @data, [ Field => $t->Field ]
+ push @data, [ Field => $t->field ]
if (!%$fields || exists $fields->{lc 'Field'});
push @data, [ old_value => $t->old_value ]
if (!%$fields || exists $fields->{lc 'old_value'});
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/transaction/default
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/transaction/default (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/transaction/default Tue Jan 29 09:34:20 2008
@@ -71,11 +71,11 @@
push @data, [ id => $t->id ];
push @data, [ Ticket => $t->ticket ]
if (!%$fields || exists $fields->{lc 'Ticket'});
- push @data, [ TimeTaken => $t->TimeTaken ]
- if (!%$fields || exists $fields->{lc 'TimeTaken'});
+ push @data, [ time_taken => $t->time_taken ]
+ if (!%$fields || exists $fields->{lc 'time_taken'});
push @data, [ type => $t->type ]
if (!%$fields || exists $fields->{lc 'type'});
- push @data, [ Field => $t->Field ]
+ push @data, [ Field => $t->field ]
if (!%$fields || exists $fields->{lc 'Field'});
push @data, [ old_value => $t->old_value ]
if (!%$fields || exists $fields->{lc 'old_value'});
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/ticket/comment
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/ticket/comment (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/ticket/comment Tue Jan 29 09:34:20 2008
@@ -163,7 +163,7 @@
my ($n, $s) = $ticket->$action(MIMEObj => $ent,
CcMessageTo => $cc,
BccMessageTo => $bcc,
- TimeTaken => $k->{time_worked} || 0);
+ time_taken => $k->{time_worked} || 0);
$output = $s;
if ($k->{Status}) {
my ($status_n, $status_s) = $ticket->set_status($k->{'Status'} );
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/dhandler
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/dhandler (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/dhandler Tue Jan 29 09:34:20 2008
@@ -62,8 +62,8 @@
unless ($AttachmentObj->id) {
abort("Bad attachment id. Couldn't find attachment '$attach'\n");
}
- unless ($AttachmentObj->TransactionId() == $trans ) {
- abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
+ unless ($AttachmentObj->transaction_id() == $trans ) {
+ abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->transaction_id() ."\n");
}
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/FindAttachments
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/FindAttachments (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/FindAttachments Tue Jan 29 09:34:20 2008
@@ -55,11 +55,11 @@
# code that looks at attachments will look at each one in turn.
my $attachments = RT::Model::AttachmentCollection->new();
-$attachments->columns( qw( id Filename content_type Headers subject Parent ContentEncoding content_type TransactionId Created));
+$attachments->columns( qw( id Filename content_type Headers subject Parent ContentEncoding content_type transaction_id Created));
my $transactions = $attachments->new_alias('Transactions');
$attachments->join( alias1 => 'main',
- column1 => 'TransactionId',
+ column1 => 'transaction_id',
alias2 => $transactions,
column2 => 'id' );
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/LoadTextAttachments
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/LoadTextAttachments (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/LoadTextAttachments Tue Jan 29 09:34:20 2008
@@ -49,12 +49,12 @@
my $attachments = RT::Model::AttachmentCollection->new();
-$attachments->columns( qw(id Content content_type TransactionId ContentEncoding));
+$attachments->columns( qw(id Content content_type transaction_id ContentEncoding));
if ( $Ticket->current_user_has_right('ShowTicket') ) {
my $transactions = $attachments->new_alias('Transactions');
$attachments->join( alias1 => 'main',
- column1 => 'TransactionId',
+ column1 => 'transaction_id',
alias2 => $transactions,
column2 => 'id' );
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/PreviewScrips Tue Jan 29 09:34:20 2008
@@ -132,7 +132,7 @@
CcMessageTo => $ARGS{'UpdateCc'},
BccMessageTo => $ARGS{'UpdateBcc'},
MIMEObj => $Message,
- TimeTaken => $ARGS{'UpdateTimeWorked'},
+ time_taken => $ARGS{'UpdateTimeWorked'},
DryRun => 1
);
unless ( $Transaction ) {
@@ -168,7 +168,7 @@
CcMessageTo => $ARGS{'UpdateCc'},
BccMessageTo => $ARGS{'UpdateBcc'},
MIMEObj => $Message,
- TimeTaken => $ARGS{'UpdateTimeWorked'},
+ time_taken => $ARGS{'UpdateTimeWorked'},
DryRun => 1
);
unless ( $id && $txn ) {
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Reminders
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Reminders (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Reminders Tue Jan 29 09:34:20 2008
@@ -61,10 +61,10 @@
if ( $request_args->{'update-reminders'} ) {
while ( my $reminder = $reminder_collection->next ) {
- if ( $reminder->Status ne 'resolved' && $request_args->{ 'Complete-Reminder-' . $reminder->id } ) {
+ if ( $reminder->status ne 'resolved' && $request_args->{ 'Complete-Reminder-' . $reminder->id } ) {
$Ticket->reminders->resolve($reminder);
}
- elsif ( $reminder->Status eq 'resolved' && !$request_args->{ 'Complete-Reminder-' . $reminder->id } ) {
+ elsif ( $reminder->status eq 'resolved' && !$request_args->{ 'Complete-Reminder-' . $reminder->id } ) {
$Ticket->reminders->open($reminder);
}
@@ -107,7 +107,7 @@
<input type="hidden" class="hidden" name="update-reminders" value="1" />
<div>
% while (my $reminder = $reminder_collection->next) {
-% if ($reminder->Status eq 'resolved' && !$ShowCompleted) {
+% if ($reminder->status eq 'resolved' && !$ShowCompleted) {
<input type="hidden" class="hidden" name="Complete-Reminder-<% $reminder->id %>" value="1" />
% } elsif ($Edit) {
<& SELF:EditEntry, Reminder => $reminder, Ticket => $Ticket &>
@@ -145,12 +145,12 @@
<input
type="checkbox"
name="Complete-Reminder-<%$Reminder->id%>"
- <% $Reminder->Status eq 'resolved' ? 'CHECKED' : '' %>
+ <% $Reminder->status eq 'resolved' ? 'CHECKED' : '' %>
/>
<input type="text" size="15" name="Reminder-subject-<% $Reminder->id %>" value="<%$Reminder->subject%>" /> •
<& /Elements/SelectOwner, name => 'Reminder-Owner-'.$Reminder->id, Queue => $Ticket->queue_obj, Default => $Reminder->Owner, DefaultValue => 0 &>
<& /Elements/SelectDate, name => 'Reminder-Due-'.$Reminder->id, Default => $Reminder->due_obj->date &>
- (<%$Reminder->due_obj->Unix>0 ? $Reminder->due_obj->age_as_string : '' %>)<br />
+ (<%$Reminder->due_obj->unix>0 ? $Reminder->due_obj->age_as_string : '' %>)<br />
</%method>
<%method ShowEntry>
<%args>
@@ -160,9 +160,9 @@
<input
type="checkbox"
name="Complete-Reminder-<%$Reminder->id%>"
- <% $Reminder->Status eq 'resolved' ? 'CHECKED' : '' %>
+ <% $Reminder->status eq 'resolved' ? 'CHECKED' : '' %>
/>
<%$Reminder->subject%> •
<%$Reminder->owner_obj->name%>
- <%$Reminder->due_obj->Unix>0 ? "• ". $Reminder->due_obj->age_as_string : '' |n%><br />
+ <%$Reminder->due_obj->unix>0 ? "• ". $Reminder->due_obj->age_as_string : '' |n%><br />
</%method>
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowAttachments
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowAttachments (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowAttachments Tue Jan 29 09:34:20 2008
@@ -70,7 +70,7 @@
</%PERL>
<li><font size="-2">
-<a href="<%RT->config->get('WebPath')%>/Ticket/Attachment/<%$rev->TransactionId%>/<%$rev->id%>/<%$rev->filename | u%>">
+<a href="<%RT->config->get('WebPath')%>/Ticket/Attachment/<%$rev->transaction_id%>/<%$rev->id%>/<%$rev->filename | u%>">
<&|/l, $rev->created_as_string, $size, $rev->creator_obj->name &>%1 (%2) by %3</&>
</a>
</font></li>
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowDependencies
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowDependencies (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowDependencies Tue Jan 29 09:34:20 2008
@@ -49,14 +49,14 @@
% while (my $Link = $Ticket->depends_on->next) {
% my $member = $Link->target_obj;
<a href="<%RT->config->get('WebPath')%>/Ticket/Display.html?id=<%$member->id%>"><%$member->id%></a>: (<%$member->owner_obj->name%>) <%$member->subject%>
-[<%$member->Status%>]
+[<%$member->status%>]
<br />
% }
<&|/l&>Depended on by</&>:<br />
% while (my $Link = $Ticket->depended_on_by->next) {
% my $member = $Link->target_obj;
<a href="<%RT->config->get('WebPath')%>/Ticket/Display.html?id=<%$member->id%>"><%$member->id%></a>: (<%$member->owner_obj->name%>) <%$member->subject%>
-[<%$member->Status%>]
+[<%$member->status%>]
<br />
% }
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowHistory
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowHistory (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowHistory Tue Jan 29 09:34:20 2008
@@ -97,10 +97,10 @@
$i++;
- my @trans_attachments = grep { $_->TransactionId == $Transaction->id } @attachments;
+ my @trans_attachments = grep { $_->transaction_id == $Transaction->id } @attachments;
my $trans_content = {};
- grep { ($_->TransactionId == $Transaction->id ) && ($trans_content->{$_->id} = $_) } @attachment_content;
+ grep { ($_->transaction_id == $Transaction->id ) && ($trans_content->{$_->id} = $_) } @attachment_content;
#Args is first because we're clobbering the "Attachments" parameter
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowRequestor
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowRequestor (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowRequestor Tue Jan 29 09:34:20 2008
@@ -73,7 +73,7 @@
<&|/l, $rows &>This user's %1 highest priority tickets</&>:<br />
<ul>
%while (my $w=$tickets->next) {
-<li><a href="<%RT->config->get('WebPath')%><%$DisplayPath%>?id=<%$w->id%>"><%$w->id%>: <%$w->subject%></a> (<%$w->Status%>)
+<li><a href="<%RT->config->get('WebPath')%><%$DisplayPath%>?id=<%$w->id%>"><%$w->id%>: <%$w->subject%></a> (<%$w->status%>)
%}
</ul>
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction Tue Jan 29 09:34:20 2008
@@ -58,7 +58,7 @@
<td class="description">
<% $Transaction->creator_obj->name %> - <% $TicketString %> <% $desc %>
</td>
- <td class="time-taken"><% $TimeTaken %></td>
+ <td class="time-taken"><% $time_taken %></td>
<td class="actions"><% $titlebar_commands |n %></td>
</tr>
@@ -122,7 +122,7 @@
my $transdate = $Transaction->created_as_string();
$transdate =~ s/\s/ /g;
-my ($type, $field) = ($Transaction->type, $Transaction->Field || '');
+my ($type, $field) = ($Transaction->type, $Transaction->field || '');
my $type_class = $class{ $type };
unless ( $type_class ) {
@@ -147,13 +147,13 @@
$TicketString = "Ticket " . $Transaction->ticket . ": ";
}
-my $TimeTaken = '';
-$TimeTaken = $Transaction->TimeTaken . " min"
- if $Transaction->TimeTaken;
+my $time_taken = '';
+$time_taken = $Transaction->time_taken . " min"
+ if $Transaction->time_taken;
unless ($Attachments) {
my $attachments = $Transaction->attachments;
- $attachments->columns( qw( id Filename content_type Headers subject Parent ContentEncoding content_type TransactionId) );
+ $attachments->columns( qw( id Filename content_type Headers subject Parent ContentEncoding content_type transaction_id) );
$Attachments = $attachments->items_array_ref();
}
my $titlebar_commands = ' ';
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/ShowEmailRecord.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/ShowEmailRecord.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/ShowEmailRecord.html Tue Jan 29 09:34:20 2008
@@ -57,7 +57,7 @@
return;
}
my $href = RT->config->get('WebPath') .'/Ticket/Attachment/'
- . $attach->TransactionId .'/'. $attach->id .'/'
+ . $attach->transaction_id .'/'. $attach->id .'/'
. $m->interp->apply_escapes( $attach->filename, 'u' );
$m->out( '<a href="'. $href .'">'. _('download') .'</a>' );
};
@@ -84,7 +84,7 @@
unless ( $AttachmentObj->id ) {
abort(_("Attachment '%1' could not be loaded", $Attachment));
}
-unless ($AttachmentObj->TransactionId() == $Transaction ) {
+unless ($AttachmentObj->transaction_id() == $Transaction ) {
abort(_("Attachment '%1' could not be loaded", $Attachment));
}
Modified: rt/branches/3.999-DANGEROUS/html/Tools/MyDay.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Tools/MyDay.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Tools/MyDay.html Tue Jan 29 09:34:20 2008
@@ -89,7 +89,7 @@
if ( my $content = $ARGS{'UpdateContent-'.$id} ) {
my ( $val, $msg ) = $ticket->comment(
Content => $content,
- TimeTaken => $ARGS{ 'UpdateTimeWorked-' . $id }
+ time_taken => $ARGS{ 'UpdateTimeWorked-' . $id }
);
push @results, _( "Ticket %1: %2", $id, $msg );
} elsif ( my $worked = $ARGS{ 'UpdateTimeWorked-' . $id } ) {
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/CloseTicket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/CloseTicket.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/CloseTicket.pm Tue Jan 29 09:34:20 2008
@@ -66,7 +66,7 @@
my $txn = $self->transaction_obj;
return 0
unless $txn->type eq "Status"
- || ( $txn->type eq "Set" && $txn->Field eq "Status" );
+ || ( $txn->type eq "Set" && $txn->field eq "Status" );
my $queue = $self->ticket_obj->queue_obj;
return 0 unless $queue->is_active_status( $txn->old_value );
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/OwnerChange.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/OwnerChange.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/OwnerChange.pm Tue Jan 29 09:34:20 2008
@@ -63,7 +63,7 @@
sub is_applicable {
my $self = shift;
- if ( ( $self->transaction_obj->Field || '' ) eq 'Owner' ) {
+ if ( ( $self->transaction_obj->field || '' ) eq 'Owner' ) {
return (1);
} else {
return (undef);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/PriorityChange.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/PriorityChange.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/PriorityChange.pm Tue Jan 29 09:34:20 2008
@@ -62,7 +62,7 @@
sub is_applicable {
my $self = shift;
- if ( $self->transaction_obj->Field eq 'Priority' ) {
+ if ( $self->transaction_obj->field eq 'Priority' ) {
return (1);
} else {
return (undef);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/QueueChange.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/QueueChange.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/QueueChange.pm Tue Jan 29 09:34:20 2008
@@ -61,7 +61,7 @@
sub is_applicable {
my $self = shift;
- if ( $self->transaction_obj->Field eq 'Queue' ) {
+ if ( $self->transaction_obj->field eq 'Queue' ) {
return (1);
} else {
return (undef);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/ReopenTicket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/ReopenTicket.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/ReopenTicket.pm Tue Jan 29 09:34:20 2008
@@ -66,7 +66,7 @@
my $txn = $self->transaction_obj;
return 0
unless $txn->type eq "Status"
- || ( $txn->type eq "Set" && $txn->Field eq "Status" );
+ || ( $txn->type eq "Set" && $txn->field eq "Status" );
my $queue = $self->ticket_obj->queue_obj;
return 0 unless $queue->is_inactive_status( $txn->old_value );
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition/StatusChange.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition/StatusChange.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition/StatusChange.pm Tue Jan 29 09:34:20 2008
@@ -62,7 +62,7 @@
sub is_applicable {
my $self = shift;
- if ( ( $self->transaction_obj->Field eq 'Status' )
+ if ( ( $self->transaction_obj->field eq 'Status' )
and ( $self->argument eq $self->transaction_obj->new_value() ) )
{
return (1);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Date.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Date.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Date.pm Tue Jan 29 09:34:20 2008
@@ -426,7 +426,7 @@
$self->set( Format => 'unix', value => ( $self->unix + $delta ) );
- return ( $self->Unix );
+ return ( $self->unix );
}
=head2 AddDays [DAYS]
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 Tue Jan 29 09:34:20 2008
@@ -594,14 +594,14 @@
my $main_content = $txn->content_obj;
my $entity = $main_content->content_as_mime;
- if ( $main_content->Parent ) {
+ if ( $main_content->parent ) {
# main content is not top most entity, we shouldn't loose
# From/To/Cc headers that are on a top part
my $attachments = RT::Model::AttachmentCollection->new(
current_user => $txn->current_user );
- $attachments->columns(qw(id Parent TransactionId Headers));
- $attachments->limit( column => 'TransactionId', value => $txn->id );
+ $attachments->columns(qw(id Parent transaction_id Headers));
+ $attachments->limit( column => 'transaction_id', value => $txn->id );
$attachments->limit( column => 'Parent', value => 0 );
$attachments->limit(
column => 'Parent',
@@ -622,7 +622,7 @@
my $attachments = RT::Model::AttachmentCollection->new(
current_user => $txn->current_user );
- $attachments->limit( column => 'TransactionId', value => $txn->id );
+ $attachments->limit( column => 'transaction_id', value => $txn->id );
$attachments->limit(
column => 'id',
operator => '!=',
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 Tue Jan 29 09:34:20 2008
@@ -574,7 +574,7 @@
Sign => $args{ARGSRef}->{'Sign'},
Encrypt => $args{ARGSRef}->{'Encrypt'},
MIMEObj => $Message,
- TimeTaken => $args{ARGSRef}->{'UpdateTimeWorked'}
+ time_taken => $args{ARGSRef}->{'UpdateTimeWorked'}
);
unless ( $args{'ARGRef'}->{'UpdateIgnoreAddressCheckboxes'} ) {
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ACE.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ACE.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ACE.pm Tue Jan 29 09:34:20 2008
@@ -463,10 +463,10 @@
# {{{ sub delete
-=head2 Delete { InsideTransaction => undef}
+=head2 Delete { inside_transaction => undef}
Delete this object. This method should ONLY ever be called from RT::Model::User or RT::Model::Group (or from itself)
-If this is being called from within a transaction, specify a true value for the parameter InsideTransaction.
+If this is being called from within a transaction, specify a true value for the parameter inside_transaction.
Really, Jifty::DBI should use and/or fake subtransactions
This routine will also recurse and delete any delegations of this right
@@ -501,13 +501,13 @@
sub _delete {
my $self = shift;
my %args = (
- InsideTransaction => undef,
+ inside_transaction => undef,
@_
);
- my $InsideTransaction = $args{'InsideTransaction'};
+ my $inside_transaction = $args{'inside_transaction'};
- Jifty->handle->begin_transaction() unless $InsideTransaction;
+ Jifty->handle->begin_transaction() unless $inside_transaction;
my $delegated_from_this
= RT::Model::ACECollection->new( current_user => RT->system_user );
@@ -521,12 +521,12 @@
my $submsg;
while ( my $delegated_ace = $delegated_from_this->next ) {
( $delete_succeeded, $submsg )
- = $delegated_ace->_delete( InsideTransaction => 1 );
+ = $delegated_ace->_delete( inside_transaction => 1 );
last unless ($delete_succeeded);
}
unless ($delete_succeeded) {
- Jifty->handle->rollback() unless $InsideTransaction;
+ Jifty->handle->rollback() unless $inside_transaction;
return ( 0, _('Right could not be revoked') );
}
@@ -540,7 +540,7 @@
)
{
$val = $self->principal_object->_cleanup_invalid_delegations(
- InsideTransaction => 1 );
+ inside_transaction => 1 );
}
if ($val) {
@@ -548,11 +548,11 @@
#Clear the key cache. TODO someday we may want to just clear a little bit of the keycache space.
# TODO what about the groups key cache?
RT::Model::Principal->invalidate_acl_cache();
- Jifty->handle->commit() unless $InsideTransaction;
+ Jifty->handle->commit() unless $inside_transaction;
return ( $val, _('Right revoked') );
}
- Jifty->handle->rollback() unless $InsideTransaction;
+ Jifty->handle->rollback() unless $inside_transaction;
return ( 0, _('Right could not be revoked') );
}
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 Tue Jan 29 09:34:20 2008
@@ -32,12 +32,12 @@
use Jifty::DBI::Schema;
use Jifty::DBI::Record schema {
column
- TransactionId => max_length is 11,
+ transaction_id => max_length is 11,
type is 'int(11)', default is '0';
column
MessageId => max_length is 200,
type is 'varchar(200)', default is '';
- column Parent => max_length is 11, type is 'int(11)', default is '0';
+ column parent => max_length is 11, type is 'int(11)', default is '0';
column
content_type => max_length is 200,
type is 'varchar(200)', default is '';
@@ -61,8 +61,8 @@
Create a new attachment. Takes a paramhash:
'Attachment' Should be a single MIME body with optional subparts
- 'Parent' is an optional id of the parent attachment
- 'TransactionId' is the mandatory id of the transaction this attachment is associated with.;
+ 'parent' is an optional id of the parent attachment
+ 'transaction_id' is the mandatory id of the transaction this attachment is associated with.;
=cut
@@ -70,8 +70,8 @@
my $self = shift;
my %args = (
id => 0,
- TransactionId => 0,
- Parent => 0,
+ transaction_id => 0,
+ parent => 0,
Attachment => undef,
@_
);
@@ -80,7 +80,7 @@
my $Attachment = $args{'Attachment'};
# if we didn't specify a ticket, we need to bail
- unless ( $args{'TransactionId'} ) {
+ unless ( $args{'transaction_id'} ) {
Jifty->log->fatal(
"RT::Model::Attachment->create couldn't, as you didn't specify a transaction\n"
);
@@ -108,8 +108,8 @@
# and we should act accordingly.
unless ( defined $Attachment->bodyhandle ) {
my ($id) = $self->SUPER::create(
- TransactionId => $args{'TransactionId'},
- Parent => $args{'Parent'},
+ transaction_id => $args{'transaction_id'},
+ parent => $args{'parent'},
content_type => $Attachment->mime_type,
Headers => $Attachment->head->as_string,
MessageId => $MessageId,
@@ -124,8 +124,8 @@
foreach my $part ( $Attachment->parts ) {
my $SubAttachment = RT::Model::Attachment->new();
my ($id) = $SubAttachment->create(
- TransactionId => $args{'TransactionId'},
- Parent => $id,
+ transaction_id => $args{'transaction_id'},
+ parent => $id,
Attachment => $part,
);
unless ($id) {
@@ -144,10 +144,10 @@
$Attachment->mime_type );
my $id = $self->SUPER::create(
- TransactionId => $args{'TransactionId'},
+ transaction_id => $args{'transaction_id'},
content_type => $Attachment->mime_type,
ContentEncoding => $ContentEncoding,
- Parent => $args{'Parent'},
+ parent => $args{'parent'},
Headers => $Attachment->head->as_string,
subject => $subject,
Content => $Body,
@@ -191,14 +191,14 @@
unless ( $self->{_transaction_obj} ) {
$self->{_transaction_obj} = RT::Model::Transaction->new;
- $self->{_transaction_obj}->load( $self->TransactionId );
+ $self->{_transaction_obj}->load( $self->transaction_id );
}
unless ( $self->{_transaction_obj}->id ) {
Jifty->log->fatal( "Attachment "
. $self->id
. " can't find transaction "
- . $self->TransactionId
+ . $self->transaction_id
. " which it is ostensibly part of. That's bad" );
}
return $self->{_transaction_obj};
@@ -213,10 +213,10 @@
sub parent_obj {
my $self = shift;
- return undef unless $self->Parent;
+ return undef unless $self->parent;
my $parent = RT::Model::Attachment->new;
- $parent->load_by_id( $self->Parent );
+ $parent->load_by_id( $self->parent );
return $parent;
}
@@ -224,7 +224,7 @@
Returns an L<RT::Model::AttachmentCollection> object which is preloaded with
all attachments objects with this attachment\'s id as their
-C<Parent>.
+C<parent>.
=cut
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/AttachmentCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/AttachmentCollection.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/AttachmentCollection.pm Tue Jan 29 09:34:20 2008
@@ -107,7 +107,7 @@
my $res = $self->new_alias('Transactions');
$self->limit(
entry_aggregator => 'AND',
- column => 'TransactionId',
+ column => 'transaction_id',
value => $res . '.id',
quote_value => 0,
);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/CachedGroupMember.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/CachedGroupMember.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/CachedGroupMember.pm Tue Jan 29 09:34:20 2008
@@ -222,7 +222,7 @@
while ( my $delegation = $delegations->next ) {
# WHACK IT
- my $del_ret = $delegation->_delete( InsideTransaction => 1 );
+ my $del_ret = $delegation->_delete( inside_transaction => 1 );
unless ($del_ret) {
Jifty->log->fatal(
"Couldn't delete an ACL delegation that we know exists "
@@ -310,7 +310,7 @@
while ( my $delegation = $delegations->next ) {
# WHACK IT
- my $del_ret = $delegation->_delete( InsideTransaction => 1 );
+ my $del_ret = $delegation->_delete( inside_transaction => 1 );
unless ($del_ret) {
Jifty->log->fatal(
"Couldn't delete an ACL delegation that we know exists "
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm Tue Jan 29 09:34:20 2008
@@ -531,7 +531,7 @@
if ( $class eq 'RT::Model::CustomFieldValueCollection' ) {
return $self->delete_attribute('ValuesClass');
}
- return $self->set_attribute( name => 'ValuesClass', Content => $class );
+ return $self->set_attribute( name => 'ValuesClass', content => $class );
}
=head2 FriendlyType [TYPE, MAX_valueS]
@@ -1206,7 +1206,7 @@
unless ( $self->current_user_has_right('AdminCustomField') ) {
return ( 0, _('Permission Denied') );
}
- $self->set_attribute( name => $template_name, Content => $value );
+ $self->set_attribute( name => $template_name, content => $value );
return ( 1, _('Updated') );
} else {
unless ( $self->id
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 Tue Jan 29 09:34:20 2008
@@ -292,13 +292,13 @@
sub load_queue_role_group {
my $self = shift;
my %args = (
- Queue => undef,
+ queue => undef,
type => undef,
@_
);
$self->load_by_cols(
domain => 'RT::Model::Queue-Role',
- instance => $args{'Queue'},
+ instance => $args{'queue'},
type => $args{'type'}
);
}
@@ -366,11 +366,11 @@
domain => undef,
type => undef,
instance => '0',
- InsideTransaction => undef,
+ inside_transaction => undef,
_record_transaction => 1,
@_
);
- Jifty->handle->begin_transaction() unless ( $args{'InsideTransaction'} );
+ Jifty->handle->begin_transaction() unless ( $args{'inside_transaction'} );
# Groups deal with principal ids, rather than user ids.
# When creating this group, set up a principal id for it.
@@ -396,7 +396,7 @@
# If we couldn't create a principal Id, get the fuck out.
unless ($principal_id) {
- Jifty->handle->rollback() unless ( $args{'InsideTransaction'} );
+ Jifty->handle->rollback() unless ( $args{'inside_transaction'} );
Jifty->log->fatal(
"Couldn't create a Principal on new user create. Strange things are afoot at the circle K"
);
@@ -421,7 +421,7 @@
$self->_new_transaction( type => "Create" );
}
- Jifty->handle->commit() unless ( $args{'InsideTransaction'} );
+ Jifty->handle->commit() unless ( $args{'inside_transaction'} );
return ( $id, _("Group Created") );
}
@@ -480,7 +480,7 @@
name => 'User ' . $princ->object->id,
description => 'ACL equiv. for user ' . $princ->object->id,
instance => $princ->id,
- InsideTransaction => 1
+ inside_transaction => 1
);
unless ($id) {
@@ -592,7 +592,7 @@
domain => $args{'domain'},
instance => $args{'instance'},
type => $args{'type'},
- InsideTransaction => 1
+ inside_transaction => 1
)
);
}
@@ -935,13 +935,13 @@
# In the dim future, this will all get factored out and life
# will get better
-# takes a paramhash of { principal_id => undef, InsideTransaction }
+# takes a paramhash of { principal_id => undef, inside_transaction }
sub _add_member {
my $self = shift;
my %args = (
principal_id => undef,
- InsideTransaction => undef,
+ inside_transaction => undef,
@_
);
my $new_member = $args{'principal_id'};
@@ -985,7 +985,7 @@
my $id = $member_object->create(
Member => $new_member_obj,
Group => $self->principal_object,
- InsideTransaction => $args{'InsideTransaction'}
+ inside_transaction => $args{'inside_transaction'}
);
if ($id) {
return ( 1, _("Member added") );
@@ -1171,7 +1171,7 @@
# {{{ sub _cleanup_invalid_delegations
-=head2 _cleanup_invalid_delegations { InsideTransaction => undef }
+=head2 _cleanup_invalid_delegations { inside_transaction => undef }
Revokes all ACE entries delegated by members of this group which are
inconsistent with their current delegation rights. Does not perform
@@ -1179,7 +1179,7 @@
library.
If called from inside a transaction, specify a true value for the
-InsideTransaction parameter.
+inside_transaction parameter.
Returns a true value if the deletion succeeded; returns a false value
and logs an internal error if the deletion fails (should not happen).
@@ -1194,7 +1194,7 @@
sub _cleanup_invalid_delegations {
my $self = shift;
my %args = (
- InsideTransaction => undef,
+ inside_transaction => undef,
@_
);
@@ -1203,7 +1203,7 @@
return (undef);
}
- my $in_trans = $args{InsideTransaction};
+ my $in_trans = $args{inside_transaction};
# TODO: Can this be unrolled such that the number of DB queries is constant rather than linear in exploded group size?
my $members = $self->deep_members_obj();
@@ -1211,7 +1211,7 @@
Jifty->handle->begin_transaction() unless $in_trans;
while ( my $member = $members->next() ) {
my $ret = $member->member_obj->_cleanup_invalid_delegations(
- InsideTransaction => 1,
+ inside_transaction => 1,
Object => $args{Object}
);
unless ($ret) {
@@ -1274,7 +1274,7 @@
Field => $args{'Field'},
new_value => $args{'Value'},
old_value => $Old,
- TimeTaken => $args{'TimeTaken'},
+ time_taken => $args{'time_taken'},
);
return ( $Trans, scalar $TransObj->description );
} else {
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm Tue Jan 29 09:34:20 2008
@@ -57,7 +57,7 @@
my %args = (
Group => undef,
Member => undef,
- InsideTransaction => undef,
+ inside_transaction => undef,
@_
);
@@ -89,7 +89,7 @@
# TODO what about the groups key cache?
RT::Model::Principal->invalidate_acl_cache();
- Jifty->handle->begin_transaction() unless ( $args{'InsideTransaction'} );
+ Jifty->handle->begin_transaction() unless ( $args{'inside_transaction'} );
# We really need to make sure we don't add any members to this group
# that contain the group itself. that would, um, suck.
@@ -113,7 +113,7 @@
);
unless ($id) {
- Jifty->handle->rollback() unless ( $args{'InsideTransaction'} );
+ Jifty->handle->rollback() unless ( $args{'inside_transaction'} );
return (undef);
}
@@ -150,17 +150,17 @@
Jifty->log->err( "Couldn't add "
. $args{'Member'}
. " as a submember of a supergroup" );
- Jifty->handle->rollback() unless ( $args{'InsideTransaction'} );
+ Jifty->handle->rollback() unless ( $args{'inside_transaction'} );
return (undef);
}
}
unless ($cached_id) {
- Jifty->handle->rollback() unless ( $args{'InsideTransaction'} );
+ Jifty->handle->rollback() unless ( $args{'inside_transaction'} );
return (undef);
}
- Jifty->handle->commit() unless ( $args{'InsideTransaction'} );
+ Jifty->handle->commit() unless ( $args{'inside_transaction'} );
return ($id);
}
@@ -288,7 +288,7 @@
# remain.
( $err, $msg )
= $self->member_obj->_cleanup_invalid_delegations(
- InsideTransaction => 1 );
+ inside_transaction => 1 );
unless ($err) {
Jifty->log->warn(
"Unable to revoke delegated rights for principal " . $self->id );
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm Tue Jan 29 09:34:20 2008
@@ -240,7 +240,7 @@
# {{{ sub _cleanup_invalid_delegations
-=head2 sub _cleanup_invalid_delegations { InsideTransaction => undef }
+=head2 sub _cleanup_invalid_delegations { inside_transaction => undef }
Revokes all ACE entries delegated by this principal which are
inconsistent with this principal's current delegation rights. Does
@@ -252,7 +252,7 @@
cached user member of itself.
If called from inside a transaction, specify a true value for the
-InsideTransaction parameter.
+inside_transaction parameter.
Returns a true value if the deletion succeeded; returns a false value
and logs an internal error if the deletion fails (should not happen).
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 Tue Jan 29 09:34:20 2008
@@ -511,7 +511,7 @@
my ( $status, $msg ) = $self->set_attribute(
name => 'Sign',
description => 'Sign outgoing messages by default',
- Content => $value,
+ content => $value,
);
return ( $status, $msg ) unless $status;
return ( $status, _('Signing enabled') ) if $value;
@@ -537,7 +537,7 @@
my ( $status, $msg ) = $self->set_attribute(
name => 'Encrypt',
description => 'Encrypt outgoing messages by default',
- Content => $value,
+ content => $value,
);
return ( $status, $msg ) unless $status;
return ( $status, _('Encrypting enabled') ) if $value;
@@ -809,7 +809,7 @@
my $group = RT::Model::Group->new;
$group->load_queue_role_group(
type => $args{'type'},
- Queue => $self->id
+ queue => $self->id
);
unless ( $group->id ) {
return ( 0, _("Group not found") );
@@ -888,7 +888,7 @@
my $group = RT::Model::Group->new;
$group->load_queue_role_group(
type => $args{'type'},
- Queue => $self->id
+ queue => $self->id
);
unless ( $group->id ) {
return ( 0, _("Group not found") );
@@ -1026,7 +1026,7 @@
my $group = RT::Model::Group->new;
if ( $self->current_user_has_right('SeeQueue') ) {
- $group->load_queue_role_group( type => 'Cc', Queue => $self->id );
+ $group->load_queue_role_group( type => 'Cc', queue => $self->id );
}
return ($group);
@@ -1051,7 +1051,7 @@
if ( $self->current_user_has_right('SeeQueue') ) {
$group->load_queue_role_group(
type => 'AdminCc',
- Queue => $self->id
+ queue => $self->id
);
}
return ($group);
@@ -1091,7 +1091,7 @@
my $group = RT::Model::Group->new;
$group->load_queue_role_group(
type => $args{'type'},
- Queue => $self->id
+ queue => $self->id
);
# Ask if it has the member in question
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm Tue Jan 29 09:34:20 2008
@@ -606,7 +606,7 @@
# kill performance, bigtime. It gets kept in lockstep thanks to the magic of transactionalization
( $val, $msg ) = $self->owner_group->_add_member(
principal_id => $Owner->principal_id,
- InsideTransaction => 1
+ inside_transaction => 1
) unless $DeferOwner;
# {{{ Deal with setting up watchers
@@ -738,7 +738,7 @@
}
$self->owner_group->_add_member(
principal_id => $Owner->principal_id,
- InsideTransaction => 1
+ inside_transaction => 1
);
}
@@ -747,7 +747,7 @@
# {{{ Add a transaction for the create
my ( $Trans, $Msg, $TransObj ) = $self->_new_transaction(
type => "Create",
- TimeTaken => $args{'time_worked'},
+ time_taken => $args{'time_worked'},
MIMEObj => $args{'MIMEObj'},
commit_scrips => !$args{'DryRun'},
);
@@ -1237,7 +1237,7 @@
my ( $m_id, $m_msg ) = $group->_add_member(
principal_id => $principal->id,
- InsideTransaction => 1
+ inside_transaction => 1
);
unless ($m_id) {
Jifty->log->error( "Failed to add "
@@ -2110,7 +2110,7 @@
If MIMEObj is undefined, Content will be used to build a MIME::Entity for this
commentl
-MIMEObj, TimeTaken, CcMessageTo, BccMessageTo, Content, DryRun
+MIMEObj, time_taken, CcMessageTo, BccMessageTo, Content, DryRun
If DryRun is defined, this update WILL NOT BE RECORDED. Scrips will not be committed.
They will, however, be prepared and you'll be able to access them through the transaction_obj
@@ -2128,7 +2128,7 @@
BccMessageTo => undef,
MIMEObj => undef,
Content => undef,
- TimeTaken => 0,
+ time_taken => 0,
DryRun => 0,
@_
);
@@ -2161,7 +2161,7 @@
Takes a hashref with the following attributes:
-MIMEObj, TimeTaken, CcMessageTo, BccMessageTo, Content, DryRun
+MIMEObj, time_taken, CcMessageTo, BccMessageTo, Content, DryRun
if there's no MIMEObj, Content is used to build a MIME::Entity object
@@ -2181,7 +2181,7 @@
BccMessageTo => undef,
MIMEObj => undef,
Content => undef,
- TimeTaken => 0,
+ time_taken => 0,
@_
);
@@ -2233,7 +2233,7 @@
MIMEObj => undef,
Content => undef,
NoteType => 'Correspond',
- TimeTaken => 0,
+ time_taken => 0,
commit_scrips => 1,
@_
);
@@ -2290,7 +2290,7 @@
my ( $Trans, $msg, $TransObj ) = $self->_new_transaction(
type => $args{'NoteType'},
Data => ( $args{'MIMEObj'}->head->get('subject') || 'No subject' ),
- TimeTaken => $args{'TimeTaken'},
+ time_taken => $args{'time_taken'},
MIMEObj => $args{'MIMEObj'},
commit_scrips => $args{'commit_scrips'},
);
@@ -2432,7 +2432,7 @@
type => 'DeleteLink',
Field => $LINKDIRMAP{ $args{'type'} }->{$direction},
old_value => $remote_uri->uri || $remote_link,
- TimeTaken => 0
+ time_taken => 0
);
Jifty->log->error("Couldn't create transaction: $Msg") unless $Trans;
}
@@ -2448,7 +2448,7 @@
: $LINKDIRMAP{ $args{'type'} }->{Target},
old_value => $self->uri,
ActivateScrips => !RT->config->get('LinkTransactionsRun1Scrip'),
- TimeTaken => 0,
+ time_taken => 0,
);
Jifty->log->error("Couldn't create transaction: $Msg") unless $val;
}
@@ -2574,7 +2574,7 @@
type => 'AddLink',
Field => $LINKDIRMAP{ $args{'type'} }->{$direction},
new_value => $remote_uri->uri || $remote_link,
- TimeTaken => 0
+ time_taken => 0
);
Jifty->log->error("Couldn't create transaction: $Msg") unless $Trans;
}
@@ -2590,7 +2590,7 @@
: $LINKDIRMAP{ $args{'type'} }->{Target},
new_value => $self->uri,
ActivateScrips => !RT->config->get('LinkTransactionsRun1Scrip'),
- TimeTaken => 0,
+ time_taken => 0,
);
Jifty->log->error("Couldn't create transaction: $msg") unless $val;
}
@@ -2738,8 +2738,12 @@
#add all of this ticket's watchers to that ticket.
foreach my $watcher_type qw(Requestors Cc AdminCc) {
+ # XXX: artefact of API change
+ my $method = $watcher_type;
+ $method =~ s/(?<=[a-z])(?=[A-Z])/_/;
+ $method = lc $method;
- my $people = $self->$watcher_type->members_obj;
+ my $people = $self->$method->members_obj;
my $addwatcher_type = $watcher_type;
$addwatcher_type =~ s/s$//;
@@ -2932,7 +2936,7 @@
}
my ( $add_id, $add_msg ) = $self->owner_group->_add_member(
principal_id => $NewOwnerObj->principal_id,
- InsideTransaction => 1
+ inside_transaction => 1
);
unless ($add_id) {
Jifty->handle->rollback();
@@ -2946,7 +2950,7 @@
column => 'Owner',
value => $NewOwnerObj->id,
record_transaction => 0,
- TimeTaken => 0,
+ time_taken => 0,
TransactionType => $Type,
CheckACL => 0, # don't check acl
);
@@ -2961,7 +2965,7 @@
Field => 'Owner',
new_value => $NewOwnerObj->id,
old_value => $OldOwnerObj->id,
- TimeTaken => 0,
+ time_taken => 0,
);
if ($val) {
@@ -3133,7 +3137,7 @@
my ( $val, $msg ) = $self->_set(
column => 'status',
value => $args{status},
- TimeTaken => 0,
+ time_taken => 0,
CheckACL => 0,
TransactionType => 'status'
);
@@ -3256,7 +3260,7 @@
$self->_set(
column => 'Told',
value => $datetold->iso,
- TimeTaken => $timetaken,
+ time_taken => $timetaken,
TransactionType => 'Told'
)
);
@@ -3392,7 +3396,7 @@
my %args = (
column => undef,
value => undef,
- TimeTaken => 0,
+ time_taken => 0,
record_transaction => 1,
UpdateTicket => 1,
CheckACL => 1,
@@ -3445,7 +3449,7 @@
Field => $args{'column'},
new_value => $args{'value'},
old_value => $Old,
- TimeTaken => $args{'TimeTaken'},
+ time_taken => $args{'time_taken'},
);
return ( $Trans, scalar $TransObj->brief_description );
} else {
@@ -3488,9 +3492,9 @@
# }}}
-# {{{ sub _UpdateTimeTaken
+# {{{ sub _update_time_taken
-=head2 _UpdateTimeTaken
+=head2 _update_time_taken
This routine will increment the time_worked counter. it should
only be called from _new_transaction
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm Tue Jan 29 09:34:20 2008
@@ -726,7 +726,7 @@
alias1 => $self->{_sql_transalias},
column1 => 'id',
table2 => 'Attachments',
- column2 => 'TransactionId',
+ column2 => 'transaction_id',
);
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm Tue Jan 29 09:34:20 2008
@@ -26,9 +26,9 @@
object_type => max_length is 64,
type is 'varchar(64)', default is '';
column object_id => max_length is 11, type is 'int(11)', default is '0';
- column TimeTaken => max_length is 11, type is 'int(11)', default is '0';
+ column time_taken => max_length is 11, type is 'int(11)', default is '0';
column type => max_length is 20, type is 'varchar(20)', default is '';
- column Field => max_length is 40, type is 'varchar(40)', default is '';
+ column field => max_length is 40, type is 'varchar(40)', default is '';
column
old_value => max_length is 255,
type is 'varchar(255)', default is '';
@@ -36,10 +36,10 @@
new_value => max_length is 255,
type is 'varchar(255)', default is '';
column
- ReferenceType => max_length is 255,
+ reference_type => max_length is 255,
type is 'varchar(255)', default is '';
- column OldReference => max_length is 11, type is 'int(11)', default is '';
- column NewReference => max_length is 11, type is 'int(11)', default is '';
+ column old_reference => max_length is 11, type is 'int(11)', default is '';
+ column new_reference => max_length is 11, type is 'int(11)', default is '';
column Data => max_length is 255, type is 'varchar(255)', default is '';
column Creator => max_length is 11, type is 'int(11)', default is '0';
column Created => type is 'datetime', default is '';
@@ -80,19 +80,19 @@
=cut
-=head2 TimeTaken
+=head2 time_taken
-Returns the current value of TimeTaken.
-(In the database, TimeTaken is stored as int(11).)
+Returns the current value of time_taken.
+(In the database, time_taken is stored as int(11).)
=head2 SetTimeTaken value
-Set TimeTaken to value.
+Set time_taken to value.
Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, TimeTaken will be stored as a int(11).)
+(In the database, time_taken will be stored as a int(11).)
=cut
@@ -114,19 +114,19 @@
=cut
-=head2 Field
+=head2 field
-Returns the current value of Field.
-(In the database, Field is stored as varchar(40).)
+Returns the current value of field.
+(In the database, field is stored as varchar(40).)
=head2 SetField value
-Set Field to value.
+Set field to value.
Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, Field will be stored as a varchar(40).)
+(In the database, field will be stored as a varchar(40).)
=cut
@@ -165,53 +165,53 @@
=cut
-=head2 ReferenceType
+=head2 reference_type
-Returns the current value of ReferenceType.
-(In the database, ReferenceType is stored as varchar(255).)
+Returns the current value of reference_type.
+(In the database, reference_type is stored as varchar(255).)
=head2 SetReferenceType value
-Set ReferenceType to value.
+Set reference_type to value.
Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, ReferenceType will be stored as a varchar(255).)
+(In the database, reference_type will be stored as a varchar(255).)
=cut
-=head2 OldReference
+=head2 old_reference
-Returns the current value of OldReference.
-(In the database, OldReference is stored as int(11).)
+Returns the current value of old_reference.
+(In the database, old_reference is stored as int(11).)
=head2 SetOldReference value
-Set OldReference to value.
+Set old_reference to value.
Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, OldReference will be stored as a int(11).)
+(In the database, old_reference will be stored as a int(11).)
=cut
-=head2 NewReference
+=head2 new_reference
-Returns the current value of NewReference.
-(In the database, NewReference is stored as int(11).)
+Returns the current value of new_reference.
+(In the database, new_reference is stored as int(11).)
=head2 SetNewReference value
-Set NewReference to value.
+Set new_reference to value.
Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
-(In the database, NewReference will be stored as a int(11).)
+(In the database, new_reference will be stored as a int(11).)
=cut
@@ -278,10 +278,10 @@
my $self = shift;
my %args = (
id => undef,
- TimeTaken => 0,
+ time_taken => 0,
type => 'undefined',
Data => '',
- Field => undef,
+ field => undef,
old_value => undef,
new_value => undef,
MIMEObj => undef,
@@ -289,9 +289,9 @@
commit_scrips => 1,
object_type => 'RT::Model::Ticket',
object_id => 0,
- ReferenceType => undef,
- OldReference => undef,
- NewReference => undef,
+ reference_type => undef,
+ old_reference => undef,
+ new_reference => undef,
@_
);
@@ -310,20 +310,20 @@
my %params = (
type => $args{'type'},
Data => $args{'Data'},
- Field => $args{'Field'},
+ field => $args{'field'},
old_value => $args{'old_value'},
new_value => $args{'new_value'},
Created => $args{'Created'},
object_type => $args{'object_type'},
object_id => $args{'object_id'},
- ReferenceType => $args{'ReferenceType'},
- OldReference => $args{'OldReference'},
- NewReference => $args{'NewReference'},
+ reference_type => $args{'reference_type'},
+ old_reference => $args{'old_reference'},
+ new_reference => $args{'new_reference'},
);
# Parameters passed in during an import that we probably don't want to touch, otherwise
foreach my $attr
- qw(id Creator Created LastUpdated TimeTaken LastUpdatedBy) {
+ qw(id Creator Created LastUpdated time_taken LastUpdatedBy) {
$params{$attr} = $args{$attr} if ( $args{$attr} );
}
@@ -437,7 +437,7 @@
$self->{'message'} = RT::Model::AttachmentCollection->new();
$self->{'message'}->limit(
- column => 'TransactionId',
+ column => 'transaction_id',
value => $self->id
);
$self->{'message'}->children_of(0);
@@ -646,7 +646,7 @@
}
$self->{'attachments'}
- ->limit( column => 'TransactionId', value => $self->id );
+ ->limit( column => 'transaction_id', value => $self->id );
# Get the self->{'attachments'} in the order they're put into
# the database. Arguably, we should be returning a tree
@@ -680,7 +680,7 @@
my $Attachment = RT::Model::Attachment->new;
my ( $id, $msg ) = $Attachment->create(
- TransactionId => $self->id,
+ transaction_id => $self->id,
Attachment => $MIMEObject
);
return ( $Attachment, $msg || _("Attachment Created") );
@@ -743,7 +743,7 @@
if ( $type eq 'Create' ) {
return ( _( "%1 Created", $obj_type ) );
} elsif ( $type =~ /Status/ ) {
- if ( $self->Field eq 'Status' ) {
+ if ( $self->field eq 'Status' ) {
if ( $self->new_value eq 'deleted' ) {
return ( _( "%1 deleted", $obj_type ) );
} else {
@@ -761,7 +761,7 @@
my $no_value = _("(no value)");
return (
_( "%1 changed from %2 to %3",
- $self->Field,
+ $self->field,
( $self->old_value
? "'" . $self->old_value . "'"
: $no_value
@@ -778,7 +778,7 @@
return _(
"Default: %1/%2 changed from %3 to %4",
$type,
- $self->Field,
+ $self->field,
( $self->old_value
? "'" . $self->old_value . "'"
: _("(no value)")
@@ -808,9 +808,9 @@
my $self = shift;
my $field = _('CustomField');
- if ( $self->Field ) {
+ if ( $self->field ) {
my $cf = RT::Model::CustomField->new;
- $cf->load( $self->Field );
+ $cf->load( $self->field );
$field = $cf->name();
}
@@ -858,13 +858,13 @@
my $self = shift;
my $principal = RT::Model::Principal->new;
$principal->load( $self->new_value );
- return _( "%1 %2 added", $self->Field, $principal->object->name );
+ return _( "%1 %2 added", $self->field, $principal->object->name );
},
del_watcher => sub {
my $self = shift;
my $principal = RT::Model::Principal->new;
$principal->load( $self->old_value );
- return _( "%1 %2 deleted", $self->Field, $principal->object->name );
+ return _( "%1 %2 deleted", $self->field, $principal->object->name );
},
subject => sub {
my $self = shift;
@@ -881,20 +881,20 @@
} else {
$value = $self->new_value;
}
- if ( $self->Field eq 'DependsOn' ) {
+ if ( $self->field eq 'DependsOn' ) {
return _( "Dependency on %1 added", $value );
- } elsif ( $self->Field eq 'DependedOnBy' ) {
+ } elsif ( $self->field eq 'DependedOnBy' ) {
return _( "Dependency by %1 added", $value );
- } elsif ( $self->Field eq 'RefersTo' ) {
+ } elsif ( $self->field eq 'RefersTo' ) {
return _( "Reference to %1 added", $value );
- } elsif ( $self->Field eq 'ReferredToBy' ) {
+ } elsif ( $self->field eq 'ReferredToBy' ) {
return _( "Reference by %1 added", $value );
- } elsif ( $self->Field eq 'MemberOf' ) {
+ } elsif ( $self->field eq 'MemberOf' ) {
return _( "Membership in %1 added", $value );
- } elsif ( $self->Field eq 'has_member' ) {
+ } elsif ( $self->field eq 'has_member' ) {
return _( "Member %1 added", $value );
- } elsif ( $self->Field eq 'MergedInto' ) {
+ } elsif ( $self->field eq 'MergedInto' ) {
return _( "Merged into %1", $value );
}
} else {
@@ -913,18 +913,18 @@
$value = $self->old_value;
}
- if ( $self->Field eq 'DependsOn' ) {
+ if ( $self->field eq 'DependsOn' ) {
return _( "Dependency on %1 deleted", $value );
- } elsif ( $self->Field eq 'DependedOnBy' ) {
+ } elsif ( $self->field eq 'DependedOnBy' ) {
return _( "Dependency by %1 deleted", $value );
- } elsif ( $self->Field eq 'RefersTo' ) {
+ } elsif ( $self->field eq 'RefersTo' ) {
return _( "Reference to %1 deleted", $value );
- } elsif ( $self->Field eq 'ReferredToBy' ) {
+ } elsif ( $self->field eq 'ReferredToBy' ) {
return _( "Reference by %1 deleted", $value );
- } elsif ( $self->Field eq 'MemberOf' ) {
+ } elsif ( $self->field eq 'MemberOf' ) {
return _( "Membership in %1 deleted", $value );
- } elsif ( $self->Field eq 'has_member' ) {
+ } elsif ( $self->field eq 'has_member' ) {
return _( "Member %1 deleted", $value );
}
} else {
@@ -933,31 +933,31 @@
},
Set => sub {
my $self = shift;
- if ( $self->Field eq 'password' ) {
+ if ( $self->field eq 'password' ) {
return _('password changed');
- } elsif ( $self->Field eq 'Queue' ) {
+ } elsif ( $self->field eq 'Queue' ) {
my $q1 = RT::Model::Queue->new();
$q1->load( $self->old_value );
my $q2 = RT::Model::Queue->new();
$q2->load( $self->new_value );
return _( "%1 changed from %2 to %3",
- $self->Field, $q1->name, $q2->name );
+ $self->field, $q1->name, $q2->name );
}
# Write the date/time change at local time:
- elsif ( $self->Field =~ /Due|starts|Started|Told/ ) {
+ elsif ( $self->field =~ /Due|starts|Started|Told/i ) {
my $t1 = RT::Date->new();
$t1->set( Format => 'ISO', value => $self->new_value );
my $t2 = RT::Date->new();
$t2->set( Format => 'ISO', value => $self->old_value );
return _(
- "%1 changed from %2 to %3", $self->Field,
+ "%1 changed from %2 to %3", $self->field,
$t2->as_string, $t1->as_string
);
} else {
return _(
"%1 changed from %2 to %3",
- $self->Field,
+ $self->field,
( $self->old_value
? "'" . $self->old_value . "'"
: _("(no value)")
@@ -1102,7 +1102,7 @@
}
# Make sure the user can see the custom field before showing that it changed
- elsif ( $type eq 'CustomField' and my $cf_id = $self->__value('Field') ) {
+ elsif ( $type eq 'CustomField' and my $cf_id = $self->__value('field') ) {
my $cf = RT::Model::CustomField->new;
$cf->load($cf_id);
return 0 unless $cf->current_user_has_right('SeeCustomField');
@@ -1132,8 +1132,8 @@
sub old_value {
my $self = shift;
- if ( my $type = $self->__value('ReferenceType')
- and my $id = $self->__value('OldReference') )
+ if ( my $type = $self->__value('reference_type')
+ and my $id = $self->__value('old_reference') )
{
my $Object = $type->new;
$Object->load($id);
@@ -1145,8 +1145,8 @@
sub new_value {
my $self = shift;
- if ( my $type = $self->__value('ReferenceType')
- and my $id = $self->__value('NewReference') )
+ if ( my $type = $self->__value('reference_type')
+ and my $id = $self->__value('new_reference') )
{
my $Object = $type->new;
$Object->load($id);
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 Tue Jan 29 09:34:20 2008
@@ -233,7 +233,7 @@
}
my ( $everyone_id, $everyone_msg ) = $everyone->_add_member(
- InsideTransaction => 1,
+ inside_transaction => 1,
principal_id => $self->principal_id
);
unless ($everyone_id) {
@@ -260,7 +260,7 @@
}
my ( $ac_id, $ac_msg ) = $access_class->_add_member(
- InsideTransaction => 1,
+ inside_transaction => 1,
principal_id => $self->principal_id
);
@@ -344,7 +344,7 @@
. "unprivileged. something is drastically wrong." );
}
my ( $status, $msg ) = $priv->_add_member(
- InsideTransaction => 1,
+ inside_transaction => 1,
principal_id => $self->principal_id
);
if ($status) {
@@ -371,7 +371,7 @@
. "unprivileged. something is drastically wrong." );
}
my ( $status, $msg ) = $unpriv->_add_member(
- InsideTransaction => 1,
+ inside_transaction => 1,
principal_id => $self->principal_id
);
if ($status) {
@@ -1172,14 +1172,14 @@
# {{{ sub _cleanup_invalid_delegations
-=head2 _cleanup_invalid_delegations { InsideTransaction => undef }
+=head2 _cleanup_invalid_delegations { inside_transaction => undef }
Revokes all ACE entries delegated by this user which are inconsistent
with their current delegation rights. Does not perform permission
checks. Should only ever be called from inside the RT library.
If called from inside a transaction, specify a true value for the
-InsideTransaction parameter.
+inside_transaction parameter.
Returns a true value if the deletion succeeded; returns a false value
and logs an internal error if the deletion fails (should not happen).
@@ -1194,7 +1194,7 @@
sub _cleanup_invalid_delegations {
my $self = shift;
my %args = (
- InsideTransaction => undef,
+ inside_transaction => undef,
@_
);
@@ -1203,7 +1203,7 @@
return (undef);
}
- my $in_trans = $args{InsideTransaction};
+ my $in_trans = $args{inside_transaction};
return (1)
if (
@@ -1240,7 +1240,7 @@
# Delete all disallowed delegations
while ( my $ace = $acl_to_del->next() ) {
- my $ret = $ace->_delete( InsideTransaction => 1 );
+ my $ret = $ace->_delete( inside_transaction => 1 );
unless ($ret) {
Jifty->handle->rollback() unless $in_trans;
Jifty->log->warn(
@@ -1297,7 +1297,7 @@
Field => $args{'column'},
new_value => $args{'value'},
old_value => $Old,
- TimeTaken => $args{'TimeTaken'},
+ time_taken => $args{'time_taken'},
);
return ( $Trans, scalar $TransObj->brief_description );
} else {
@@ -1410,7 +1410,7 @@
$prefkey = $keys[0]->{'Fingerprint'};
}
- $self->set_attribute( name => 'preferred_key', Content => $prefkey );
+ $self->set_attribute( name => 'preferred_key', content => $prefkey );
return $prefkey;
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Record.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Record.pm Tue Jan 29 09:34:20 2008
@@ -193,8 +193,8 @@
my $self = shift;
my %args = (
name => undef,
- Description => undef,
- Content => undef,
+ description => undef,
+ content => undef,
@_
);
@@ -916,11 +916,11 @@
my $deps = $self->unresolved_dependencies;
- if ( $args{Type} ) {
+ if ( $args{'type'} ) {
$deps->limit(
column => 'type',
operator => '=',
- value => $args{Type}
+ value => $args{'type'}
);
} else {
$deps->ignore_type;
@@ -985,10 +985,10 @@
next unless ( $link->base_uri->is_local() );
next if $args{_found}{ $link->base_obj->id };
- if ( !$args{Type} ) {
+ if ( !$args{'type'} ) {
$args{_found}{ $link->base_obj->id } = $link->base_obj;
$link->base_obj->all_depended_on_by( %args, _top => 0 );
- } elsif ( $link->base_obj->type eq $args{Type} ) {
+ } elsif ( $link->base_obj->type eq $args{'type'} ) {
$args{_found}{ $link->base_obj->id } = $link->base_obj;
} else {
$link->base_obj->all_depended_on_by( %args, _top => 0 );
@@ -1125,7 +1125,7 @@
my ( $linkid, $linkmsg ) = $link->create(
Target => $args{Target},
Base => $args{Base},
- type => $args{Type}
+ type => $args{'type'}
);
unless ($linkid) {
@@ -1134,7 +1134,7 @@
}
my $TransString
- = "Record $args{'Base'} $args{Type} record $args{'Target'}.";
+ = "Record $args{'Base'} $args{'type'} record $args{'Target'}.";
return ( $linkid, _( "Link Created (%1)", $TransString ) );
}
@@ -1202,7 +1202,7 @@
$link->delete();
my $TransString
- = "Record $args{'Base'} no longer $args{Type} record $args{'Target'}.";
+ = "Record $args{'Base'} no longer $args{'type'} record $args{'Target'}.";
return ( 1, _( "Link deleted (%1)", $TransString ) );
}
@@ -1230,13 +1230,13 @@
sub _new_transaction {
my $self = shift;
my %args = (
- TimeTaken => undef,
+ time_taken => undef,
type => undef,
old_value => undef,
new_value => undef,
- OldReference => undef,
- NewReference => undef,
- ReferenceType => undef,
+ old_reference => undef,
+ new_reference => undef,
+ reference_type => undef,
Data => undef,
Field => undef,
MIMEObj => undef,
@@ -1245,9 +1245,9 @@
@_
);
- my $old_ref = $args{'OldReference'};
- my $new_ref = $args{'NewReference'};
- my $ref_type = $args{'ReferenceType'};
+ my $old_ref = $args{'old_reference'};
+ my $new_ref = $args{'new_reference'};
+ my $ref_type = $args{'reference_type'};
if ( $old_ref or $new_ref ) {
$ref_type ||= ref($old_ref) || ref($new_ref);
if ( !$ref_type ) {
@@ -1262,15 +1262,15 @@
my ( $transaction, $msg ) = $trans->create(
object_id => $self->id,
object_type => ref($self),
- TimeTaken => $args{'TimeTaken'},
+ time_taken => $args{'time_taken'},
type => $args{'type'},
Data => $args{'Data'},
Field => $args{'Field'},
new_value => $args{'new_value'},
old_value => $args{'old_value'},
- NewReference => $new_ref,
- OldReference => $old_ref,
- ReferenceType => $ref_type,
+ new_reference => $new_ref,
+ old_reference => $old_ref,
+ reference_type => $ref_type,
MIMEObj => $args{'MIMEObj'},
ActivateScrips => $args{'ActivateScrips'},
commit_scrips => $args{'commit_scrips'},
@@ -1283,8 +1283,8 @@
$self->set_last_updated;
- if ( defined $args{'TimeTaken'} and $self->can('_UpdateTimeTaken') ) {
- $self->_update_time_taken( $args{'TimeTaken'} );
+ if ( defined $args{'time_taken'} and $self->can('_update_time_taken') ) {
+ $self->_update_time_taken( $args{'time_taken'} );
}
if ( RT->config->get('Usetransaction_batch') and $transaction ) {
push @{ $self->{_transaction_batch} }, $trans
@@ -1470,11 +1470,11 @@
unless ($val) {
return ( 0, $msg );
}
- my ( $TransactionId, $Msg, $transaction_obj )
+ my ( $transaction_id, $Msg, $transaction_obj )
= $self->_new_transaction(
type => 'CustomField',
Field => $cf->id,
- OldReference => $value,
+ old_reference => $value,
);
}
}
@@ -1532,12 +1532,12 @@
}
if ( $args{'record_transaction'} ) {
- my ( $TransactionId, $Msg, $transaction_obj )
+ my ( $transaction_id, $Msg, $transaction_obj )
= $self->_new_transaction(
type => 'CustomField',
Field => $cf->id,
- OldReference => $old_value,
- NewReference => $new_value,
+ old_reference => $old_value,
+ new_reference => $new_value,
);
}
@@ -1576,8 +1576,8 @@
my ( $tid, $msg ) = $self->_new_transaction(
type => 'CustomField',
Field => $cf->id,
- NewReference => $new_value_id,
- ReferenceType => 'RT::Model::ObjectCustomFieldValue',
+ new_reference => $new_value_id,
+ reference_type => 'RT::Model::ObjectCustomFieldValue',
);
unless ($tid) {
return ( 0, _( "Couldn't create a transaction: %1", $msg ) );
@@ -1626,18 +1626,18 @@
return ( 0, $msg );
}
- my ( $TransactionId, $Msg, $transaction_obj ) = $self->_new_transaction(
+ my ( $transaction_id, $Msg, $transaction_obj ) = $self->_new_transaction(
type => 'CustomField',
Field => $cf->id,
- OldReference => $val,
- ReferenceType => 'RT::Model::ObjectCustomFieldValue',
+ old_reference => $val,
+ reference_type => 'RT::Model::ObjectCustomFieldValue',
);
- unless ($TransactionId) {
+ unless ($transaction_id) {
return ( 0, _( "Couldn't create a transaction: %1", $Msg ) );
}
return (
- $TransactionId,
+ $transaction_id,
_( "%1 is no longer a value for custom field %2",
$transaction_obj->old_value,
$cf->name
Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/AutoOpen.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/AutoOpen.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/AutoOpen.pm Tue Jan 29 09:34:20 2008
@@ -69,7 +69,7 @@
# if the ticket is already open or the ticket is new and the message is more mail from the
# requestor, don't reopen it.
- my $status = $self->ticket_obj->Status;
+ my $status = $self->ticket_obj->status;
return undef if $status eq 'open';
return undef if $status eq 'new' && $self->transaction_obj->is_inbound;
@@ -84,7 +84,7 @@
sub commit {
my $self = shift;
- my $oldstatus = $self->ticket_obj->Status;
+ my $oldstatus = $self->ticket_obj->status;
$self->ticket_obj->__set( column => 'Status', value => 'open' );
$self->ticket_obj->_new_transaction(
type => 'Status',
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 Tue Jan 29 09:34:20 2008
@@ -499,7 +499,7 @@
= $T::Tickets{$template_id}->comment(
BccMessageTo => $ticketargs->{'Bcc'},
MIMEObj => $ticketargs->{'MIMEObj'},
- TimeTaken => $ticketargs->{'time_worked'}
+ time_taken => $ticketargs->{'time_worked'}
);
push( @results,
$T::Tickets{$template_id}
@@ -512,7 +512,7 @@
= $T::Tickets{$template_id}->correspond(
BccMessageTo => $ticketargs->{'Bcc'},
MIMEObj => $ticketargs->{'MIMEObj'},
- TimeTaken => $ticketargs->{'time_worked'}
+ time_taken => $ticketargs->{'time_worked'}
);
push( @results,
$T::Tickets{$template_id}
@@ -981,7 +981,7 @@
my $string;
$string .= "Queue: " . $t->queue_obj->name . "\n";
$string .= "Subject: " . $t->subject . "\n";
- $string .= "Status: " . $t->Status . "\n";
+ $string .= "Status: " . $t->status . "\n";
$string .= "UpdateType: correspond\n";
$string .= "Content: \n";
$string .= "ENDOFCONTENT\n";
@@ -1035,7 +1035,7 @@
my $string;
$string .= "Queue: " . $t->Queue . "\n";
$string .= "Subject: " . $t->subject . "\n";
- $string .= "Status: " . $t->Status . "\n";
+ $string .= "Status: " . $t->status . "\n";
$string .= "Due: " . $t->due_obj->unix . "\n";
$string .= "starts: " . $t->starts_obj->unix . "\n";
$string .= "Started: " . $t->started_obj->unix . "\n";
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 Tue Jan 29 09:34:20 2008
@@ -346,7 +346,7 @@
my $attachments = RT::Model::AttachmentCollection->new(
current_user => RT->system_user );
$attachments->limit(
- column => 'TransactionId',
+ column => 'transaction_id',
value => $self->transaction_obj->id
);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Attachment.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Attachment.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Attachment.pm Tue Jan 29 09:34:20 2008
@@ -101,7 +101,7 @@
my $list = [];
# Parent, nested parts
- if ( $self->Parent ) {
+ if ( $self->parent ) {
if ( $self->parent_obj && $self->ParentId ) {
push( @$list, $self->parent_obj );
} else {
@@ -109,7 +109,7 @@
$self = $rec->{'Object'};
$rec->{'State'} |= INVALID;
$rec->{'Description'}
- = "Have no parent attachment #" . $self->Parent . " object";
+ = "Have no parent attachment #" . $self->parent . " object";
}
}
@@ -123,7 +123,7 @@
$rec->{'State'} |= INVALID;
$rec->{'Description'}
= "Have no related transaction #"
- . $self->TransactionId
+ . $self->transaction_id
. " object";
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/StyleGuide.pod
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/StyleGuide.pod (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/StyleGuide.pod Tue Jan 29 09:34:20 2008
@@ -889,7 +889,7 @@
=back
There are some legacy fields that did not follow this rule, namely
-C<ACL.principal_id>, C<GroupMembers.GroupId> and C<Attachments.TransactionId>,
+C<ACL.principal_id>, C<GroupMembers.GroupId> and C<Attachments.transaction_id>,
but new tables are expected to be consistent.
=head1 TO DO
Modified: rt/branches/3.999-DANGEROUS/lib/RT/URI.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/URI.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/URI.pm Tue Jan 29 09:34:20 2008
@@ -138,7 +138,7 @@
unless ( $self->resolver->parse_uri($uri) ) {
Jifty->log->warn(
- "Resolver " . ref( $self->Resolver ) . " could not parse $uri" );
+ "Resolver " . ref( $self->resolver ) . " could not parse $uri" );
$self->{resolver} = RT::URI::base->new; # clear resolver
return (undef);
}
Modified: rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in
==============================================================================
--- rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in (original)
+++ rt/branches/3.999-DANGEROUS/sbin/rt-dump-database.in Tue Jan 29 09:34:20 2008
@@ -97,7 +97,7 @@
unless $class eq 'Groups';
$objects->limit( column => 'id', operator => '!=', value => $system_userId )
if $class eq 'Users';
- $objects->limit( column => 'Domain', operator => '=', value => 'UserDefined' )
+ $objects->limit( column => 'domain', operator => '=', value => 'UserDefined' )
if $class eq 'Groups';
}
Modified: rt/branches/3.999-DANGEROUS/t/api/ticket.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/ticket.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/ticket.t Tue Jan 29 09:34:20 2008
@@ -96,7 +96,7 @@
ok ( my $id = $t->id, "Got ticket id");
like ($t->refers_to->first->Target , qr/fsck.com/, "Got refers to");
like ($t->referred_to_by->first->Base , qr/cpan.org/, "Got referredtoby");
-is ($t->resolved_obj->unix, 0, "It hasn't been resolved - ". $t->resolved_obj->Unix);
+is ($t->resolved_obj->unix, 0, "It hasn't been resolved - ". $t->resolved_obj->unix);
my $ticket = RT::Model::Ticket->new(current_user => RT->system_user);
@@ -227,7 +227,7 @@
my ($id, $tid, $msg)= $tt->create(Queue => 'general',
subject => 'test');
ok($id, $msg);
-is($tt->Status, 'new', "New ticket is Created as new");
+is($tt->status, 'new', "New ticket is Created as new");
($id, $msg) = $tt->set_status('open');
ok($id, $msg);
Modified: rt/branches/3.999-DANGEROUS/t/api/uri-t.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/uri-t.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/uri-t.t Tue Jan 29 09:34:20 2008
@@ -14,7 +14,7 @@
my $uristr = "t:1";
$uri->parse_uri($uristr);
-is(ref($uri->Object), "RT::Model::Ticket", "Object loaded is a ticket");
+is(ref($uri->object), "RT::Model::Ticket", "Object loaded is a ticket");
is($uri->object->id, 1, "Object loaded has correct ID");
is($uri->uri, 'fsck.com-rt://'.RT->config->get('organization').'/ticket/1',
"URI object has correct URI string");
Modified: rt/branches/3.999-DANGEROUS/t/mail/gateway.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/gateway.t (original)
+++ rt/branches/3.999-DANGEROUS/t/mail/gateway.t Tue Jan 29 09:34:20 2008
@@ -490,7 +490,7 @@
$attachments->limit(column => 'content_type', value => 'image/gif');
my $txn_alias = $attachments->join(
alias1 => 'main',
- column1 => 'TransactionId',
+ column1 => 'transaction_id',
table2 => 'Transactions',
column2 => 'id',
);
@@ -505,7 +505,7 @@
is ($acontent, $file, 'The attachment isn\'t screwed up in the database.');
# Grab the binary attachment via the web ui
- my $full_url = "$url/Ticket/Attachment/". $attachment->TransactionId
+ my $full_url = "$url/Ticket/Attachment/". $attachment->transaction_id
."/". $attachment->id. "/bplogo.gif";
$ua->login();
my $r = $ua->get( $full_url );
@@ -691,7 +691,7 @@
$tick = RT::Model::Ticket->new(current_user => RT->system_user);
$tick->load( $id );
is( $tick->id, $id, 'load correct ticket');
-is( $tick->Status, 'resolved', 'successfuly resolved ticket via email');
+is( $tick->status, 'resolved', 'successfuly resolved ticket via email');
is( $tick->transactions->count, 7, 'no superfluous transactions');
use RT::Model::User;
Modified: rt/branches/3.999-DANGEROUS/t/shredder/01ticket.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/01ticket.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/01ticket.t Tue Jan 29 09:34:20 2008
@@ -20,7 +20,7 @@
my ($id) = $ticket->create( subject => 'test', Queue => 1 );
ok( $id, "Created new ticket" );
$ticket->delete;
- is( $ticket->Status, 'deleted', "successfuly changed status" );
+ is( $ticket->status, 'deleted', "successfuly changed status" );
my $tickets = RT::Model::TicketCollection->new(current_user => RT->system_user );
$tickets->{'allow_deleted_search'} = 1;
Modified: rt/branches/3.999-DANGEROUS/t/ticket/linking.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/linking.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/linking.t Tue Jan 29 09:34:20 2008
@@ -224,7 +224,7 @@
my $transactions = $ticket2->transactions;
$transactions->limit( column => 'type', value => 'AddLink' );
is( $transactions->count, 1, "Transaction found in other ticket" );
-is( $transactions->first->Field , 'ReferredToBy');
+is( $transactions->first->field , 'ReferredToBy');
is( $transactions->first->new_value , $ticket->uri );
($id,$msg) = $ticket->delete_link(Type => 'RefersTo', Target => $ticket2->id);
@@ -233,7 +233,7 @@
$transactions = $ticket2->transactions;
$transactions->limit( column => 'type', value => 'DeleteLink' );
is( $transactions->count, 1, "Transaction found in other ticket" );
-is( $transactions->first->Field , 'ReferredToBy');
+is( $transactions->first->field , 'ReferredToBy');
is( $transactions->first->old_value , $ticket->uri );
RT->config->set( LinkTransactionsRun1Scrip => 0 );
More information about the Rt-commit
mailing list