[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-125-g4d732b9

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  4d732b981c03849b1a187b214b0391ee8e1070de (commit)
      from  dde5b9902f12c14e5fdea5114f71c74b28d6a1ba (commit)

Summary of changes:
 share/html/Elements/ColumnMap            |   22 ++++++++++++++++++++++
 share/html/Elements/RT__Ticket/ColumnMap |   22 ----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

- Log -----------------------------------------------------------------
commit 4d732b981c03849b1a187b214b0391ee8e1070de
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Feb 2 13:43:33 2010 +0300

    adjust ColumnMaps, CustomFields are applicable not only to tickets

diff --git a/share/html/Elements/ColumnMap b/share/html/Elements/ColumnMap
index 71517e0..e84d3cd 100644
--- a/share/html/Elements/ColumnMap
+++ b/share/html/Elements/ColumnMap
@@ -92,6 +92,26 @@ my $COLUMN_MAP = {
         value     => sub { return $_[0]->LastUpdatedByObj->Name }
     },
 
+    CustomField => {
+        attribute => sub { return shift @_ },
+        title     => sub { return pop @_ },
+        value     => sub {
+            # Display custom field contents, separated by newlines.
+            # For Image custom fields we also show a thumbnail here.
+
+            my $values = $_[0]->CustomFieldValues( $_[-1] );
+            my @values = map {
+                (
+                    ($_->CustomFieldObj->Type eq 'Image')
+                        ? \($m->scomp( '/Elements/ShowCustomFieldImage', Object => $_ ))
+                        : $_->Content
+                ),
+                \'<br />',
+            } @{ $values->ItemsArrayRef };
+            pop @values; # Remove that last <br />
+            return @values;
+        },
+    },
 
     CheckBox => {
         title => sub {
@@ -138,6 +158,8 @@ my $COLUMN_MAP = {
     } qw(WebPath WebBaseURL WebURL)),
 };
 
+$COLUMN_MAP->{'CF'} = $COLUMN_MAP->{'CustomField'};
+
 </%ONCE>
 <%INIT>
 $m->callback( COLUMN_MAP => $COLUMN_MAP, CallbackName => 'Once', CallbackOnce => 1 );
diff --git a/share/html/Elements/RT__Ticket/ColumnMap b/share/html/Elements/RT__Ticket/ColumnMap
index 7df4710..c1f9e31 100644
--- a/share/html/Elements/RT__Ticket/ColumnMap
+++ b/share/html/Elements/RT__Ticket/ColumnMap
@@ -303,26 +303,6 @@ $COLUMN_MAP = {
         value     => sub { return \('<input type="checkbox" class="checkbox" name="UpdateTicket'.$_[0]->id.'" value="1" checked="checked" />') }
     },
 
-    CustomField => {
-        attribute => sub { return shift @_ },
-        title     => sub { return pop @_ },
-        value     => sub {
-            # Display custom field contents, separated by newlines.
-            # For Image custom fields we also show a thumbnail here.
-
-            my $values = $_[0]->CustomFieldValues( $_[-1] );
-            my @values = map {
-                (
-                    ($_->CustomFieldObj->Type eq 'Image')
-                        ? \($m->scomp( '/Elements/ShowCustomFieldImage', Object => $_ ))
-                        : $_->Content
-                ),
-                \'<br />',
-            } @{ $values->ItemsArrayRef };
-            pop @values; # Remove that last <br />
-            return @values;
-        },
-    },
     Bookmark => {
         title => ' ',
         value => sub {
@@ -335,8 +315,6 @@ $COLUMN_MAP = {
     },
 };
 
-$COLUMN_MAP->{'CF'} = $COLUMN_MAP->{'CustomField'};
-
 # if no GPG support, then KeyOwnerName and KeyRequestors fall back to the regular
 # versions
 if (RT->Config->Get('GnuPG')->{'Enable'}) {

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