[Rt-commit] rt branch, master, updated. rt-4.1.5-193-gc10ff30

[Alex Vandiver]

The branch, master has been updated
       via  c10ff30f60529fa7665f443a951850be8f14f783 (commit)
       via  11b459fd1724ad8b556629d0a1ce6855efa5c612 (commit)
      from  cbaf98142cd3ec55e976883b7951081846620364 (commit)

Summary of changes:
 share/html/Elements/ColumnMap | 2 ++
 1 file changed, 2 insertions(+)

- Log -----------------------------------------------------------------
commit c10ff30f60529fa7665f443a951850be8f14f783
Merge: cbaf981 11b459f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 28 20:09:33 2012 -0500

    Merge branch '4.2/current-user-in-format'
    
    Conflicts:
    	share/html/Elements/ColumnMap

diff --cc share/html/Elements/ColumnMap
index 4c660aa,4fa8214..e504926
--- a/share/html/Elements/ColumnMap
+++ b/share/html/Elements/ColumnMap
@@@ -172,15 -160,8 +172,17 @@@ my $COLUMN_MAP = 
      } qw(WebPath WebBaseURL WebURL)),
      WebRequestPath    => { value => sub { substr( $m->request_path, 1 ) } },
      WebRequestPathDir => { value => sub { substr( $m->request_comp->dir_path, 1 ) } },
 +    WebHomePath       => {
 +        value => sub {
 +            my $path = RT->Config->Get("WebPath");
 +            if (not $session{CurrentUser}->Privileged) {
 +                $path .= "/SelfService";
 +            }
 +            return \$path;
 +        },
 +    },
+     CurrentUser       => { value => sub { $session{CurrentUser}->id } },
+     CurrentUserName   => { value => sub { $session{CurrentUser}->Name } },
  };
  
  $COLUMN_MAP->{'CF'} = $COLUMN_MAP->{'CustomField'};

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