[Rt-commit] rt branch, create-action, updated. 1e8e66ac79bffe5431ee94542ed1dfeb89d1aedc

[sartak at bestpractical.com]

The branch, create-action has been updated
       via  1e8e66ac79bffe5431ee94542ed1dfeb89d1aedc (commit)
      from  1a5d07047b1a4833503a2b424abde8f25f835d7f (commit)

Summary of changes:
 bin/rt                          |    4 ++--
 share/html/REST/1.0/ticket/link |   22 +++++++++++++---------
 t/web/command_line.t            |    6 +++---
 3 files changed, 18 insertions(+), 14 deletions(-)

- Log -----------------------------------------------------------------
commit 1e8e66ac79bffe5431ee94542ed1dfeb89d1aedc
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Nov 17 16:05:42 2009 -0500

    Maintain back-compat with REST 1.0

diff --git a/bin/rt b/bin/rt
index ce7959d..82df706 100755
--- a/bin/rt
+++ b/bin/rt
@@ -869,8 +869,8 @@ sub link {
     my ($bad, $del, %data) = (0, 0, ());
     my $type;
 
-    my %ltypes = map { lc $_ => $_ } qw(depends_on depended_on_by refers_to
-                                        referred_to_by has_member member_of);
+    my %ltypes = map { lc $_ => $_ } qw(DependsOn DependedOnBy RefersTo
+                                        ReferredToBy HasMember MemberOf);
 
     while (@ARGV && $ARGV[0] =~ /^-/) {
         $_ = shift @ARGV;
diff --git a/share/html/REST/1.0/ticket/link b/share/html/REST/1.0/ticket/link
index 969413a..b3c5853 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(depends_on depended_on_by refers_to referred_to_by has_member member_of);
+my @fields = qw(DependsOn DependedOnBy RefersTo ReferredToBy HasMember MemberOf);
 my %fields = map { lc $_ => $_ } @fields;
 my %lfields = (
-    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' },
+    HasMember    => { 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' },
 );
 
 # http://.../REST/1.0/ticket/link/1
@@ -101,8 +101,12 @@ unless ($ticket->id) {
     goto OUTPUT;
 }
 
-my $type = $lfields{$rel}->{type};
-my $mode = $lfields{$rel}->{mode};
+my $old_type = $lfields{$rel}->{type};
+my $old_mode = $lfields{$rel}->{mode};
+
+require Text::Naming::Convention;
+my $type = Text::Naming::Convention::renaming($old_type, {convention => '_'});
+my $mode = Text::Naming::Convention::renaming($old_mode, {convention => '_'});
 
 my $n = 1;
 my $op = $del ? "delete_link" : "add_link";
diff --git a/t/web/command_line.t b/t/web/command_line.t
index e64f723..0c41879 100644
--- a/t/web/command_line.t
+++ b/t/web/command_line.t
@@ -418,10 +418,10 @@ expect_like(qr/Merged into ticket #$merge_ticket_A by root/, 'Merge recorded in
 # }}}
 
 # {{{ test ticket linking
-    my @link_relns = ( 'depends_on', 'depended_on_by', 'refers_to', 'referred_to_by',
-                       'member_of', 'has_member', );
+    my @link_relns = ( 'DependsOn', 'DependedOnBy', 'RefersTo', 'ReferredToBy',
+                       'MemberOf', 'HasMember' );
     my %display_relns = map { $_ => $_ } @link_relns;
-    $display_relns{has_member} = 'members';
+    $display_relns{HasMember} = 'Members';
 
     my $link1_id = ok_create_ticket( "LinkTicket1-$$" );
     my $link2_id = ok_create_ticket( "LinkTicket2-$$" );

-----------------------------------------------------------------------