[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.8-205-g88d18cd

[Jesse Vincent]

The branch, 3.8-trunk has been updated
       via  88d18cde6e8fabbc6868432ddad33a89c9b13b9c (commit)
      from  96af87f6443d576adcafc1ee58684b7989bf2b98 (commit)

Summary of changes:
 share/html/Admin/Queues/Modify.html |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 88d18cde6e8fabbc6868432ddad33a89c9b13b9c
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Nov 30 10:06:58 2010 -0500

    Add slightly better diagnostic information on a slightly misconfigured
    GnuPG setup.

diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 46f444c..a5cbfd8 100755
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -121,12 +121,26 @@
 </td></tr>
 
 % if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
+<tr><td colspan="4">
 % if ( my $email = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') ) {
-<tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &></td></tr>
+<& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
+% } else {
+<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &>
+<i><&|/l&>You have enabled GnuPG support but have not set a correspondence address for this queue.</&>
+<&|/l&>You must set a correspondence address for this queue in order to configure a GnuPG private key.</&></i>
+</&>
 % }
+</td></tr>
+<tr><td colspan="4">
 % if ( my $email = $QueueObj->CommentAddress || RT->Config->Get('CommentAddress') ) {
-<tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &></td></tr>
-% }
+<& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
+% } else {
+<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &>
+<i><&|/l&>You have enabled GnuPG support but have not set a comment address for this queue.</&>
+<&|/l&>You must set a comment address for this queue in order to configure a GnuPG private key.</&></i>
+</&>
+%}
+</td></tr>
 % }
 
 </table>

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