[Rt-commit] rtir branch, 2.4-trunk, updated. 3d11b0e237564b54fc48220d7f1687fda60d3c41

[Ruslan Zakirov]

The branch, 2.4-trunk has been updated
       via  3d11b0e237564b54fc48220d7f1687fda60d3c41 (commit)
      from  99385da3a68381f694e74254254efa3499e86a74 (commit)

Summary of changes:
 html/RTIR/Create.html          |    7 +++++--
 html/RTIR/Incident/Create.html |    5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 3d11b0e237564b54fc48220d7f1687fda60d3c41
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Dec 18 20:04:29 2009 +0300

    include user's signature in some cases
    
    include sginature when content is empty, but we generate it from
    tickets, transactions or other sources.

diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index 495b519..e4eeba6 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -292,7 +292,8 @@ $ip_default ||= RT->Config->Get('_RTIR_IP_default') || '';
   <tr>
     <td class="labeltop"><&|/l&>Message</&>:</td>
     <td colspan="2">
-% if (!exists $ARGS{Content}) {
+% my $include_signature = 1;
+% unless (exists $ARGS{Content}) {
 %   my $Transactions;
 %   if ($TicketObj) {
 %     $Transactions = $TicketObj->Transactions;
@@ -313,10 +314,12 @@ $ip_default ||= RT->Config->Get('_RTIR_IP_default') || '';
 %      QuoteText => $quote);
 %      $ARGS{Content} =~ s/\&gt;/>/g;
 %   }
+% } else {
+%   $include_signature = 0;
 % }
 % $m->callback( %ARGS, CallbackPage => '/Ticket/Create.html', CallbackName => 'BeforeMessageBox' );
 % if ( $ARGS{Content} ) {
-<& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => 0 &>
+<& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => $include_signature &>
 % } else {
 <& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction &>
 % }
diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
index 9ad7e4f..f43f25d 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -106,6 +106,7 @@ if ( $ChildObj && !$ChildObj->CurrentUserHasRight('ModifyTicket') ) {
 <tr><td class="labeltop"><&|/l&>Message</&>:</td>
 <td>
 <%PERL>
+my $include_signature = 1;
 unless ( exists $ARGS{'Content'} ) {
     my $Transactions;
     if ( $TicketObj ) {
@@ -121,11 +122,13 @@ unless ( exists $ARGS{'Content'} ) {
         ) || '';
         $ARGS{'Content'} =~ s/\&gt;/>/g;
     }
+} else {
+    $include_signature = 0;
 }
 </%PERL>
 <& /Elements/MessageBox,
     Default => $ARGS{'Content'},
-    IncludeSignature => !$ARGS{'Content'},
+    IncludeSignature => $include_signature,
 &>
 
 </td></tr>

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