[Rt-commit] rt branch, 4.0/context-on-custom-fields, updated. rt-4.0.4-46-g8f11bb3

[? sunnavy]

The branch, 4.0/context-on-custom-fields has been updated
       via  8f11bb396670e47b66d4755b33113530374a70d8 (commit)
      from  2b3265a91a4e5e8cdf724ea218ea30fa501f73b2 (commit)

Summary of changes:
 share/html/Helpers/Autocomplete/CustomFieldValues |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 8f11bb396670e47b66d4755b33113530374a70d8
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Mar 15 11:15:50 2012 +0800

    set queue context object for autocomplete cf
    
    this fixes "SeeCustomField on Queue level doesn't work" bug, see #19570

diff --git a/share/html/Helpers/Autocomplete/CustomFieldValues b/share/html/Helpers/Autocomplete/CustomFieldValues
index 65e5170..d8985bb 100644
--- a/share/html/Helpers/Autocomplete/CustomFieldValues
+++ b/share/html/Helpers/Autocomplete/CustomFieldValues
@@ -53,15 +53,29 @@
 my $term = (split /\n/, $ARGS{term} || '')[-1];
 
 my $CustomField;
+
+my ( $Type, $ObjectId );
+
 for my $k ( keys %ARGS ) {
-    next unless $k =~ /^Object-.*?-\d*-CustomField-(\d+)-Values?$/;
-    $CustomField = $1;
+    next unless $k =~ /^Object-(.*?)-(\d*)-CustomField-(\d+)-Values?$/;
+    $Type = $1;
+    $ObjectId = $2;
+    $CustomField = $3;
     last;
 }
 
 $m->abort unless $CustomField;
 my $CustomFieldObj = RT::CustomField->new( $session{'CurrentUser'} );
 $CustomFieldObj->Load( $CustomField );
+$m->abort unless $CustomFieldObj->id;
+
+if ( $Type eq 'RT::Ticket' && $ObjectId) {
+    my $ticket = RT::Ticket->new( $session{'CurrentUser'} );
+    $ticket->Load($ObjectId);
+    if ( $ticket->id ) {
+        $CustomFieldObj->SetContextObject( $ticket->QueueObj );
+    }
+}
 
 my $values = $CustomFieldObj->Values;
 $values->Limit(

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