[Rt-commit] rt branch, create-action, updated. 54299258d0f33ebbf38f166fbb5af56f9ef09671
sartak at bestpractical.com
sartak at bestpractical.com
Mon Nov 16 16:42:49 EST 2009
The branch, create-action has been updated
via 54299258d0f33ebbf38f166fbb5af56f9ef09671 (commit)
from 01244ec7f14e91d381620660ec5b08df45c0199c (commit)
Summary of changes:
lib/RT/Interface/Web.pm | 6 +++---
share/html/Elements/ShowLinks | 16 ++++++++--------
share/html/REST/1.0/Forms/ticket/links | 12 ++++++------
share/html/REST/1.0/ticket/link | 14 +++++++-------
share/html/Search/Bulk.html | 4 ++--
share/html/Search/Elements/SelectLinks | 10 +++++-----
share/html/Ticket/Elements/BulkLinks | 14 +++++++-------
7 files changed, 38 insertions(+), 38 deletions(-)
- Log -----------------------------------------------------------------
commit 54299258d0f33ebbf38f166fbb5af56f9ef09671
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Mon Nov 16 16:40:23 2009 -0500
Relationship names CamelCase -> under_score
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 65bc4b9..ffba3f4 100755
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1195,9 +1195,9 @@ sub process_ticket_links {
my (@results) = process_record_links( record_obj => $Ticket, args_ref => $args_ref );
#Merge if we need to
- if ( $args_ref->{ $Ticket->id . "-MergeInto" } ) {
- $args_ref->{ $Ticket->id . "-MergeInto" } =~ s/\s+//g;
- my ( $val, $msg ) = $Ticket->merge_into( $args_ref->{ $Ticket->id . "-MergeInto" } );
+ if ( $args_ref->{ $Ticket->id . "-merge_into" } ) {
+ $args_ref->{ $Ticket->id . "-merge_into" } =~ s/\s+//g;
+ my ( $val, $msg ) = $Ticket->merge_into( $args_ref->{ $Ticket->id . "-merge_into" } );
push @results, $msg;
}
diff --git a/share/html/Elements/ShowLinks b/share/html/Elements/ShowLinks
index b641e8f..5fad499 100755
--- a/share/html/Elements/ShowLinks
+++ b/share/html/Elements/ShowLinks
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
<table>
<tr>
- <td class="labeltop"><&|/l&>Depends on</&>: (<a href="<%$clone->{'DependsOn-new'}%>"><% _('Create') %></a>)</td>
+ <td class="labeltop"><&|/l&>Depends on</&>: (<a href="<%$clone->{'depends_on-new'}%>"><% _('Create') %></a>)</td>
<td class="value">
<%PERL>
@@ -77,7 +77,7 @@ for my $link ( @{ $ticket->depends_on->items_array_ref } ) {
</td>
</tr>
<tr>
- <td class="labeltop"><&|/l&>Depended on by</&>: (<a href="<%$clone->{'new-DependsOn'}%>"><% _('Create') %></a>)</td>
+ <td class="labeltop"><&|/l&>Depended on by</&>: (<a href="<%$clone->{'new-depends_on'}%>"><% _('Create') %></a>)</td>
<td class="value">
<ul>
% while (my $Link = $ticket->depended_on_by->next) {
@@ -87,7 +87,7 @@ for my $link ( @{ $ticket->depends_on->items_array_ref } ) {
</td>
</tr>
<tr>
- <td class="labeltop"><&|/l&>Parents</&>: (<a href="<%$clone->{'MemberOf-new'}%>"><% _('Create') %></a>)</td>
+ <td class="labeltop"><&|/l&>Parents</&>: (<a href="<%$clone->{'member_of-new'}%>"><% _('Create') %></a>)</td>
<td class="value">
<ul>
% while (my $Link = $ticket->member_of->next) {
@@ -97,11 +97,11 @@ for my $link ( @{ $ticket->depends_on->items_array_ref } ) {
</td>
</tr>
<tr>
- <td class="labeltop"><&|/l&>Children</&>: (<a href="<%$clone->{'new-MemberOf'}%>"><% _('Create') %></a>)</td>
+ <td class="labeltop"><&|/l&>Children</&>: (<a href="<%$clone->{'new-member_of'}%>"><% _('Create') %></a>)</td>
<td class="value"><& /Ticket/Elements/ShowMembers, ticket => $ticket &></td>
</tr>
<tr>
- <td class="labeltop"><&|/l&>Refers to</&>: (<a href="<%$clone->{'RefersTo-new'}%>"><% _('Create') %></a>)</td>
+ <td class="labeltop"><&|/l&>Refers to</&>: (<a href="<%$clone->{'refers_to-new'}%>"><% _('Create') %></a>)</td>
<td class="value">
<ul>
% while (my $Link = $ticket->refers_to->next) {
@@ -111,7 +111,7 @@ for my $link ( @{ $ticket->depends_on->items_array_ref } ) {
</td>
</tr>
<tr>
- <td class="labeltop"><&|/l&>Referred to by</&>: (<a href="<%$clone->{'new-RefersTo'}%>"><% _('Create') %></a>)</td>
+ <td class="labeltop"><&|/l&>Referred to by</&>: (<a href="<%$clone->{'new-refers_to'}%>"><% _('Create') %></a>)</td>
<td class="value">
<ul>
% while (my $Link = $ticket->referred_to_by->next) {
@@ -146,7 +146,7 @@ my $path
for my $relation (
- qw(RefersTo ReferredToBy)) {
+ qw(refers_to referred_to_by)) {
my $mode = $RT::Model::Ticket::LINKTYPEMAP{$relation}->{mode};
my $type = $RT::Model::Ticket::LINKTYPEMAP{$relation}->{type};
my $other = "local_" . $mode;
@@ -159,7 +159,7 @@ for my $relation (
$ticket->id );
}
-for my $relation ( qw(MemberOf Members DependsOn DependedOnBy)) {
+for my $relation ( qw(member_of members depends_on depended_on_by)) {
my $mode = $RT::Model::Ticket::LINKTYPEMAP{$relation}->{mode};
my $type = $RT::Model::Ticket::LINKTYPEMAP{$relation}->{type};
my $field = $mode eq 'base' ? 'new-' . $type : $type . '-new';
diff --git a/share/html/REST/1.0/Forms/ticket/links b/share/html/REST/1.0/Forms/ticket/links
index f0f350e..fc35bb2 100755
--- a/share/html/REST/1.0/Forms/ticket/links
+++ b/share/html/REST/1.0/Forms/ticket/links
@@ -66,12 +66,12 @@ my @fields = qw(depends_on depended_on_by refers_to referred_to_by members membe
my %fields = map { lc $_ => $_ } @fields;
my %lfields = (
- members => { type => 'MemberOf', mode => 'base' },
- referred_to_by => { type => 'RefersTo', mode => 'base' },
- depended_on_by => { type => 'DependsOn', mode => 'base' },
- member_of => { type => 'MemberOf', mode => 'target' },
- refers_to => { type => 'RefersTo', mode => 'target' },
- depends_on => { type => 'DependsOn', mode => 'target' },
+ members => { type => 'member_of', mode => 'base' },
+ referred_to_by => { type => 'refers_to', mode => 'base' },
+ depended_on_by => { type => 'depends_on', mode => 'base' },
+ member_of => { type => 'member_of', mode => 'target' },
+ refers_to => { type => 'refers_to', mode => 'target' },
+ depends_on => { type => 'depends_on', mode => 'target' },
);
if ($changes) {
diff --git a/share/html/REST/1.0/ticket/link b/share/html/REST/1.0/ticket/link
index 44a5d1e..969413a 100755
--- a/share/html/REST/1.0/ticket/link
+++ b/share/html/REST/1.0/ticket/link
@@ -60,15 +60,15 @@ my $status = "200 Ok";
my $ticket = RT::Model::Ticket->new( current_user => Jifty->web->current_user );
my $object = $r->path_info;
-my @fields = qw(DependsOn DependedOnBy RefersTo ReferredToBy has_member MemberOf);
+my @fields = qw(depends_on depended_on_by refers_to referred_to_by has_member member_of);
my %fields = map { lc $_ => $_ } @fields;
my %lfields = (
- has_member => { type => 'MemberOf', mode => 'base' },
- ReferredToBy => { type => 'RefersTo', mode => 'base' },
- DependedOnBy => { type => 'DependsOn', mode => 'base' },
- MemberOf => { type => 'MemberOf', mode => 'target' },
- RefersTo => { type => 'RefersTo', mode => 'target' },
- DependsOn => { type => 'DependsOn', mode => 'target' },
+ has_member => { type => 'member_of', mode => 'base' },
+ referred_to_by => { type => 'refers_to', mode => 'base' },
+ depended_on_by => { type => 'depends_on', mode => 'base' },
+ member_of => { type => 'member_of', mode => 'target' },
+ refers_to => { type => 'refers_to', mode => 'target' },
+ depends_on => { type => 'depends_on', mode => 'target' },
);
# http://.../REST/1.0/ticket/link/1
diff --git a/share/html/Search/Bulk.html b/share/html/Search/Bulk.html
index aea884b..8561f3d 100755
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@ -290,13 +290,13 @@ while ( my $Ticket = $Tickets->next ) {
my @watchresults =
process_ticket_watchers( ticket_obj => $Ticket, args_ref => \%ARGS );
- foreach my $type qw(MergeInto DependsOn MemberOf RefersTo) {
+ foreach my $type qw(merge_into depends_on member_of refers_to) {
$ARGS{ $Ticket->id . "-" . $type } = $ARGS{"Ticket-$type"};
$ARGS{ $type . "-" . $Ticket->id } = $ARGS{"$type-Ticket"};
}
@linkresults =
process_ticket_links( ticket_obj => $Ticket, args_ref => \%ARGS );
- foreach my $type qw(MergeInto DependsOn MemberOf RefersTo) {
+ foreach my $type qw(merge_into depends_on member_of refers_to) {
delete $ARGS{ $type . "-" . $Ticket->id };
delete $ARGS{ $Ticket->id . "-" . $type };
}
diff --git a/share/html/Search/Elements/SelectLinks b/share/html/Search/Elements/SelectLinks
index 46fae0b..8ca6d28 100644
--- a/share/html/Search/Elements/SelectLinks
+++ b/share/html/Search/Elements/SelectLinks
@@ -56,11 +56,11 @@ $name => 'links_field'
<%INIT>
my @fields = ('has_member',
- 'MemberOf',
- 'DependsOn',
- 'DependedOnBy',
- 'RefersTo',
- 'ReferredToBy',
+ 'member_of',
+ 'depends_on',
+ 'depended_on_by',
+ 'refers_to',
+ 'referred_to_by',
'linked_to',
);
</%INIT>
diff --git a/share/html/Ticket/Elements/BulkLinks b/share/html/Ticket/Elements/BulkLinks
index c7d12a4..b00911b 100755
--- a/share/html/Ticket/Elements/BulkLinks
+++ b/share/html/Ticket/Elements/BulkLinks
@@ -48,30 +48,30 @@
<table>
<tr>
<td class="label"><&|/l&>Merge into</&>:</td>
- <td class="entry"><input name="Ticket-MergeInto" /> <i><&|/l&>(only one ticket)</&></i></td>
+ <td class="entry"><input name="Ticket-merge_into" /> <i><&|/l&>(only one ticket)</&></i></td>
</tr>
<tr>
<td class="label"><&|/l&>Depends on</&>:</td>
- <td class="entry"><input name="Ticket-DependsOn" /></td>
+ <td class="entry"><input name="Ticket-depends_on" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Depended on by</&>:</td>
- <td class="entry"><input name="DependsOn-Ticket" /></td>
+ <td class="entry"><input name="depends_on-Ticket" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Parents</&>:</td>
- <td class="entry"><input name="Ticket-MemberOf" /></td>
+ <td class="entry"><input name="Ticket-member_of" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Children</&>:</td>
- <td class="entry"> <input name="MemberOf-Ticket" /></td>
+ <td class="entry"> <input name="member_of-Ticket" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Refers to</&>:</td>
- <td class="entry"><input name="Ticket-RefersTo" /></td>
+ <td class="entry"><input name="Ticket-refers_to" /></td>
</tr>
<tr>
<td class="label"><&|/l&>Referred to by</&>:</td>
- <td class="entry"> <input name="RefersTo-Ticket" /></td>
+ <td class="entry"> <input name="refers_to-Ticket" /></td>
</tr>
</table>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list