[Rt-commit] r14201 - in rt/branches/3.999-DANGEROUS: . lib/RT/Model share/html/Elements share/html/Elements/CollectionAsTable share/html/Elements/RT__Model__Queue share/html/Elements/RT__Model__Scrip share/html/Elements/RT__Model__Ticket
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Thu Jul 17 04:51:00 EDT 2008
Author: sunnavy
Date: Thu Jul 17 04:50:55 2008
New Revision: 14201
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/etc/config.yml
rt/branches/3.999-DANGEROUS/etc/initialdata
rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionAsTable/Header
rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionList
rt/branches/3.999-DANGEROUS/share/html/Elements/ColumnMap
rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Queue/ColumnMap
rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Scrip/ColumnMap
rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Ticket/ColumnMap
Log:
r14608 at sunnavys-mb: sunnavy | 2008-07-17 15:32:00 +0800
name fixes
Modified: rt/branches/3.999-DANGEROUS/etc/config.yml
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/config.yml (original)
+++ rt/branches/3.999-DANGEROUS/etc/config.yml Thu Jul 17 04:50:55 2008
@@ -17,7 +17,7 @@
DevelMode: 1
L10N:
PoDir: share/po
- LogLevel: DEBUG
+ LogLevel: ERROR
Mailer: Sendmail
MailerArgs: []
Modified: rt/branches/3.999-DANGEROUS/etc/initialdata
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/initialdata (original)
+++ rt/branches/3.999-DANGEROUS/etc/initialdata Thu Jul 17 04:50:55 2008
@@ -133,10 +133,10 @@
},
{
- name => 'On Priority Change', # loc
+ name => 'On priority Change', # loc
description => 'Whenever a ticket\'s priority changes', # loc
applicable_trans_types => 'Set',
- exec_module => 'PriorityChange',
+ exec_module => 'priorityChange',
},
{
@@ -679,9 +679,9 @@
content =>
{ format => q{'<a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a>/TITLE:#',}
. q{'<a href="__WebPath__/Ticket/Display.html?id=__id__">__subject__</a>/TITLE:subject',}
- . q{Priority, Queuename, ExtendedStatus},
+ . q{priority, queue_name, extended_status},
query => " owner = '__CurrentUser__' AND ( Status = 'new' OR Status = 'open')",
- order_by => 'Priority',
+ order_by => 'priority',
order => 'DESC'
},
},
@@ -691,7 +691,7 @@
# 'Take' #loc
{ format => q{'<a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a>/TITLE:#',}
. q{'<a href="__WebPath__/Ticket/Display.html?id=__id__">__subject__</a>/TITLE:subject',}
- . q{Queuename, ExtendedStatus, CreatedRelative, }
+ . q{queue_name, extended_status, created_relative, }
. q{'<A HREF="__WebPath__/Ticket/Display.html?Action=Take&id=__id__">___(Take)__</a>/TITLE:NBSP'},
query => " owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')",
order_by => 'Created',
@@ -703,7 +703,7 @@
content =>
{ format => q{'<a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a>/TITLE:#',}
. q{'<a href="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a>/TITLE:Subject',}
- . q{Priority, QueueName, ExtendedStatus, Bookmark},
+ . q{priority, queue_name, extended_status, bookmark},
query => "__Bookmarks__",
order_by => 'LastUpdated',
order => 'DESC' },
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 Thu Jul 17 04:50:55 2008
@@ -119,43 +119,43 @@
our %LINKTYPEMAP = (
MemberOf => {
type => 'MemberOf',
- Mode => 'target',
+ mode => 'target',
},
Parents => {
type => 'MemberOf',
- Mode => 'target',
+ mode => 'target',
},
Members => {
type => 'MemberOf',
- Mode => 'base',
+ mode => 'base',
},
Children => {
type => 'MemberOf',
- Mode => 'base',
+ mode => 'base',
},
has_member => {
type => 'MemberOf',
- Mode => 'base',
+ mode => 'base',
},
RefersTo => {
type => 'RefersTo',
- Mode => 'target',
+ mode => 'target',
},
ReferredToBy => {
type => 'RefersTo',
- Mode => 'base',
+ mode => 'base',
},
DependsOn => {
type => 'DependsOn',
- Mode => 'target',
+ mode => 'target',
},
DependedOnBy => {
type => 'DependsOn',
- Mode => 'base',
+ mode => 'base',
},
MergedInto => {
type => 'MergedInto',
- Mode => 'target',
+ mode => 'target',
},
);
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionAsTable/Header
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionAsTable/Header (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionAsTable/Header Thu Jul 17 04:50:55 2008
@@ -47,7 +47,6 @@
%# END BPS TAGGED BLOCK }}}
<%ARGS>
$Class => 'RT__Model__Ticket'
-
@format => undef
$format_string => undef
@order_by => ()
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionList
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionList (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionList Thu Jul 17 04:50:55 2008
@@ -48,7 +48,7 @@
<%INIT>
if (!$Collection && $Class eq 'RT::Model::TicketCollection') {
$Collection = RT::Model::TicketCollection->new;
- $Collection->from_sql($Query);
+ $Collection->from_sql($query);
}
my $TotalFound = $Collection->count_all();
return '' if !$TotalFound && !$ShowEmpty;
@@ -106,7 +106,7 @@
%ARGS,
Class => $Class,
format => \@format,
- formatString => $format,
+ format_string => $format,
order => \@order,
order_by => \@order_by,
Rows => $Rows,
@@ -152,7 +152,6 @@
}
-
</%INIT>
<%ARGS>
$Class => ''
@@ -171,5 +170,5 @@
$ShowNavigation => 1
$ShowHeader => 1
$ShowEmpty => 0
-$Query => 0
+$query => 0
</%ARGS>
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/ColumnMap (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/ColumnMap Thu Jul 17 04:50:55 2008
@@ -190,6 +190,7 @@
$m->callback( COLUMN_MAP => $COLUMN_MAP );
# first deal with class specific things
+Jifty->log->error( $Class );
my $class_map = $m->comp("/Elements/$Class/ColumnMap", Attr => $Attr, name => $name );
return $class_map if defined $class_map;
return get_column_map_entry( Map => $COLUMN_MAP, name => $name, Attribute => $Attr );
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Queue/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Queue/ColumnMap (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Queue/ColumnMap Thu Jul 17 04:50:55 2008
@@ -62,10 +62,10 @@
attribute => 'disabled',
value => sub { return $_[0]->disabled? _('disabled'): _('enabled') },
},
- Priority => {
+ priority => {
value => sub { return $_[0]->initial_priority .'-'. $_[0]->final_priority },
},
- Address => {
+ address => {
value => sub { return ($_[0]->correspond_address||'-') .'/'. ($_[0]->comment_address||'-') },
},
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 Thu Jul 17 04:50:55 2008
@@ -57,26 +57,26 @@
align => 'right',
value => sub { return $_[0]->id },
},
- Queue => {
+ queue => {
title => 'Queue',
value => sub {
return $_[0]->queue_obj->name if $_[0]->queue;
return $_[0]->loc('Global');
},
},
- Condition => {
+ condition => {
title => 'Condition',
value => sub { return $_[0]->loc( $_[0]->scrip_condition_obj->name ) },
},
- Action => {
+ action => {
title => 'Action',
value => sub { return $_[0]->loc( $_[0]->scrip_action_obj->name ) },
},
- Template => {
+ template => {
title => 'Template',
value => sub { return $_[0]->loc( $_[0]->template_obj->name ) },
},
- Autodescription => {
+ auto_description => {
title => 'Condition, Action and Template',
value => sub { return $_[0]->loc( "%1 %2 with template %3",
$_[0]->loc($_[0]->condition_obj->name),
@@ -86,7 +86,7 @@
},
};
-foreach my $col( qw(description Stage) ) {
+foreach my $col( qw(description stage) ) {
$COLUMN_MAP->{ $col } = { attribute => $col, value => sub { return $_[0]->$col() } };
}
</%ONCE>
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 Thu Jul 17 04:50:55 2008
@@ -57,8 +57,8 @@
my $LinkCallback = sub {
my $method = shift;
- my $mode = $RT::Model::Ticket::LINKTYPEMAP{$method}{Mode};
- my $type = $RT::Model::Ticket::LINKTYPEMAP{$method}{Type};
+ my $mode = $RT::Model::Ticket::LINKTYPEMAP{$method}{mode};
+ my $type = $RT::Model::Ticket::LINKTYPEMAP{$method}{type};
my $other_mode = ($mode eq "target" ? "base" : "target");
my $mode_uri = $mode.'URI';
my $local_type = 'local_'.$mode;
@@ -80,7 +80,7 @@
title => 'Queue id',
value => sub { return $_[0]->queue }
},
- Queuename => {
+ queue_name => {
attribute => 'queue',
title => 'queue',
value => sub { return $_[0]->queue_obj->name }
@@ -98,7 +98,7 @@
attribute => 'subject',
value => sub { return $_[0]->subject || "(" . _('No subject') . ")" }
},
- ExtendedStatus => {
+ extended_status => {
title => 'Status',
attribute => 'Status',
value => sub {
@@ -120,7 +120,7 @@
}
},
- Priority => {
+ priority => {
attribute => 'Priority',
value => sub { return $_[0]->priority }
},
@@ -161,30 +161,30 @@
attribute => 'Requestor.email',
value => sub { return $_[0]->role_group("requestor")->member_emails_as_string }
},
- Cc => {
+ cc => {
attribute => 'Cc.email',
value => sub { return $_[0]->role_group("cc")->member_emails_as_string }
},
- AdminCc => {
+ admin_cc => {
attribute => 'AdminCc.email',
value => sub { return $_[0]->role_group("admin_cc")->member_emails_as_string }
},
- startsRelative => {
+ starts_relative => {
title => 'starts',
attribute => 'starts',
value => sub { return $_[0]->starts_obj->age_as_string }
},
- StartedRelative => {
+ started_relative => {
title => 'Started',
attribute => 'Started',
value => sub { return $_[0]->started_obj->age_as_string }
},
- ToldRelative => {
+ told_relative => {
title => 'Told',
attribute => 'Told',
value => sub { return $_[0]->told_obj->age_as_string }
},
- DueRelative => {
+ due_relative => {
title => 'Due',
attribute => 'Due',
value => sub {
@@ -197,7 +197,7 @@
}
}
},
- ResolvedRelative => {
+ resolved_relative => {
title => 'resolved',
attribute => 'resolved',
value => sub { return $_[0]->resolved_obj->age_as_string }
@@ -206,15 +206,15 @@
attribute => 'starts',
value => sub { return $_[0]->starts_obj->as_string }
},
- Started => {
+ started => {
attribute => 'Started',
value => sub { return $_[0]->started_obj->as_string }
},
- Told => {
+ told => {
attribute => 'Told',
value => sub { return $_[0]->told_obj->as_string }
},
- Due => {
+ due => {
attribute => 'Due',
value => sub { return $_[0]->due_obj->as_string }
},
@@ -222,7 +222,7 @@
attribute => 'resolved',
value => sub { return $_[0]->resolved_obj->as_string }
},
- UpdateStatus => {
+ update_status => {
title => _('New messages'),
value => sub {
my $txn = $_[0]->seen_up_to or return $_[0]->_('No');
@@ -283,7 +283,7 @@
value => sub { return \('<input type="checkbox" class="checkbox" name="UpdateTicket'.$_[0]->id.'" value="1" checked="checked" />') }
},
- CustomField => {
+ custom_field => {
attribute => undef,
title => sub { return pop @_ },
value => sub {
@@ -303,7 +303,7 @@
return @values;
},
},
- Bookmark => {
+ bookmark => {
title => ' ',
value => sub {
my $bookmark = $m->scomp( '/Ticket/Elements/Bookmark', id => $_[0]->id );
@@ -315,7 +315,7 @@
},
};
-$COLUMN_MAP->{'CF'} = $COLUMN_MAP->{'CustomField'};
+$COLUMN_MAP->{'CF'} = $COLUMN_MAP->{'custom_field'};
# if no GPG support, then key_owner_name and key_requestors fall back to the regular
# versions
@@ -331,5 +331,5 @@
$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'Once', CallbackOnce => 1 );
# backward compatibility
$m->callback( COLUMN_MAP => $COLUMN_MAP, Callbackname => 'ColumnMap' );
-return GetColumnMapEntry( Map => $COLUMN_MAP, name => $name, Attribute => $Attr );
+return get_column_map_entry( Map => $COLUMN_MAP, name => $name, Attribute => $Attr );
</%init>
More information about the Rt-commit
mailing list