[Rt-commit] r10084 - in rt/branches/3.7-EXPERIMENTAL: . html/Elements/GnuPG

[ruz at bestpractical.com]

Author: ruz
Date: Mon Dec 24 18:49:08 2007
New Revision: 10084

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Elements/GnuPG/SignEncryptWidget
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html

Log:
 r9878 at cubic-pc (orig r9877):  ruz | 2007-12-11 02:48:25 +0300
 * move more duplicated code into one place


Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/GnuPG/SignEncryptWidget
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/GnuPG/SignEncryptWidget	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/GnuPG/SignEncryptWidget	Mon Dec 24 18:49:08 2007
@@ -18,3 +18,21 @@
     : ( $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') );
 push @signers, $session{'CurrentUser'}->EmailAddress;
 </%INIT>
+
+<%METHOD Process>
+<%ARGS>
+$QueueObj
+$Arguments => {}
+</%ARGS>
+<%INIT>
+return unless RT->Config->Get('GnuPG')->{'Enable'};
+
+foreach ( qw(Sign Encrypt) ) {
+    $Arguments->{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
+        Name => $_,
+        DefaultValue => $QueueObj->$_,
+        Arguments => $Arguments,
+    );
+}
+</%INIT>
+</%METHOD>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html	Mon Dec 24 18:49:08 2007
@@ -259,13 +259,10 @@
 );
 
 if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
-    foreach ( qw(Sign Encrypt) ) {
-        $ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
-            Name => $_,
-            DefaultValue => $QueueObj->$_,
-            Arguments => \%ARGS,
-        );
-    }
+    $m->comp( '/Elements/GnuPG/SignEncryptWidget:Process',
+        QueueObj => $QueueObj,
+        Arguments => \%ARGS,
+    );
 }
 
 # if no due date has been set explicitly, then use the

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html	Mon Dec 24 18:49:08 2007
@@ -175,13 +175,10 @@
 }
 
 if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
-    foreach ( qw(Sign Encrypt) ) {
-        $ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
-            Name => $_,
-            DefaultValue => $TicketObj->QueueObj->$_,
-            Arguments => \%ARGS,
-        );
-    }
+    $m->comp( '/Elements/GnuPG/SignEncryptWidget:Process',
+        QueueObj => $TicketObj->QueueObj,
+        Arguments => \%ARGS,
+    );
 }
 
 # Things needed in the template - we'll do the processing here, just