[Rt-commit] r16241 - in rt/branches/3.999-DANGEROUS: . lib/RT/Model lib/RT/Shredder/Plugin share/html/Elements share/html/Elements/RT__Model__Scrip share/html/REST/1.0/Forms/ticket share/html/REST/1.0/NoAuth share/html/Search share/html/Ticket share/html/Ticket/Elements
ruz at bestpractical.com
ruz at bestpractical.com
Wed Oct 8 13:21:36 EDT 2008
Author: ruz
Date: Wed Oct 8 13:21:34 2008
New Revision: 16241
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Plugin/Summary.pm
rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Scrip/ColumnMap
rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap
rt/branches/3.999-DANGEROUS/share/html/Elements/ShowLink
rt/branches/3.999-DANGEROUS/share/html/Elements/ShowLinks
rt/branches/3.999-DANGEROUS/share/html/REST/1.0/Forms/ticket/default
rt/branches/3.999-DANGEROUS/share/html/REST/1.0/NoAuth/mail-gateway
rt/branches/3.999-DANGEROUS/share/html/Search/Bulk.html
rt/branches/3.999-DANGEROUS/share/html/Search/Results.tsv
rt/branches/3.999-DANGEROUS/share/html/Ticket/Create.html
rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditBasics
rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowSummary
rt/branches/3.999-DANGEROUS/share/html/Ticket/Modify.html
rt/branches/3.999-DANGEROUS/share/html/Ticket/ModifyAll.html
Log:
r16245 at ruslan-zakirovs-computer: ruz | 2008-10-08 15:03:16 +0400
* queue_obj->queue
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 Wed Oct 8 13:21:34 2008
@@ -1219,7 +1219,7 @@
my $CFs = RT::Model::CustomFieldCollection->new;
$CFs->limit( column => 'name', value => $field );
$CFs->limit_to_lookup_type( $self->custom_field_lookup_type );
- $CFs->limit_to_global_or_object_id( $self->object->queue_obj->id );
+ $CFs->limit_to_global_or_object_id( $self->object->queue->id );
$field = $CFs->first->id if $CFs->first;
}
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Plugin/Summary.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Plugin/Summary.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Plugin/Summary.pm Wed Oct 8 13:21:34 2008
@@ -138,7 +138,7 @@
$props->{'Action'} = $args{'object'}->scrip_action->name;
$props->{'Condition'} = $args{'object'}->scrip_condition->name;
$props->{'template'} = $args{'object'}->template_obj->name;
- $props->{'queue'} = $args{'object'}->queue_obj->name || 'global';
+ $props->{'queue'} = $args{'object'}->queue->name || 'global';
return $self->_write_down_hash( $args{'object'}, $props );
}
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Scrip/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Scrip/ColumnMap (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Scrip/ColumnMap Wed Oct 8 13:21:34 2008
@@ -60,7 +60,7 @@
queue => {
title => 'Queue',
value => sub {
- return $_[0]->queue_obj->name if $_[0]->queue;
+ return $_[0]->queue->name if $_[0]->queue;
return $_[0]->_('Global');
},
},
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap Wed Oct 8 13:21:34 2008
@@ -190,7 +190,7 @@
value => sub {
my $date = $_[0]->due_obj;
# Highlight the date if it was due in the past, and it's still active
- if ( $date && $date->unix > 0 && $date->diff < 0 && $_[0]->queue_obj->is_active_status($_[0]->status)) {
+ if ( $date && $date->unix > 0 && $date->diff < 0 && $_[0]->queue->is_active_status($_[0]->status)) {
return (\'<span class="overdue">' , $date->age_as_string , \'</span>');
} else {
return $date->age_as_string;
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/ShowLink
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/ShowLink (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/ShowLink Wed Oct 8 13:21:34 2008
@@ -49,7 +49,7 @@
% if ($uri->is_local) {
% my $member = $uri->object;
% if (UNIVERSAL::isa($member, "RT::Model::Ticket")) {
-% my $inactive = $member->queue_obj->is_inactive_status($member->status);
+% my $inactive = $member->queue->is_inactive_status($member->status);
<span class="<% $inactive ? 'ticket-inactive' : '' %>">
<%$member->id%>: (<%$member->owner_obj->name%>) <%$member->subject%> [<% _($member->status) %>]
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/ShowLinks
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/ShowLinks (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/ShowLinks Wed Oct 8 13:21:34 2008
@@ -55,7 +55,7 @@
for my $link ( @{ $ticket->depends_on->items_array_ref } ) {
my $target = $link->target_obj;
if ( $target && $target->isa('RT::Model::Ticket') ) {
- if ( $target->queue_obj->is_inactive_status( $target->status ) ) {
+ if ( $target->queue->is_inactive_status( $target->status ) ) {
push( @inactive, $link->target_uri );
}
else {
Modified: rt/branches/3.999-DANGEROUS/share/html/REST/1.0/Forms/ticket/default
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/REST/1.0/Forms/ticket/default (original)
+++ rt/branches/3.999-DANGEROUS/share/html/REST/1.0/Forms/ticket/default Wed Oct 8 13:21:34 2008
@@ -190,7 +190,7 @@
my ($time, $key, $val, @data);
push @data, [ id => "ticket/".$ticket->id ];
- push @data, [ queue => $ticket->queue_obj->name ]
+ push @data, [ queue => $ticket->queue->name ]
if (!%$fields || exists $fields->{lc 'Queue'});
push @data, [ owner => $ticket->owner_obj->name ]
if (!%$fields || exists $fields->{lc 'Owner'});
@@ -224,7 +224,7 @@
}
# Display custom fields
- my $CustomFields = $ticket->queue_obj->ticket_custom_fields();
+ my $CustomFields = $ticket->queue->ticket_custom_fields();
while (my $cf = $CustomFields->next()) {
next unless !%$fields
|| exists $fields->{"cf.{".lc($cf->name)."}"}
@@ -260,7 +260,7 @@
}
if ($key =~ /^queue$/i) {
- next if $val eq $ticket->queue_obj->name;
+ next if $val eq $ticket->queue->name;
($n, $s) = $ticket->set_queue($val);
}
elsif ($key =~ /^owner$/i) {
Modified: rt/branches/3.999-DANGEROUS/share/html/REST/1.0/NoAuth/mail-gateway
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/REST/1.0/NoAuth/mail-gateway (original)
+++ rt/branches/3.999-DANGEROUS/share/html/REST/1.0/NoAuth/mail-gateway Wed Oct 8 13:21:34 2008
@@ -65,7 +65,7 @@
$m->out('ok');
if ( $ticket_obj && $ticket_obj->id ) {
$m->out( 'Ticket: ' . ($ticket_obj->id || '') );
- $m->out( 'Queue: ' . ($ticket_obj->queue_obj->name || '') );
+ $m->out( 'Queue: ' . ($ticket_obj->queue->name || '') );
$m->out( 'Owner: ' . ($ticket_obj->owner_obj->name || '') );
$m->out( 'Status: ' . ($ticket_obj->status || '') );
$m->out( 'Subject: ' . ($ticket_obj->subject || '') );
Modified: rt/branches/3.999-DANGEROUS/share/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Search/Bulk.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Search/Bulk.html Wed Oct 8 13:21:34 2008
@@ -251,7 +251,7 @@
while ( my $ticket = $Tickets->next ) {
next if $seen_queues->{ $ticket->queue }++;
- my $custom_fields = $ticket->queue_obj->ticket_custom_fields;
+ my $custom_fields = $ticket->queue->ticket_custom_fields;
while ( my $field = $custom_fields->next ) {
$fields->{ $field->id } = $field;
}
@@ -276,7 +276,7 @@
#Update the links
$ARGS{'id'} = $Ticket->id;
- $queues{ $Ticket->queue_obj->id }++;
+ $queues{ $Ticket->queue->id }++;
my @updateresults, process_update_message(
ticket_obj => $Ticket,
Modified: rt/branches/3.999-DANGEROUS/share/html/Search/Results.tsv
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Search/Results.tsv (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Search/Results.tsv Wed Oct 8 13:21:34 2008
@@ -87,7 +87,7 @@
}
}
- my $cfs = $Ticket->queue_obj->ticket_custom_fields();
+ my $cfs = $Ticket->queue->ticket_custom_fields();
while (my $cf = $cfs->next) {
$known_cfs{$cf->id} = $cf->name;
my @content;
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Create.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Create.html Wed Oct 8 13:21:34 2008
@@ -302,7 +302,7 @@
$clone->{'new-MemberOf'} = join ' ', @members_of;
- my $cfs = $cloneticket_obj->queue_obj->ticket_custom_fields();
+ my $cfs = $cloneticket_obj->queue->ticket_custom_fields();
while ( my $cf = $cfs->next ) {
my $cf_id = $cf->id;
my $cf_values = $cloneticket_obj->custom_field_values( $cf->id );
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditBasics
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditBasics (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/EditBasics Wed Oct 8 13:21:34 2008
@@ -113,7 +113,7 @@
<%INIT>
#It's hard to do this inline, so we'll preload the html of the selectstatus in here.
my $SelectStatus = $m->scomp("/Elements/SelectStatus", name => 'status', default_label => _("%1 (Unchanged)",_($ticket_obj->status)));
-my $SelectQueue = $m->scomp("/Elements/SelectQueue", name => 'queue', default =>$ticket_obj->queue_obj->id);
+my $SelectQueue = $m->scomp("/Elements/SelectQueue", name => 'queue', default =>$ticket_obj->queue->id);
</%INIT>
<%ARGS>
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowSummary
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowSummary (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowSummary Wed Oct 8 13:21:34 2008
@@ -54,7 +54,7 @@
<& /Ticket/Elements/ShowBasics, ticket => $ticket &>
</&>
-% if ($ticket->queue_obj->ticket_custom_fields->first) {
+% if ($ticket->queue->ticket_custom_fields->first) {
<&| /Widgets/TitleBox, title => _('Custom Fields'),
title_href => RT->config->get('WebPath')."/Ticket/Modify.html?id=".$ticket->id,
class => 'ticket-info-cfs' &>
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Modify.html Wed Oct 8 13:21:34 2008
@@ -74,7 +74,7 @@
my $ticket_obj = load_ticket($id);
my $action = Jifty->web->new_action( class => 'UpdateTicket', record =>
$ticket_obj );
-my $CustomFields = $ticket_obj->queue_obj->ticket_custom_fields();
+my $CustomFields = $ticket_obj->queue->ticket_custom_fields();
# call this to show up hints of valid cf values.
$m->comp(
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/ModifyAll.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/ModifyAll.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/ModifyAll.html Wed Oct 8 13:21:34 2008
@@ -137,7 +137,7 @@
<%INIT>
my $Ticket = load_ticket($id);
-my $CustomFields = $Ticket->queue_obj->ticket_custom_fields();
+my $CustomFields = $Ticket->queue->ticket_custom_fields();
my $action = Jifty->web->new_action( class => 'UpdateTicket', record => $Ticket );
# call this to show up hints of valid cf values.
More information about the Rt-commit
mailing list