[Rt-commit] r7691 - in rtir/branches/2.3-EXPERIMENTAL: . html/RTIR html/RTIR/Incident

[ruz at bestpractical.com]

Author: ruz
Date: Wed Apr 25 09:49:15 2007
New Revision: 7691

Modified:
   rtir/branches/2.3-EXPERIMENTAL/   (props changed)
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Investigation/Elements/Create

Log:
 r1920 at cubic-pc:  cubic | 2007-04-25 16:10:11 +0400
 * add Sign/Encrypt to all Create forms we have


Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html	Wed Apr 25 09:49:15 2007
@@ -262,11 +262,11 @@
   </tr>
   <tr><td colspan="3"><& SELF:AttachmentsForm &></td><tr>
 
-  <tr>
-    <td>&nbsp;</td>
-    <td><% loc('Sign')%><& /Widgets/Form/Boolean:InputOnly, Name => 'Sign', CurrentValue => $ARGS{'Sign'} &></td>
-    <td><% loc('Encrypt')%><& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $ARGS{'Encrypt'} &></td>
-  </tr>
+  <tr><td>&nbsp;</td><td colspan="2">
+    <% loc('Sign')%> <& /Widgets/Form/Boolean:InputOnly, Name => 'Sign', CurrentValue => $ARGS{'Sign'} &>
+    &nbsp;&nbsp;&nbsp;
+    <% loc('Encrypt')%> <& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $ARGS{'Encrypt'} &>
+  </td></tr>
 
   <tr>
     <td class="labeltop"><&|/l&>Message</&>:</td>

Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Create.html	Wed Apr 25 09:49:15 2007
@@ -94,6 +94,12 @@
 
 <& Elements/Create, Title => $Title, TicketObj => $TicketObj, QueueObj => $QueueObj, ChildObj => $ChildObj, %ARGS &>
 
+<tr><td>&nbsp;</td><td>
+<% loc('Sign')%> <& /Widgets/Form/Boolean:InputOnly, Name => 'Sign', CurrentValue => $ARGS{'Sign'} &>
+&nbsp;&nbsp;&nbsp;
+<% loc('Encrypt')%> <& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $ARGS{'Encrypt'} &>
+</td></tr>
+
 <tr><td class="labeltop"><&|/l&>Message</&>:</td>
 <td>
 <%PERL>
@@ -203,6 +209,14 @@
 my $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
 $QueueObj->Load( 'Incidents' ) || Abort( loc("Queue could not be loaded.") );
 
+foreach ( qw(Sign Encrypt) ) {
+    $ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
+        Name => $_,
+        DefaultValue => $QueueObj->$_,
+        Arguments => \%ARGS,
+    );
+}
+
 $m->comp( '/RTIR/Create.html:ProcessAttachments', %ARGS );
 
 my $checks_failure = 0;

Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Investigation/Elements/Create
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Investigation/Elements/Create	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Investigation/Elements/Create	Wed Apr 25 09:49:15 2007
@@ -71,6 +71,20 @@
 <& /RTIR/Create.html:AttachmentsForm &>
 % }
 
+% unless ( $SkipField{'SignEncrypt'} ) {
+<tr><td>&nbsp;</td><td>
+<% loc('Sign')%> <& /Widgets/Form/Boolean:InputOnly,
+    Name => $NamePrefix .'Sign',
+    CurrentValue => $ARGS{ $NamePrefix .'Sign' },
+&>
+&nbsp;&nbsp;&nbsp;
+<% loc('Encrypt')%> <& /Widgets/Form/Boolean:InputOnly,
+    Name => $NamePrefix .'Encrypt',
+    CurrentValue => $ARGS{ $NamePrefix .'Encrypt' },
+&>
+</td></tr>
+% }
+
 % unless ( $SkipField{'Content'} || $HideField{'Content'} ) {
 <tr><td class="labeltop"><&|/l&>Message</&>:</td>
 <td><& /Elements/MessageBox,
@@ -118,12 +132,21 @@
     return $value;
 };
 
-if ( !$QueueObj ) {
+unless ( $QueueObj ) {
     if ( my $queue = $value_cb->('Queue') ) {
         $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
         $QueueObj->Load( $queue );
     }
 }
+
+foreach ( qw(Sign Encrypt) ) {
+    $ARGS{ $NamePrefix . $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
+        Name => $NamePrefix . $_,
+        DefaultValue => $QueueObj->$_,
+        Arguments => \%ARGS,
+    );
+}
+
 </%INIT>
 
 <%METHOD Process>