X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FRT__Ticket%2FColumnMap;h=7309b5d66f65296aadcfef2247430c7d74a3014a;hb=b8988e1d3ac75af63c85e8563e57701030315a9e;hp=202a11a5ebd4bdc6e44428f039716d58c62a7470;hpb=679854b8bbc65d112071111bbd7f34a6a481fb30;p=freeside.git

diff --git a/rt/share/html/Elements/RT__Ticket/ColumnMap b/rt/share/html/Elements/RT__Ticket/ColumnMap
index 202a11a5e..7309b5d66 100644
--- a/rt/share/html/Elements/RT__Ticket/ColumnMap
+++ b/rt/share/html/Elements/RT__Ticket/ColumnMap
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -68,7 +68,7 @@ my $LinkCallback = sub {
             \'<a href="',
             $_->$mode_uri->Resolver->HREF,
             \'">',
-            ( $_->$mode_uri->IsLocal ? $_->$local_type : $_->$mode ),
+            ( $_->$mode_uri->IsLocal && $_->$local_type ? $_->$local_type : $_->$mode_uri->Resolver->AsString ),
             \'</a><br />',
         } @{ $_[0]->Links($other_mode,$type)->ItemsArrayRef }
     }
@@ -212,6 +212,11 @@ $COLUMN_MAP = {
             }
         }
     },
+    WillResolveRelative => {
+        title     => 'Will Resolve',
+        attribute => 'WillResolve',
+        value     => sub { return $_[0]->WillResolveObj->AgeAsString },
+    },
     ResolvedRelative => {
         title     => 'Resolved', # loc
         attribute => 'Resolved',
@@ -237,6 +242,11 @@ $COLUMN_MAP = {
         attribute => 'Due',
         value     => sub { return $_[0]->DueObj },
     },
+    WillResolve => {
+        title     => 'Will Resolve',
+        attribute => 'WillResolve',
+        value     => sub { return $_[0]->WillResolveObj },
+    },
     Resolved => {
         title     => 'Resolved', # loc
         attribute => 'Resolved',