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

sartak at bestpractical.com sartak at bestpractical.com
Thu Nov 5 16:59:15 EST 2009


The branch, create-action has been updated
       via  d5a14106b75306cdaa22dd12a321cba5ab6391aa (commit)
      from  bfcc3465855a348053d60bd61c5672beb87d39f4 (commit)

Summary of changes:
 bin/rt                               |   10 ++--
 lib/RT/Action/CreateTicket.pm        |    4 +-
 lib/RT/Graph/Tickets.pm              |    8 ++--
 lib/RT/Interface/Web.pm              |    4 +-
 lib/RT/Model/LinkCollection.pm       |    4 +-
 lib/RT/Model/Ticket.pm               |   76 +++++++++++++++++-----------------
 lib/RT/Model/TicketCollection.pm     |   36 ++++++++--------
 lib/RT/Model/Transaction.pm          |   22 +++++-----
 lib/RT/Record.pm                     |   40 +++++++++---------
 lib/RT/Reminders.pm                  |    4 +-
 lib/RT/ScripAction/CreateTickets.pm  |   68 +++++++++++++++---------------
 lib/RT/ScripAction/ResolveMembers.pm |    2 +-
 lib/RT/Test.pm                       |    8 ++--
 lib/RT/View/Ticket/Links.pm          |    4 +-
 sbin/rt-validator                    |   12 +++---
 t/api/record.t                       |    4 +-
 t/api/ticket.t                       |    2 +-
 t/api/tickets_overlay_sql.t          |    4 +-
 t/shredder/01ticket.t                |    4 +-
 t/shredder/03plugin_tickets.t        |   10 ++--
 t/ticket/link_search.t               |   12 +++---
 t/ticket/merge.t                     |    4 +-
 t/ticket/search_by_links.t           |   66 +++++++++++++++---------------
 t/web/command_line.t                 |    6 +-
 24 files changed, 207 insertions(+), 207 deletions(-)

- Log -----------------------------------------------------------------
commit d5a14106b75306cdaa22dd12a321cba5ab6391aa
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Nov 5 16:58:08 2009 -0500

    Camelcase-ify the ticket link names

diff --git a/bin/rt b/bin/rt
index 3078208..ce7959d 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(DependsOn DependedOnBy RefersTo
-                                        ReferredToBy has_member MemberOf);
+    my %ltypes = map { lc $_ => $_ } qw(depends_on depended_on_by refers_to
+                                        referred_to_by has_member member_of);
 
     while (@ARGV && $ARGV[0] =~ /^-/) {
         $_ = shift @ARGV;
@@ -2327,9 +2327,9 @@ Text:
     Creates (or, with -d, deletes) a link between the specified tickets.
     The link can (irrespective of case) be any of:
 
-        DependsOn/DependedOnBy:     A depends upon B (or vice versa).
-        RefersTo/ReferredToBy:      A refers to B (or vice versa).
-        MemberOf/has_member:         A is a member of B (or vice versa).
+        depends_on/depended_on_by:     A depends upon B (or vice versa).
+        refers_to/referred_to_by:      A refers to B (or vice versa).
+        member_of/has_member:         A is a member of B (or vice versa).
 
     To view a ticket's links, use "rt show ticket/3/links". (See
     "rt help ticket" and "rt help show".)
