[Rt-commit] rt branch, 3.999-trunk, updated. 1929c2c3b0c88442a9431fbad1d93026b8665359

[sartak at bestpractical.com]

The branch, 3.999-trunk has been updated
       via  1929c2c3b0c88442a9431fbad1d93026b8665359 (commit)
      from  0741ad2380da9f1e7b61eff77e79c5d8dc3ce876 (commit)

Summary of changes:
 lib/RT/Action/CreateTicket.pm |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 1929c2c3b0c88442a9431fbad1d93026b8665359
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Nov 25 07:19:58 2009 -0500

    Jifty hides validation errors from hidden fields, so attach the validation error to "sign"

diff --git a/lib/RT/Action/CreateTicket.pm b/lib/RT/Action/CreateTicket.pm
index 4a3e77f..27ea5a2 100644
--- a/lib/RT/Action/CreateTicket.pm
+++ b/lib/RT/Action/CreateTicket.pm
@@ -228,14 +228,15 @@ sub validate_sign_using {
 
     return if !$self->argument_value('sign');
 
-    unless ( RT::Crypt::GnuPG::dry_sign($address) ) {
-        return $self->validation_error(sign_using => _("The system is unable to sign outgoing email messages. This usually indicates that the passphrase was mis-set, or that GPG Agent is down. Please alert your system administrator immediately. The problem address is: %1", $address));
-    } else {
-        # should this use argument_value('sign_using') or $address?
-        RT::Crypt::GnuPG::use_key_for_signing($self->argument_value('sign_using'))
-            if $self->argument_value('sign_using');
+    if (!RT::Crypt::GnuPG::dry_sign($address)) {
+        return $self->validation_error(sign=> _("The system is unable to sign outgoing email messages. This usually indicates that the passphrase was mis-set, or that GPG Agent is down. Please alert your system administrator immediately. The problem address is: %1", $address));
     }
 
+    # should this use argument_value('sign_using') or $address?
+    RT::Crypt::GnuPG::use_key_for_signing($self->argument_value('sign_using'))
+        if $self->argument_value('sign_using');
+
+    return $self->validation_ok('sign');
 }
 
 sub select_key_for_encryption {

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