[Rt-commit] rtir branch, 2.4-trunk, updated. 99385da3a68381f694e74254254efa3499e86a74

[Ruslan Zakirov]

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

Summary of changes:
 html/RTIR/Create.html                   |    6 +++++-
 html/RTIR/Elements/UpdateData           |    2 +-
 html/RTIR/Incident/Create.html          |    5 ++++-
 html/RTIR/Investigation/Elements/Create |    4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 99385da3a68381f694e74254254efa3499e86a74
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Dec 16 04:44:51 2009 +0300

    fix signature re-adding

diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index 13f1f7c..495b519 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -315,7 +315,11 @@ $ip_default ||= RT->Config->Get('_RTIR_IP_default') || '';
 %   }
 % }
 % $m->callback( %ARGS, CallbackPage => '/Ticket/Create.html', CallbackName => 'BeforeMessageBox' );
-<& /Elements/MessageBox, Default => $ARGS{Content}, QuoteTransaction => $QuoteTransaction &>
+% if ( $ARGS{Content} ) {
+<& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => 0 &>
+% } else {
+<& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction &>
+% }
     </td>
   </tr>
   <tr>
diff --git a/html/RTIR/Elements/UpdateData b/html/RTIR/Elements/UpdateData
index 6e21371..1b1a66c 100644
--- a/html/RTIR/Elements/UpdateData
+++ b/html/RTIR/Elements/UpdateData
@@ -46,7 +46,7 @@
 % $m->callback( %ARGS, CallbackPage => '/Ticket/Update.html', CallbackName => 'BeforeMessageBox' );
 % if ( exists $ARGS{'UpdateContent'} ) {
 % delete $ARGS{'QuoteTransaction'};
-<& /Elements/MessageBox, Name => "UpdateContent", Default => $ARGS{'UpdateContent'}, %ARGS &>
+<& /Elements/MessageBox, Name => "UpdateContent", Default => $ARGS{'UpdateContent'}, IncludeSignature => 0, %ARGS &>
 % } else {
 <& /Elements/MessageBox, Name => "UpdateContent", %ARGS &>
 % }
diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
index 82ac3d7..9ad7e4f 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -123,7 +123,10 @@ unless ( exists $ARGS{'Content'} ) {
     }
 }
 </%PERL>
-<& /Elements/MessageBox, Default => $ARGS{'Content'} &>
+<& /Elements/MessageBox,
+    Default => $ARGS{'Content'},
+    IncludeSignature => !$ARGS{'Content'},
+&>
 
 </td></tr>
 
diff --git a/html/RTIR/Investigation/Elements/Create b/html/RTIR/Investigation/Elements/Create
index 24660fd..9dd671d 100644
--- a/html/RTIR/Investigation/Elements/Create
+++ b/html/RTIR/Investigation/Elements/Create
@@ -92,9 +92,11 @@ email addresses. These people <b>will</b> receive future updates.)</&></font></i
 <td>
 % $m->callback( %ARGS, MessageBoxName => $NamePrefix .'Content',
 %    CallbackPage => '/Ticket/Create.html', CallbackName => 'BeforeMessageBox' );
+% my $content = $value_cb->('Content');
 <& /Elements/MessageBox,
     Name             => $NamePrefix .'Content',
-    Default          => $value_cb->('Content'),
+    Default          => $content,
+    IncludeSignature => !$content,
     QuoteTransaction => $value_cb->('QuoteTransaction'),
 &></td></tr>
 % }

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