diff --git a/lib/RT/Action/CreateTicket.pm b/lib/RT/Action/CreateTicket.pm
index 762d273..85cb432 100644
--- a/lib/RT/Action/CreateTicket.pm
+++ b/lib/RT/Action/CreateTicket.pm
@@ -110,12 +110,12 @@ sub after_set_queue {
 
     $self->add_link_parameter(
         name  => 'parents',
-        label => _('Parents'),
+        label => _('parents'),
     );
 
     $self->add_link_parameter(
         name  => 'children',
-        label => _('Children'),
+        label => _('children'),
     );
 
     $self->add_link_parameter(
diff --git a/lib/RT/Graph/Tickets.pm b/lib/RT/Graph/Tickets.pm
index 10c706f..14af120 100644
--- a/lib/RT/Graph/Tickets.pm
+++ b/lib/RT/Graph/Tickets.pm
@@ -76,9 +76,9 @@ our %ticket_status_style = (
 );
 
 our %link_style = (
-    MemberOf  => { style => 'solid' },
-    DependsOn => { style => 'dashed' },
-    RefersTo  => { style => 'dotted' },
+    member_of  => { style => 'solid' },
+    depends_on => { style => 'dashed' },
+    refers_to  => { style => 'dotted' },
 );
 
 # We don't use qw() because perl complains about "possible attempt to put comments in qw() list"
@@ -354,7 +354,7 @@ sub ticket_links {
             $args{'graph'}->add_edge(
 
                 # we revers order of member links to get better layout
-                $link->type eq 'MemberOf'
+                $link->type eq 'member_of'
                 ? ( $target->id => $base->id, dir => 'back' )
                 : ( $base->id => $target->id ),
                 %{ $link_style{ $link->type } || {} },
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index ff85eef..6754e08 100755
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1072,7 +1072,7 @@ sub process_record_links {
 
     # Delete links that are gone gone gone.
     foreach my $arg ( keys %$args_ref ) {
-        if ( $arg =~ /delete_link-(.*?)-(DependsOn|MemberOf|RefersTo)-(.*)$/ ) {
+        if ( $arg =~ /delete_link-(.*?)-(depends_on|member_of|refers_to)-(.*)$/ ) {
             my $base   = $1;
             my $type   = $2;
             my $target = $3;
@@ -1089,7 +1089,7 @@ sub process_record_links {
 
     }
 
-    my @linktypes = qw( DependsOn MemberOf RefersTo );
+    my @linktypes = qw( depends_on member_of refers_to );
 
     foreach my $linktype (@linktypes) {
         if ( $args_ref->{ $Record->id . "-$linktype" } ) {
diff --git a/lib/RT/Model/LinkCollection.pm b/lib/RT/Model/LinkCollection.pm
index 87cd4bb..2dd713f 100755
--- a/lib/RT/Model/LinkCollection.pm
+++ b/lib/RT/Model/LinkCollection.pm
@@ -128,7 +128,7 @@ sub limit_refers_to {
     my $self = shift;
     my $URI  = shift;
 
-    $self->limit( column => 'type',   value => 'RefersTo' );
+    $self->limit( column => 'type',   value => 'refers_to' );
     $self->limit( column => 'target', value => $URI );
 }
 
@@ -143,7 +143,7 @@ sub limit_referred_to_by {
     my $self = shift;
     my $URI  = shift;
 
-    $self->limit( column => 'type', value => 'RefersTo' );
+    $self->limit( column => 'type', value => 'refers_to' );
     $self->limit( column => 'base', value => $URI );
 }
 
diff --git a/lib/RT/Model/Ticket.pm b/lib/RT/Model/Ticket.pm
index 1517bc9..3e07f9a 100755
--- a/lib/RT/Model/Ticket.pm
+++ b/lib/RT/Model/Ticket.pm
@@ -208,44 +208,44 @@ use Jifty::Plugin::ActorMetadata::Mixin::Model::ActorMetadata map => {
 # to build and parse links between tickets
 
 our %LINKTYPEMAP = (
-    MemberOf => {
-        type => 'MemberOf',
+    member_of => {
+        type => 'member_of',
         mode => 'target',
     },
-    Parents => {
-        type => 'MemberOf',
+    parents => {
+        type => 'member_of',
         mode => 'target',
     },
-    Members => {
-        type => 'MemberOf',
+    members => {
+        type => 'member_of',
         mode => 'base',
     },
-    Children => {
-        type => 'MemberOf',
+    children => {
+        type => 'member_of',
         mode => 'base',
     },
-    HasMember => {
-        type => 'MemberOf',
+    has_member => {
+        type => 'member_of',
         mode => 'base',
     },
-    RefersTo => {
-        type => 'RefersTo',
+    refers_to => {
+        type => 'refers_to',
         mode => 'target',
     },
-    ReferredToBy => {
-        type => 'RefersTo',
+    referred_to_by => {
+        type => 'refers_to',
         mode => 'base',
     },
-    DependsOn => {
-        type => 'DependsOn',
+    depends_on => {
+        type => 'depends_on',
         mode => 'target',
     },
-    DependedOnBy => {
-        type => 'DependsOn',
+    depended_on_by => {
+        type => 'depends_on',
         mode => 'base',
     },
-    MergedInto => {
-        type => 'MergedInto',
+    merged_into => {
+        type => 'merged_into',
         mode => 'target',
     },
 
@@ -256,21 +256,21 @@ our %LINKTYPEMAP = (
 # to build and parse links between tickets
 
 our %LINKDIRMAP = (
-    MemberOf => {
-        base   => 'MemberOf',
-        target => 'HasMember',
+    member_of => {
+        base   => 'member_of',
+        target => 'has_member',
     },
-    RefersTo => {
-        base   => 'RefersTo',
-        target => 'ReferredToBy',
+    refers_to => {
+        base   => 'refers_to',
+        target => 'referred_to_by',
     },
-    DependsOn => {
-        base   => 'DependsOn',
-        target => 'DependedOnBy',
+    depends_on => {
+        base   => 'depends_on',
+        target => 'depended_on_by',
     },
-    MergedInto => {
-        base   => 'MergedInto',
-        target => 'MergedInto',
+    merged_into => {
+        base   => 'merged_into',
+        target => 'merged_into',
     },
 
 );
@@ -367,12 +367,12 @@ the ticket id to be linked to as a value (or a URI when linking to other objects
 Multiple links of the same type can be created by passing an array ref. For example:
 
   Parent => 45,
-  DependsOn => [ 15, 22 ],
-  RefersTo => 'http://www.bestpractical.com',
+  depends_on => [ 15, 22 ],
+  refers_to => 'http://www.bestpractical.com',
 
-Supported link types are C<MemberOf>, C<has_member>, C<RefersTo>, C<ReferredToBy>,
-C<DependsOn> and C<DependedOnBy>. Also, C<Parents> is alias for C<MemberOf> and
-C<Members> and C<Children> are aliases for C<has_member>.
+Supported link types are C<member_of>, C<has_member>, C<refers_to>, C<referred_to_by>,
+C<depends_on> and C<depended_on_by>. Also, C<parents> is alias for C<member_of> and
+C<members> and C<children> are aliases for C<has_member>.
 
 Returns: TICKETID, Transaction object, Error Message
 
@@ -1761,7 +1761,7 @@ sub merge_into {
     }
 
     #make a new link: this ticket is merged into that other ticket.
-    $self->add_link( type => 'MergedInto', target => $MergeInto->id() );
+    $self->add_link( type => 'merged_into', target => $MergeInto->id() );
 
     $MergeInto->set_last_updated;
 
diff --git a/lib/RT/Model/TicketCollection.pm b/lib/RT/Model/TicketCollection.pm
index 630b396..8962cd3 100755
--- a/lib/RT/Model/TicketCollection.pm
+++ b/lib/RT/Model/TicketCollection.pm
@@ -113,13 +113,13 @@ our %FIELD_METADATA = (
     Linked       => ['LINK'],                                   #loc_left_pair
     LinkedTo    => [ 'LINK' => 'To' ],                          #loc_left_pair
     LinkedFrom   => [ 'LINK' => 'From' ],                       #loc_left_pair
-    MemberOf     => [ 'LINK' => To => 'MemberOf', ],            #loc_left_pair
-    DependsOn    => [ 'LINK' => To => 'DependsOn', ],           #loc_left_pair
-    RefersTo     => [ 'LINK' => To => 'RefersTo', ],            #loc_left_pair
-    HasMember   => [ 'LINK' => From => 'MemberOf', ],           #loc_left_pair
-    DependentOn  => [ 'LINK' => From => 'DependsOn', ],         #loc_left_pair
-    DependedOnBy => [ 'LINK' => From => 'DependsOn', ],         #loc_left_pair
-    ReferredToBy => [ 'LINK' => From => 'RefersTo', ],          #loc_left_pair
+    member_of     => [ 'LINK' => To => 'member_of', ],            #loc_left_pair
+    depends_on    => [ 'LINK' => To => 'depends_on', ],           #loc_left_pair
+    refers_to     => [ 'LINK' => To => 'refers_to', ],            #loc_left_pair
+    has_member   => [ 'LINK' => From => 'member_of', ],           #loc_left_pair
+    DependentOn  => [ 'LINK' => From => 'depends_on', ],         #loc_left_pair
+    depended_on_by => [ 'LINK' => From => 'depends_on', ],         #loc_left_pair
+    referred_to_by => [ 'LINK' => From => 'refers_to', ],          #loc_left_pair
     Told            => [ 'DATE'         => 'Told', ],           #loc_left_pair
     Starts          => [ 'DATE'         => 'starts', ],         #loc_left_pair
     Started         => [ 'DATE'         => 'Started', ],        #loc_left_pair
@@ -383,11 +383,11 @@ sub _int_limit {
 
 =head2 _link_limit
 
-Handle fields which deal with links between tickets.  (MemberOf, DependsOn)
+Handle fields which deal with links between tickets.  (member_of, depends_on)
 
 Meta Data:
   1: Direction (From, To)
-  2: Link type (MemberOf, DependsOn, RefersTo)
+  2: Link type (member_of, depends_on, refers_to)
 
 =cut
 
@@ -440,7 +440,7 @@ sub _link_limit {
 
     #For doing a left join to find "unlinked tickets" we want to generate a query that looks like this
     #    SELECT main.* FROM Tickets main
-    #        left join Links Links_1 ON (     (Links_1.Type = 'MemberOf')
+    #        left join Links Links_1 ON (     (Links_1.Type = 'member_of')
     #                                      AND(main.id = Links_1.local_target))
     #        WHERE Links_1.local_base IS NULL;
 
@@ -1857,7 +1857,7 @@ sub limit_watcher {
 limit_linked_to takes a paramhash with two fields: type and target
 type limits the sort of link we want to search on
 
-type = { RefersTo, MemberOf, DependsOn }
+type = { refers_to, member_of, depends_on }
 
 target is the id or URI of the target of the link
 
@@ -1904,9 +1904,9 @@ sub limit_linked_from {
     );
 
     # translate RT2 From/To naming to RT3 TicketSQL naming
-    my %fromToMap = qw(DependsOn DependentOn
-        MemberOf  has_member
-        RefersTo  ReferredToBy);
+    my %fromToMap = qw(depends_on DependentOn
+        member_of  has_member
+        refers_to  referred_to_by);
 
     my $type = $args{'type'};
     $type = $fromToMap{$type} if exists( $fromToMap{$type} );
@@ -1928,7 +1928,7 @@ sub limit_member_of {
     return $self->limit_linked_to(
         @_,
         target => $ticket_id,
-        type   => 'MemberOf',
+        type   => 'member_of',
     );
 }
 
@@ -1952,7 +1952,7 @@ sub limitdepends_on {
     return $self->limit_linked_to(
         @_,
         target => $ticket_id,
-        type   => 'DependsOn',
+        type   => 'depends_on',
     );
 
 }
@@ -1978,7 +1978,7 @@ sub limit_refers_to {
     return $self->limit_linked_to(
         @_,
         target => $ticket_id,
-        type   => 'RefersTo',
+        type   => 'refers_to',
     );
 
 }
@@ -1991,7 +1991,7 @@ sub limit_referred_to_by {
     return $self->limit_linked_from(
         @_,
         base => $ticket_id,
-        type => 'ReferredToBy',
+        type => 'referred_to_by',
     );
 }
 
diff --git a/lib/RT/Model/Transaction.pm b/lib/RT/Model/Transaction.pm
index 1d8dbe6..49c7a84 100755
--- a/lib/RT/Model/Transaction.pm
+++ b/lib/RT/Model/Transaction.pm
@@ -871,20 +871,20 @@ sub brief_description {
             } else {
                 $value = $self->new_value;
             }
-            if ( $self->field eq 'DependsOn' ) {
+            if ( $self->field eq 'depends_on' ) {
                 return _( "Dependency on %1 added", $value );
-            } elsif ( $self->field eq 'DependedOnBy' ) {
+            } elsif ( $self->field eq 'depended_on_by' ) {
                 return _( "Dependency by %1 added", $value );
 
-            } elsif ( $self->field eq 'RefersTo' ) {
+            } elsif ( $self->field eq 'refers_to' ) {
                 return _( "Reference to %1 added", $value );
-            } elsif ( $self->field eq 'ReferredToBy' ) {
+            } elsif ( $self->field eq 'referred_to_by' ) {
                 return _( "Reference by %1 added", $value );
-            } elsif ( $self->field eq 'MemberOf' ) {
+            } elsif ( $self->field eq 'member_of' ) {
                 return _( "Membership in %1 added", $value );
             } elsif ( $self->field eq 'has_member' ) {
                 return _( "Member %1 added", $value );
-            } elsif ( $self->field eq 'MergedInto' ) {
+            } elsif ( $self->field eq 'merged_into' ) {
                 return _( "Merged into %1", $value );
             }
         } else {
@@ -903,16 +903,16 @@ sub brief_description {
                 $value = $self->old_value;
             }
 
-            if ( $self->field eq 'DependsOn' ) {
+            if ( $self->field eq 'depends_on' ) {
                 return _( "Dependency on %1 deleted", $value );
-            } elsif ( $self->field eq 'DependedOnBy' ) {
+            } elsif ( $self->field eq 'depended_on_by' ) {
                 return _( "Dependency by %1 deleted", $value );
 
-            } elsif ( $self->field eq 'RefersTo' ) {
+            } elsif ( $self->field eq 'refers_to' ) {
                 return _( "Reference to %1 deleted", $value );
-            } elsif ( $self->field eq 'ReferredToBy' ) {
+            } elsif ( $self->field eq 'referred_to_by' ) {
                 return _( "Reference by %1 deleted", $value );
-            } elsif ( $self->field eq 'MemberOf' ) {
+            } elsif ( $self->field eq 'member_of' ) {
                 return _( "Membership in %1 deleted", $value );
             } elsif ( $self->field eq 'has_member' ) {
                 return _( "Member %1 deleted", $value );
diff --git a/lib/RT/Record.pm b/lib/RT/Record.pm
index 94324bc..45cad1b 100755
--- a/lib/RT/Record.pm
+++ b/lib/RT/Record.pm
@@ -558,21 +558,21 @@ sub _decode_lob {
 use vars '%LINKDIRMAP';
 
 %LINKDIRMAP = (
-    MemberOf => {
-        base   => 'MemberOf',
+    member_of => {
+        base   => 'member_of',
         target => 'has_member',
     },
-    RefersTo => {
-        base   => 'RefersTo',
-        target => 'ReferredToBy',
+    refers_to => {
+        base   => 'refers_to',
+        target => 'referred_to_by',
     },
-    DependsOn => {
-        base   => 'DependsOn',
-        target => 'DependedOnBy',
+    depends_on => {
+        base   => 'depends_on',
+        target => 'depended_on_by',
     },
-    MergedInto => {
-        base   => 'MergedInto',
-        target => 'MergedInto',
+    merged_into => {
+        base   => 'merged_into',
+        target => 'merged_into',
     },
 
 );
@@ -688,7 +688,7 @@ all the tickets which are 'MembersOf' this ticket
 
 sub members {
     my $self = shift;
-    return ( $self->_links( 'target', 'MemberOf' ) );
+    return ( $self->_links( 'target', 'member_of' ) );
 }
 
 
@@ -696,13 +696,13 @@ sub members {
 =head2 member_of
 
 This returns an L<RT::Model::LinkCollection> object which references all
-the tickets that this ticket is a 'MemberOf'
+the tickets that this ticket is a 'member_of'
 
 =cut
 
 sub member_of {
     my $self = shift;
-    return ( $self->_links( 'base', 'MemberOf' ) );
+    return ( $self->_links( 'base', 'member_of' ) );
 }
 
 
@@ -716,7 +716,7 @@ references for which this ticket is a base
 
 sub refers_to {
     my $self = shift;
-    return ( $self->_links( 'base', 'RefersTo' ) );
+    return ( $self->_links( 'base', 'refers_to' ) );
 }
 
 
@@ -730,7 +730,7 @@ references for which this ticket is a target
 
 sub referred_to_by {
     my $self = shift;
-    return ( $self->_links( 'target', 'RefersTo' ) );
+    return ( $self->_links( 'target', 'refers_to' ) );
 }
 
 
@@ -744,7 +744,7 @@ all the tickets that depend on this one
 
 sub depended_on_by {
     my $self = shift;
-    return ( $self->_links( 'target', 'DependsOn' ) );
+    return ( $self->_links( 'target', 'depends_on' ) );
 }
 
 
@@ -823,7 +823,7 @@ dependency search.
 sub all_depended_on_by {
     my $self = shift;
     return $self->_all_linked_tickets(
-        link_type  => 'DependsOn',
+        link_type  => 'depends_on',
         direction => 'target',
         @_
     );
@@ -842,7 +842,7 @@ recursive dependency search.
 sub all_depends_on {
     my $self = shift;
     return $self->_all_linked_tickets(
-        link_type  => 'DependsOn',
+        link_type  => 'depends_on',
         direction => 'base',
         @_
     );
@@ -899,7 +899,7 @@ all the tickets that this ticket depends on
 
 sub depends_on {
     my $self = shift;
-    return ( $self->_links( 'base', 'DependsOn' ) );
+    return ( $self->_links( 'base', 'depends_on' ) );
 }
 
 
diff --git a/lib/RT/Reminders.pm b/lib/RT/Reminders.pm
index 8a8a158..1f16656 100644
--- a/lib/RT/Reminders.pm
+++ b/lib/RT/Reminders.pm
@@ -76,7 +76,7 @@ sub collection {
     my $self = shift;
     my $col = RT::Model::TicketCollection->new;
 
-    my $query = 'type = "reminder" AND RefersTo = "' . $self->ticket . '"';
+    my $query = 'type = "reminder" AND refers_to = "' . $self->ticket . '"';
 
     $col->from_sql($query);
 
@@ -110,7 +110,7 @@ sub add {
         subject   => $args{'subject'},
         owner     => $args{'owner'},
         due       => $args{'due'},
-        RefersTo => $self->ticket,
+        refers_to => $self->ticket,
         type      => 'reminder',
         queue     => $self->ticket_obj->queue,
     );
diff --git a/lib/RT/ScripAction/CreateTickets.pm b/lib/RT/ScripAction/CreateTickets.pm
index 815390f..2f9885c 100755
--- a/lib/RT/ScripAction/CreateTickets.pm
+++ b/lib/RT/ScripAction/CreateTickets.pm
@@ -199,12 +199,12 @@ A complete list of acceptable fields for this beastie:
        initial_priority => 
        final_priority   => 
        type            => 
-    +! DependsOn       => 
-    +! DependedOnBy    =>
-    +! RefersTo        =>
-    +! ReferredToBy    => 
-    +! Members         =>
-    +! MemberOf        => 
+    +! depends_on       => 
+    +! depended_on_by    =>
+    +! refers_to        =>
+    +! referred_to_by    => 
+    +! members         =>
+    +! member_of        => 
        Content         => content. Can extend to multiple lines. Everything
                           within a template after a Content: header is treated
                           as content until we hit a line containing only 
@@ -231,7 +231,7 @@ the identifiers after ==Create-Ticket), instead of raw Ticket ID
 numbers.
 
 When parsed, field names are converted to lowercase and have -s stripped.
-Refers-To, RefersTo, refersto, refers-to and r-e-f-er-s-tO will all 
+Refers-To, refers_to, refersto, refers-to and r-e-f-er-s-tO will all 
 be treated as the same thing.
 
 
@@ -248,40 +248,40 @@ perl(1).
 =cut
 
 my %LINKTYPEMAP = (
-    MemberOf => {
-        type => 'MemberOf',
+    member_of => {
+        type => 'member_of',
         mode => 'target',
     },
-    Parents => {
-        type => 'MemberOf',
+    parents => {
+        type => 'member_of',
         mode => 'target',
     },
-    Members => {
-        type => 'MemberOf',
+    members => {
+        type => 'member_of',
         mode => 'base',
     },
-    Children => {
-        type => 'MemberOf',
+    children => {
+        type => 'member_of',
         mode => 'base',
     },
     has_member => {
-        type => 'MemberOf',
+        type => 'member_of',
         mode => 'base',
     },
-    RefersTo => {
-        type => 'RefersTo',
+    refers_to => {
+        type => 'refers_to',
         mode => 'target',
     },
-    ReferredToBy => {
-        type => 'RefersTo',
+    referred_to_by => {
+        type => 'refers_to',
         mode => 'base',
     },
-    DependsOn => {
-        type => 'DependsOn',
+    depends_on => {
+        type => 'depends_on',
         mode => 'target',
     },
-    DependedOnBy => {
-        type => 'DependsOn',
+    depended_on_by => {
+        type => 'depends_on',
         mode => 'base',
     },
 
@@ -900,12 +900,12 @@ sub get_deferred {
     push @$links,
         (
         $id,
-        {   DependsOn    => $args->{'dependson'},
-            DependedOnBy => $args->{'dependedonby'},
-            RefersTo     => $args->{'refersto'},
-            ReferredToBy => $args->{'referredtoby'},
-            Children     => $args->{'children'},
-            Parents      => $args->{'parents'},
+        {   depends_on    => $args->{'dependson'},
+            depended_on_by => $args->{'dependedonby'},
+            refers_to     => $args->{'refersto'},
+            referred_to_by => $args->{'referredtoby'},
+            children     => $args->{'children'},
+            parents      => $args->{'parents'},
         }
         );
 
@@ -945,8 +945,8 @@ sub get_update_template {
 
         # don't display duplicates
         if (   $type eq "has_member"
-            || $type eq "Members"
-            || $type eq "MemberOf" )
+            || $type eq "members"
+            || $type eq "member_of" )
         {
             next;
         }
@@ -1023,8 +1023,8 @@ sub get_create_template {
 
         # don't display duplicates
         if (   $type eq "has_member"
-            || $type eq 'Members'
-            || $type eq 'MemberOf' )
+            || $type eq 'members'
+            || $type eq 'member_of' )
         {
             next;
         }
diff --git a/lib/RT/ScripAction/ResolveMembers.pm b/lib/RT/ScripAction/ResolveMembers.pm
index d6924c4..1f840ba 100755
--- a/lib/RT/ScripAction/ResolveMembers.pm
+++ b/lib/RT/ScripAction/ResolveMembers.pm
@@ -74,7 +74,7 @@ sub commit {
     my $self = shift;
 
     my $Links = RT::Model::LinkCollection->new( current_user => RT->system_user );
-    $Links->limit( column => 'type',   value => 'MemberOf' );
+    $Links->limit( column => 'type',   value => 'member_of' );
     $Links->limit( column => 'target', value => $self->ticket_obj->id );
 
     while ( my $Link = $Links->next() ) {
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index d3649cc..b7e784e 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -186,9 +186,9 @@ sub load_or_create_user {
     my $self = shift;
     my %args = ( privileged => 1, disabled => 0, @_ );
 
-    my $MemberOf = delete $args{'member_of'};
-    $MemberOf = [$MemberOf] if defined $MemberOf && !ref $MemberOf;
-    $MemberOf ||= [];
+    my $member_of = delete $args{'member_of'};
+    $member_of = [$member_of] if defined $member_of && !ref $member_of;
+    $member_of ||= [];
 
     my $obj = RT::Model::User->new( current_user => RT->system_user );
     if ( $args{'name'} ) {
@@ -231,7 +231,7 @@ sub load_or_create_user {
     }
 
     # add new user to groups
-    foreach (@$MemberOf) {
+    foreach (@$member_of) {
         my $group = RT::Model::Group->new( current_user => RT->system_user() );
         $group->load_user_defined($_);
         die "couldn't load group '$_'" unless $group->id;
diff --git a/lib/RT/View/Ticket/Links.pm b/lib/RT/View/Ticket/Links.pm
index 2e7f939..7aba0f6 100644
--- a/lib/RT/View/Ticket/Links.pm
+++ b/lib/RT/View/Ticket/Links.pm
@@ -69,9 +69,9 @@ template '_elements/edit_links' => sub {
 
                 show( '_edit_link_type', _('Depended on by'), 'depended_on_by', $ticket->depended_on_by, $delete_links, 'base_uri' );
 
-                show( '_edit_link_type', _('Parents'), 'member_of', $ticket->member_of, $delete_links, 'target_uri' );
+                show( '_edit_link_type', _('parents'), 'member_of', $ticket->member_of, $delete_links, 'target_uri' );
 
-                show( '_edit_link_type', _('Children'), 'has_member', $ticket->members, $delete_links, 'base_uri' );
+                show( '_edit_link_type', _('children'), 'has_member', $ticket->members, $delete_links, 'base_uri' );
 
                 show( '_edit_link_type', _('Refers to'), 'refers_to', $ticket->refers_to, $delete_links, 'target_uri' );
 
diff --git a/sbin/rt-validator b/sbin/rt-validator
index ab9670d..dd365da 100755
--- a/sbin/rt-validator
+++ b/sbin/rt-validator
@@ -165,16 +165,16 @@ $redo_on{'Delete'} = {
     Tickets => [ 'Tickets -> other', 'Tickets <-> Role Groups' ],
     Transactions => [ 'Attachments -> other' ],
 
-    Principals => ['User <-> ACL equivalence group', 'GMs -> Groups, Members' ],
-    Users => ['User <-> ACL equivalence group', 'GMs -> Groups, Members', 'Principals -> Users' ],
-    Groups => ['User <-> ACL equivalence group', 'GMs -> Groups, Members', 'CGM vs. GM', 'Principals -> Groups' ],
+    Principals => ['User <-> ACL equivalence group', 'GMs -> Groups, members' ],
+    Users => ['User <-> ACL equivalence group', 'GMs -> Groups, members', 'Principals -> Users' ],
+    Groups => ['User <-> ACL equivalence group', 'GMs -> Groups, members', 'CGM vs. GM', 'Principals -> Groups' ],
 
     GroupMembers => [ 'CGM vs. GM' ],
     CachedGroupMembers => [ 'CGM vs. GM' ],
 };
 $redo_on{'Create'} = {
-    Principals => ['User <-> ACL equivalence group', 'GMs -> Groups, Members' ],
-    Groups => ['User <-> ACL equivalence group', 'GMs -> Groups, Members', 'CGM vs. GM' ],
+    Principals => ['User <-> ACL equivalence group', 'GMs -> Groups, members' ],
+    Groups => ['User <-> ACL equivalence group', 'GMs -> Groups, members', 'CGM vs. GM' ],
     GroupMembers => [ 'CGM vs. GM' ],
     CachedGroupMembers => [ 'CGM vs. GM' ],
 };
@@ -355,7 +355,7 @@ push @CHECKS, 'Role Groups (Instance, type) uniqueness' => sub {
 };
 
 
-push @CHECKS, 'GMs -> Groups, Members' => sub {
+push @CHECKS, 'GMs -> Groups, members' => sub {
     my $msg = "A record in GroupMembers references an object that doesn't exist."
         ." May be you deleted a group or principal directly from DB?"
         ." Usually it's ok to delete such records.";
diff --git a/t/api/record.t b/t/api/record.t
index ebd97e6..f3e77fd 100644
--- a/t/api/record.t
+++ b/t/api/record.t
@@ -35,9 +35,9 @@ my $t3 = RT::Model::Ticket->new(current_user => RT->system_user);
 (my $id3, $trans, my $msg3) = $t3->create(subject => 'DepTest3', queue => 'general', type => 'approval');
 ok($id3, "Created dep test 3 - $msg3");
 my ($addid, $addmsg);
-ok (($addid, $addmsg) =$t1->add_link( type => 'DependsOn', target => $t2->id));
+ok (($addid, $addmsg) =$t1->add_link( type => 'depends_on', target => $t2->id));
 ok ($addid, $addmsg);
-ok (($addid, $addmsg) =$t1->add_link( type => 'DependsOn', target => $t3->id));
+ok (($addid, $addmsg) =$t1->add_link( type => 'depends_on', target => $t3->id));
 
 ok ($addid, $addmsg);
 my $link = RT::Model::Link->new(current_user => RT->system_user);
diff --git a/t/api/ticket.t b/t/api/ticket.t
index dd04ecc..548ef5f 100644
--- a/t/api/ticket.t
+++ b/t/api/ticket.t
@@ -86,7 +86,7 @@ ok(require RT::Model::Ticket, "Loading the RT::Model::Ticket library");
 {
 my $t = RT::Model::Ticket->new(current_user => RT->system_user);
 
-ok( $t->create(queue => 'General', Due => '2002-05-21 00:00:00', ReferredToBy => 'http://www.cpan.org', RefersTo => 'http://fsck.com', subject => 'This is a subject'), "Ticket Created");
+ok( $t->create(queue => 'General', Due => '2002-05-21 00:00:00', referred_to_by => 'http://www.cpan.org', refers_to => 'http://fsck.com', subject => 'This is a subject'), "Ticket Created");
 
 ok ( my $id = $t->id, "Got ticket id");
 like ($t->refers_to->first->target , qr/fsck.com/, "Got refers to");
diff --git a/t/api/tickets_overlay_sql.t b/t/api/tickets_overlay_sql.t
index b1547a4..643decc 100644
--- a/t/api/tickets_overlay_sql.t
+++ b/t/api/tickets_overlay_sql.t
@@ -37,7 +37,7 @@ my $string = 'subject/content SQL test';
     ok( $t->create( queue => 'General',
                     subject => 'another ticket',
                     mime_obj => $Message,
-                    MemberOf => $Created[0]
+                    member_of => $Created[0]
                   ),
         "Ticket Created"
     );
@@ -60,7 +60,7 @@ TODO: {
 }
 
 {
-    my $query = "id = $Created[0] OR MemberOf = $Created[0]";
+    my $query = "id = $Created[0] OR member_of = $Created[0]";
     my ($status, $msg) = $tix->from_sql($query);
     ok ($status, "correct query") or diag("error: $msg");
 
diff --git a/t/shredder/01ticket.t b/t/shredder/01ticket.t
index 22054f6..a83c8e3 100644
--- a/t/shredder/01ticket.t
+++ b/t/shredder/01ticket.t
@@ -45,7 +45,7 @@ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB
     my ($cid) = $child->create( subject => 'test', queue => 1 );
     ok( $cid, "Created new ticket" );
 
-    my ($status, $msg) = $parent->add_link( type => 'MemberOf', target => $cid );
+    my ($status, $msg) = $parent->add_link( type => 'member_of', target => $cid );
     ok( $status, "Added link between tickets") or diag("error: $msg");
     my $shredder = RT::Test::Shredder::shredder_new();
     $shredder->put_objects( objects => $child );
@@ -69,7 +69,7 @@ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB
     my ($cid) = $child->create( subject => 'test', queue => 1 );
     ok( $cid, "Created new ticket" );
 
-    ($status, $msg) = $parent->add_link( type => 'DependsOn', target => $cid );
+    ($status, $msg) = $parent->add_link( type => 'depends_on', target => $cid );
     ok( $status, "Added link between tickets") or diag("error: $msg");
     my $shredder = RT::Test::Shredder::shredder_new();
     $shredder->put_objects( objects => $child );
diff --git a/t/shredder/03plugin_tickets.t b/t/shredder/03plugin_tickets.t
index 0afd960..c740114 100644
--- a/t/shredder/03plugin_tickets.t
+++ b/t/shredder/03plugin_tickets.t
@@ -29,7 +29,7 @@ use_ok('RT::Model::TicketCollection');
     ok( $pid, "Created new ticket" );
 
     my $child = RT::Model::Ticket->new(current_user => RT->system_user );
-    my ($cid) = $child->create( subject => 'child', queue => 1, MemberOf => $pid );
+    my ($cid) = $child->create( subject => 'child', queue => 1, member_of => $pid );
     ok( $cid, "Created new ticket" );
 
     my $plugin = RT::Shredder::Plugin::Tickets->new;
@@ -68,10 +68,10 @@ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB
     ok( $pid, "Created new ticket" );
 
     my $child = RT::Model::Ticket->new(current_user => RT->system_user );
-    my ($cid) = $child->create( subject => 'child', queue => 1, MemberOf => $pid );
+    my ($cid) = $child->create( subject => 'child', queue => 1, member_of => $pid );
     ok( $cid, "Created new ticket" );
 
-    my ($status, $msg) = $child->add_link( target => $pid, type => 'DependsOn' );
+    my ($status, $msg) = $child->add_link( target => $pid, type => 'depends_on' );
     ok($status, "added reqursive link") or diag "error: $msg";
 
     my $plugin = RT::Shredder::Plugin::Tickets->new;
@@ -110,10 +110,10 @@ cmp_deeply( RT::Test::Shredder::dump_current_and_savepoint('clean'), "current DB
     ok( $pid, "Created new ticket" );
 
     my $child1 = RT::Model::Ticket->new(current_user => RT->system_user );
-    my ($cid1) = $child1->create( subject => 'child', queue => 1, MemberOf => $pid );
+    my ($cid1) = $child1->create( subject => 'child', queue => 1, member_of => $pid );
     ok( $cid1, "Created new ticket" );
     my $child2 = RT::Model::Ticket->new(current_user => RT->system_user );
-    my ($cid2) = $child2->create( subject => 'child', queue => 1, MemberOf => $pid, status => 'resolved' );
+    my ($cid2) = $child2->create( subject => 'child', queue => 1, member_of => $pid, status => 'resolved' );
     ok( $cid2, "Created new ticket" );
 
     my $plugin = RT::Shredder::Plugin::Tickets->new;
diff --git a/t/ticket/link_search.t b/t/ticket/link_search.t
index 4534975..2017c83 100644
--- a/t/ticket/link_search.t
+++ b/t/ticket/link_search.t
@@ -25,7 +25,7 @@ ok($childid, "We Created a child ticket");
 my $parent_ticket = RT::Model::Ticket->new(current_user =>  $CurrentUser );
 my ($parentid) = $parent_ticket->create(
     subject => 'test parent',
-    Children => [ $childid ],
+    children => [ $childid ],
     queue => $queue->id,
 );
 ok($parentid, "We Created a parent ticket");
@@ -37,7 +37,7 @@ ok($Collection->first);
 is($Collection->first->id, $childid, "We found the collection of all children of $parentid with Limit");
 
 $Collection = RT::Model::TicketCollection->new(current_user => RT->system_user);
-$Collection->from_sql("MemberOf = $parentid");
+$Collection->from_sql("member_of = $parentid");
 is($Collection->count, 1, "We found only one result");
 ok($Collection->first);
 is($Collection->first->id, $childid, "We found the collection of all children of $parentid with TicketSQL");
@@ -113,7 +113,7 @@ ok( $has{$childid}, "The collection has our child - $childid");
 
 # Now we find a collection of all the tickets which are not members of anything. they should have no parents.
 $Collection = RT::Model::TicketCollection->new(current_user => RT->system_user);
-$Collection->from_sql("MemberOf IS NULL");
+$Collection->from_sql("member_of IS NULL");
 # must not  contain parent; must contain parent
 %has = ();
 while (my $t = $Collection->next) {
@@ -125,7 +125,7 @@ ok( !$has{$childid}, "The collection doesn't have our child - $childid");
 
 # Now we find a collection of all the tickets which are not members of anything. they should have no parents.
 $Collection = RT::Model::TicketCollection->new(current_user => RT->system_user);
-$Collection->from_sql("MemberOf = ''");
+$Collection->from_sql("member_of = ''");
 # must not  contain parent; must contain parent
 %has = ();
 while (my $t = $Collection->next) {
@@ -137,7 +137,7 @@ ok( !$has{$childid}, "The collection doesn't have our child - $childid");
 
 # Now we find a collection of all the tickets which are not members of the parent ticket
 $Collection = RT::Model::TicketCollection->new(current_user => RT->system_user);
-$Collection->from_sql("MemberOf != $parentid");
+$Collection->from_sql("member_of != $parentid");
 %has = ();
 while (my $t = $Collection->next) {
     ++$has{$t->id};
@@ -158,7 +158,7 @@ my $grand_child_ticket = RT::Model::Ticket->new(current_user =>  $CurrentUser );
 my ($grand_childid) = $child_ticket->create(
     subject => 'test child',
     queue   => $queue->id,
-    MemberOf => $childid,
+    member_of => $childid,
 );
 ok($childid, "We Created a grand child ticket");
 
diff --git a/t/ticket/merge.t b/t/ticket/merge.t
index 730532a..a78fe18 100644
--- a/t/ticket/merge.t
+++ b/t/ticket/merge.t
@@ -82,9 +82,9 @@ use RT;
     ok ($t3->id);
 
     my ($id,$val);
-    ($id,$val) = $t->add_link(type => 'DependsOn', target => $t3->id);
+    ($id,$val) = $t->add_link(type => 'depends_on', target => $t3->id);
     ok($id,$val);
-    ($id,$val) = $t2->add_link(type => 'DependsOn', target => $t3->id);
+    ($id,$val) = $t2->add_link(type => 'depends_on', target => $t3->id);
     ok($id,$val);
 
     ($id,$val) = $t->merge_into($t2->id);
diff --git a/t/ticket/search_by_links.t b/t/ticket/search_by_links.t
index 294532a..c1125c1 100644
--- a/t/ticket/search_by_links.t
+++ b/t/ticket/search_by_links.t
@@ -57,7 +57,7 @@ sub run_tests {
 @data = (
     { subject => '-', },
     { subject => 'p', },
-    { subject => 'c', MemberOf => -1 },
+    { subject => 'c', member_of => -1 },
 );
 @tickets = add_tix_from_data();
 %test = (
@@ -70,17 +70,17 @@ sub run_tests {
 
     'has_member  IS NOT NULL'  => { '-' => 0, c => 0, p => 1 },
     'has_member  IS     NULL'  => { '-' => 1, c => 1, p => 0 },
-    'MemberOf   IS NOT NULL'  => { '-' => 0, c => 1, p => 0 },
-    'MemberOf   IS     NULL'  => { '-' => 1, c => 0, p => 1 },
+    'member_of   IS NOT NULL'  => { '-' => 0, c => 1, p => 0 },
+    'member_of   IS     NULL'  => { '-' => 1, c => 0, p => 1 },
 
-    'RefersTo   IS NOT NULL'  => { '-' => 0, c => 0, p => 0 },
-    'RefersTo   IS     NULL'  => { '-' => 1, c => 1, p => 1 },
+    'refers_to   IS NOT NULL'  => { '-' => 0, c => 0, p => 0 },
+    'refers_to   IS     NULL'  => { '-' => 1, c => 1, p => 1 },
 
     'Linked      = '. $tickets[0]->id  => { '-' => 0, c => 0, p => 0 },
     'Linked     != '. $tickets[0]->id  => { '-' => 1, c => 1, p => 1 },
 
-    'MemberOf    = '. $tickets[1]->id  => { '-' => 0, c => 1, p => 0 },
-    'MemberOf   != '. $tickets[1]->id  => { '-' => 1, c => 0, p => 1 },
+    'member_of    = '. $tickets[1]->id  => { '-' => 0, c => 1, p => 0 },
+    'member_of   != '. $tickets[1]->id  => { '-' => 1, c => 0, p => 1 },
 );
 {
     my $tix = RT::Model::TicketCollection->new(current_user => RT->system_user);
@@ -93,36 +93,36 @@ run_tests();
 @data = (
     { subject => '-', },
     { subject => 'p', },
-    { subject => 'rp',  RefersTo => -1 },
-    { subject => 'c',   MemberOf => -2 },
-    { subject => 'rc1', RefersTo => -1 },
-    { subject => 'rc2', RefersTo => -2 },
+    { subject => 'rp',  refers_to => -1 },
+    { subject => 'c',   member_of => -2 },
+    { subject => 'rc1', refers_to => -1 },
+    { subject => 'rc2', refers_to => -2 },
 );
 @tickets = add_tix_from_data();
 my $pid = $tickets[1]->id;
 %test = (
-    'RefersTo IS NOT NULL'  => { '-' => 0, c => 0, p => 0, rp => 1, rc1 => 1, rc2 => 1 },
-    'RefersTo IS     NULL'  => { '-' => 1, c => 1, p => 1, rp => 0, rc1 => 0, rc2 => 0 },
-
-    'RefersTo IS NOT NULL AND MemberOf IS NOT NULL'  => { '-' => 0, c => 0, p => 0, rp => 0, rc1 => 0, rc2 => 0 },
-    'RefersTo IS NOT NULL AND MemberOf IS     NULL'  => { '-' => 0, c => 0, p => 0, rp => 1, rc1 => 1, rc2 => 1 },
-    'RefersTo IS     NULL AND MemberOf IS NOT NULL'  => { '-' => 0, c => 1, p => 0, rp => 0, rc1 => 0, rc2 => 0 },
-    'RefersTo IS     NULL AND MemberOf IS     NULL'  => { '-' => 1, c => 0, p => 1, rp => 0, rc1 => 0, rc2 => 0 },
-
-    'RefersTo IS NOT NULL OR  MemberOf IS NOT NULL'  => { '-' => 0, c => 1, p => 0, rp => 1, rc1 => 1, rc2 => 1 },
-    'RefersTo IS NOT NULL OR  MemberOf IS     NULL'  => { '-' => 1, c => 0, p => 1, rp => 1, rc1 => 1, rc2 => 1 },
-    'RefersTo IS     NULL OR  MemberOf IS NOT NULL'  => { '-' => 1, c => 1, p => 1, rp => 0, rc1 => 0, rc2 => 0 },
-    'RefersTo IS     NULL OR  MemberOf IS     NULL'  => { '-' => 1, c => 1, p => 1, rp => 1, rc1 => 1, rc2 => 1 },
-
-    "RefersTo  = $pid AND MemberOf  = $pid" => { '-' => 0, c => 0, p => 0, rp => 0, rc1 => 0, rc2 => 0 },
-    "RefersTo  = $pid AND MemberOf != $pid" => { '-' => 0, c => 0, p => 0, rp => 1, rc1 => 0, rc2 => 0 },
-    "RefersTo != $pid AND MemberOf  = $pid" => { '-' => 0, c => 1, p => 0, rp => 0, rc1 => 0, rc2 => 0 },
-    "RefersTo != $pid AND MemberOf != $pid" => { '-' => 1, c => 0, p => 1, rp => 0, rc1 => 1, rc2 => 1 },
-
-    "RefersTo  = $pid OR  MemberOf  = $pid" => { '-' => 0, c => 1, p => 0, rp => 1, rc1 => 0, rc2 => 0 },
-    "RefersTo  = $pid OR  MemberOf != $pid" => { '-' => 1, c => 0, p => 1, rp => 1, rc1 => 1, rc2 => 1 },
-    "RefersTo != $pid OR  MemberOf  = $pid" => { '-' => 1, c => 1, p => 1, rp => 0, rc1 => 1, rc2 => 1 },
-    "RefersTo != $pid OR  MemberOf != $pid" => { '-' => 1, c => 1, p => 1, rp => 1, rc1 => 1, rc2 => 1 },
+    'refers_to IS NOT NULL'  => { '-' => 0, c => 0, p => 0, rp => 1, rc1 => 1, rc2 => 1 },
+    'refers_to IS     NULL'  => { '-' => 1, c => 1, p => 1, rp => 0, rc1 => 0, rc2 => 0 },
+
+    'refers_to IS NOT NULL AND member_of IS NOT NULL'  => { '-' => 0, c => 0, p => 0, rp => 0, rc1 => 0, rc2 => 0 },
+    'refers_to IS NOT NULL AND member_of IS     NULL'  => { '-' => 0, c => 0, p => 0, rp => 1, rc1 => 1, rc2 => 1 },
+    'refers_to IS     NULL AND member_of IS NOT NULL'  => { '-' => 0, c => 1, p => 0, rp => 0, rc1 => 0, rc2 => 0 },
+    'refers_to IS     NULL AND member_of IS     NULL'  => { '-' => 1, c => 0, p => 1, rp => 0, rc1 => 0, rc2 => 0 },
+
+    'refers_to IS NOT NULL OR  member_of IS NOT NULL'  => { '-' => 0, c => 1, p => 0, rp => 1, rc1 => 1, rc2 => 1 },
+    'refers_to IS NOT NULL OR  member_of IS     NULL'  => { '-' => 1, c => 0, p => 1, rp => 1, rc1 => 1, rc2 => 1 },
+    'refers_to IS     NULL OR  member_of IS NOT NULL'  => { '-' => 1, c => 1, p => 1, rp => 0, rc1 => 0, rc2 => 0 },
+    'refers_to IS     NULL OR  member_of IS     NULL'  => { '-' => 1, c => 1, p => 1, rp => 1, rc1 => 1, rc2 => 1 },
+
+    "refers_to  = $pid AND member_of  = $pid" => { '-' => 0, c => 0, p => 0, rp => 0, rc1 => 0, rc2 => 0 },
+    "refers_to  = $pid AND member_of != $pid" => { '-' => 0, c => 0, p => 0, rp => 1, rc1 => 0, rc2 => 0 },
+    "refers_to != $pid AND member_of  = $pid" => { '-' => 0, c => 1, p => 0, rp => 0, rc1 => 0, rc2 => 0 },
+    "refers_to != $pid AND member_of != $pid" => { '-' => 1, c => 0, p => 1, rp => 0, rc1 => 1, rc2 => 1 },
+
+    "refers_to  = $pid OR  member_of  = $pid" => { '-' => 0, c => 1, p => 0, rp => 1, rc1 => 0, rc2 => 0 },
+    "refers_to  = $pid OR  member_of != $pid" => { '-' => 1, c => 0, p => 1, rp => 1, rc1 => 1, rc2 => 1 },
+    "refers_to != $pid OR  member_of  = $pid" => { '-' => 1, c => 1, p => 1, rp => 0, rc1 => 1, rc2 => 1 },
+    "refers_to != $pid OR  member_of != $pid" => { '-' => 1, c => 1, p => 1, rp => 1, rc1 => 1, rc2 => 1 },
 );
 {
     my $tix = RT::Model::TicketCollection->new(current_user => RT->system_user);
diff --git a/t/web/command_line.t b/t/web/command_line.t
index 08127ff..6af2940 100644
--- a/t/web/command_line.t
+++ b/t/web/command_line.t
@@ -414,10 +414,10 @@ expect_like(qr/Merged into ticket #$merge_ticket_A by root/, 'Merge recorded in
 # }}}
 
 # {{{ test ticket linking
-    my @link_relns = ( 'DependsOn', 'DependedOnBy', 'RefersTo', 'ReferredToBy',
-                       'MemberOf', 'has_member', );
+    my @link_relns = ( 'depends_on', 'depended_on_by', 'refers_to', 'referred_to_by',
+                       'member_of', 'has_member', );
     my %display_relns = map { $_ => $_ } @link_relns;
-    $display_relns{has_member} = 'Members';
+    $display_relns{has_member} = 'members';
 
     my $link1_id = ok_create_ticket( "LinkTicket1-$$" );
     my $link2_id = ok_create_ticket( "LinkTicket2-$$" );

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


More information about the Rt-commit mailing list