[Rt-commit] rt branch, 4.0/braceless-subcolumns, created. rt-4.0.11-77-gbaa9833

[Thomas Sibley]

The branch, 4.0/braceless-subcolumns has been created
        at  baa9833ad095f89035d9ae9bf58f9b22dcffda60 (commit)

- Log -----------------------------------------------------------------
commit baa9833ad095f89035d9ae9bf58f9b22dcffda60
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Apr 26 14:18:34 2013 -0700

    Support braceless subcolumn syntax (CF.Foo) when fetching column map values
    
    For simple subcolumns without spaces or other special chars, "CF.Foo"
    now works.  Previously the simplest accepted syntax was "CF.{Foo}".  The
    most complex syntax remains "'__CF.{Foo Bar}__'".

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index ba7b56d..9703f33 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -3142,7 +3142,8 @@ sub GetColumnMapEntry {
     }
 
     # complex things
-    elsif ( my ( $mainkey, $subkey ) = $args{'Name'} =~ /^(.*?)\.{(.+)}$/ ) {
+    elsif ( my ( $mainkey, $subkey ) = $args{'Name'} =~ /^(.*?)\.(.+)$/ ) {
+        $subkey =~ s/^\{(.*)\}$/$1/;
         return undef unless $args{'Map'}->{$mainkey};
         return $args{'Map'}{$mainkey}{ $args{'Attribute'} }
             unless ref $args{'Map'}{$mainkey}{ $args{'Attribute'} } eq 'CODE';

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