[otrs-cvs] otrs/Kernel/Modules AgentTicketCompose.pm,1.174,1.175

Comments:
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv13163/Kernel/Modules

Modified Files:
	AgentTicketCompose.pm 
Log Message:
Fixed bug 8950 - "Sign" and "crypt" are displayed two times in AgentTicketCompose.

Author: mg

Index: AgentTicketCompose.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketCompose.pm,v
retrieving revision 1.174
retrieving revision 1.175
diff -2 -u -d -r1.174 -r1.175
--- AgentTicketCompose.pm	20 Nov 2012 14:48:15 -0000	1.174
+++ AgentTicketCompose.pm	12 Dec 2012 13:47:24 -0000	1.175
@@ -1407,4 +1407,32 @@
         my $References = ( $Data{MessageID} || '' ) . ( $Data{References} || '' );
 
+        # run compose modules
+        if ( ref $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') eq 'HASH' )
+        {
+            my %Jobs = %{ $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') };
+            for my $Job ( sort keys %Jobs ) {
+
+                # load module
+                if ( !$Self->{MainObject}->Require( $Jobs{$Job}->{Module} ) ) {
+                    return $Self->{LayoutObject}->FatalError();
+                }
+                my $Object = $Jobs{$Job}->{Module}->new( %{$Self}, Debug => $Self->{Debug} );
+
+                # get params
+                for ( $Object->Option( %GetParam, Config => $Jobs{$Job} ) ) {
+                    $GetParam{$_} = $Self->{ParamObject}->GetParam( Param => $_ );
+                }
+
+                # run module
+                $Object->Run( %GetParam, Config => $Jobs{$Job} );
+
+                # get errors
+                %Error = (
+                    %Error,
+                    $Object->Error( %GetParam, Config => $Jobs{$Job} ),
+                );
+            }
+        }
+
         # build view ...
         $Output .= $Self->_Mask(
@@ -1678,36 +1706,4 @@
     );
 
-    # run compose modules
-    if ( ref $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') eq 'HASH' ) {
-        my %Jobs = %{ $Self->{ConfigObject}->Get('Ticket::Frontend::ArticleComposeModule') };
-        for my $Job ( sort keys %Jobs ) {
-
-            # load module
-            if ( !$Self->{MainObject}->Require( $Jobs{$Job}->{Module} ) ) {
-                return $Self->{LayoutObject}->FatalError();
-            }
-            my $Object = $Jobs{$Job}->{Module}->new( %{$Self}, Debug => $Self->{Debug}, );
-
-            # get params
-            for ( sort keys %{ $Param{GetParam} } ) {
-                if ( !$Param{GetParam}->{$_} && $Param{$_} ) {
-                    $Param{GetParam}->{$_} = $Param{$_};
-                }
-            }
-            for ( $Object->Option( %Param, %{ $Param{GetParam} }, Config => $Jobs{$Job} ) ) {
-                $Param{GetParam}->{$_} = $Self->{ParamObject}->GetParam( Param => $_ );
-            }
-
-            # run module
-            $Object->Run( %Param, %{ $Param{GetParam} }, Config => $Jobs{$Job} );
-
-            # get errors
-            %{ $Param{Errors} } = (
-                %{ $Param{Errors} },
-                $Object->Error( %{ $Param{GetParam} }, Config => $Jobs{$Job} )
-            );
-        }
-    }
-
     # Dynamic fields
     # cycle trough the activated Dynamic Fields for this screen
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log