[Rt-commit] [rtir] 03/09: Pass back Defaults calculated

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch 3.2/customfieldgroupings
in repository rtir.

commit 1791f744dab028b4a55c86c3c3e341417fd1e5df
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jul 25 14:40:45 2014 -0400

    Pass back Defaults calculated
    
    We need to show defaults in Grouped Custom Fields also.  This means
    passing back our calculated Defaults so that
    EditCustomFieldsCustomGrouings can use them.
    
    Primarily just renaming Defaults to ConfigDefaults and ARGS to
    CFDefaults in the hopes of making this easier to read.
    
    CFDefaults is passed back by reference to be used in any code that wants
    to show CF Groups during Ticket Creation.
---
 html/RTIR/Elements/EditCustomFields | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/html/RTIR/Elements/EditCustomFields b/html/RTIR/Elements/EditCustomFields
index 2fa3077..7362565 100644
--- a/html/RTIR/Elements/EditCustomFields
+++ b/html/RTIR/Elements/EditCustomFields
@@ -50,6 +50,7 @@
   QueueObj => $QueueObj,
   ($TicketObj->Id ? () : (CustomFields => $QueueObj->TicketCustomFields)), # on ticket creation, use Queue CFs
   %ARGS,
+  %$CFDefaults,
   InTable => 1,
 &>
 
@@ -57,7 +58,7 @@
 unless ( $TicketObj && $TicketObj->Id ) {
     # no ticket, we need to find defaults of cfs
     my $CustomFields = $QueueObj->TicketCustomFields();
-    my %Defaults = RT->Config->Get('RTIR_CustomFieldsDefaults');
+    my %ConfigDefaults = RT->Config->Get('RTIR_CustomFieldsDefaults');
     while ( my $CustomField = $CustomFields->Next ) {
         my $name = $CustomField->Name;
 
@@ -65,32 +66,32 @@ unless ( $TicketObj && $TicketObj->Id ) {
             my ($link_cf) = RT::IR->CustomFields( Field => $name, Ticket => $DefaultsFrom );
             if ( $link_cf ) {
 # XXX: if CF can have only one value then we should use only first value
-                $ARGS{"CustomField-".$CustomField->Id} = join "\n",
+                $CFDefaults->{"CustomField-".$CustomField->Id} = join "\n",
                     grep defined && length, map $_->Content,
                     @{ $DefaultsFrom->CustomFieldValues( $link_cf->id )->ItemsArrayRef };
                 next;
             }
         }
-        
+
         if ( $ARGS{"$name-Value"} ) {
-            $ARGS{"CustomField-".$CustomField->Id} = $ARGS{"$name-Value"};
+            $CFDefaults->{"CustomField-".$CustomField->Id} = $ARGS{"$name-Value"};
         }
-        elsif ( defined $Defaults{ $name } ) {
-# if $Defaults{$name} is ref, it should be treated carefully
-            unless ( ref $Defaults{ $name } ) {
-                $ARGS{"CustomField-".$CustomField->Id} = $Defaults{ $name };
+        elsif ( defined $ConfigDefaults{ $name } ) {
+# if $ConfigDefaults{$name} is ref, it should be treated carefully
+            unless ( ref $ConfigDefaults{ $name } ) {
+                $CFDefaults->{"CustomField-".$CustomField->Id} = $ConfigDefaults{ $name };
             }
-            elsif ( ref $Defaults{ $name } eq 'ARRAY' ) {
-                $ARGS{"CustomField-".$CustomField->id} =
-                    join "\n", @{$Defaults{ $name }};
+            elsif ( ref $ConfigDefaults{ $name } eq 'ARRAY' ) {
+                $CFDefaults->{"CustomField-".$CustomField->id} =
+                    join "\n", @{$ConfigDefaults{ $name }};
             }
         }
     }
 }
-
 </%INIT>
 <%ARGS>
 $TicketObj => undef
 $QueueObj => undef
 $DefaultsFrom => undef
+$CFDefaults => {}
 </%ARGS>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.