[freeside-commits] freeside/rt/share/html/Admin/Elements EditCustomFields, 1.4, 1.5

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rt/share/html/Admin/Elements
In directory wavetail.420.am:/tmp/cvs-serv2120/share/html/Admin/Elements

Modified Files:
	EditCustomFields 
Log Message:
commiting rt 3.8.10 to HEAD

Index: EditCustomFields
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Admin/Elements/EditCustomFields,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- EditCustomFields	17 Feb 2011 00:52:26 -0000	1.4
+++ EditCustomFields	18 Apr 2011 23:49:54 -0000	1.5
@@ -59,10 +59,7 @@
     Rows          => 0,
     Page          => 1,
     Format        => $format,
-    DisplayFormat =>
-        $id
-            ? ("'__RemoveCheckBox.{$id}__',". $format .", '__MoveCF.{$id}__'")
-            : ("'__CheckBox.{RemoveCustomField}__',". $format .", '__MoveCF.{$id}__'"),
+    DisplayFormat => $display_format,
     AllowSorting  => 0,
     ShowEmpty     => 0,
     PassArguments => [
@@ -151,6 +148,8 @@
     }
 }
 
+$m->callback(CallbackName => 'UpdateExtraFields', Results => \@results, Object => $Object, %ARGS);
+
 my $applied_cfs = RT::CustomFields->new( $session{'CurrentUser'} );
 $applied_cfs->LimitToLookupType($lookup);
 $applied_cfs->LimitToGlobalOrObjectId($id);
@@ -162,6 +161,11 @@
 
 my $format = RT->Config->Get('AdminSearchResultFormat')->{'CustomFields'};
 
+my $display_format = $id
+            ? ("'__RemoveCheckBox.{$id}__',". $format .", '__MoveCF.{$id}__'")
+            : ("'__CheckBox.{RemoveCustomField}__',". $format .", '__MoveCF.{$id}__'");
+$m->callback(CallbackName => 'EditDisplayFormat', DisplayFormat => \$display_format, id => $id);
+
 </%INIT>
 <%ARGS>
 $Object