[Rt-commit] rt branch, 4.4/add-postgresql-apache-fcgid-tests2, updated. rt-4.4.4-195-gcf3a1b6fc2

[? sunnavy]

The branch, 4.4/add-postgresql-apache-fcgid-tests2 has been updated
       via  cf3a1b6fc2b68a99a746142ea05a166c4fceb302 (commit)
      from  b1c8847a7ff25fa6b86f6853e7d1d6b4288e8a09 (commit)

Summary of changes:
 share/html/Prefs/Other.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit cf3a1b6fc2b68a99a746142ea05a166c4fceb302
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Dec 24 05:14:22 2020 +0800

    No need to show "Preferred GnuPG key" if GnuPG is not enabled
    
    Otherwise RT would always try to get possible GnuPG keys, but GnuPG it's
    not fully set up, it would cause a few warnings like:
    
        got warning: gpg: keyblock resource '/opt/rt5/var/data/gpg/pubring.kbx': No such file or directory
        gpg: Fatal: /opt/rt5/var/data/gpg: directory does not exist!
    
    This could also cause tests that touch /Prefs/Other.html to fail, e.g.
    t/web/quickcreate.t, t/web/redirect-after-login.t, etc.
    
    Before 4.4/per-queue-outgoing-encryption-protocol, we didn't have this
    issue because "Protocol => GnuPG" was not explicitly passed, and
    RT::Crypt excluded the automatically-disabled GnuPG protocol.
    
    This commit hid the whole "Cryptography" widget since "Preferred GnuPG
    key" is the only input there.

diff --git a/share/html/Prefs/Other.html b/share/html/Prefs/Other.html
index e2526dbd91..537a102029 100644
--- a/share/html/Prefs/Other.html
+++ b/share/html/Prefs/Other.html
@@ -67,7 +67,7 @@
 </&>
 % }
 
-% if ( RT->Config->Get('Crypt')->{'Enable'} ) {
+% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
 <&|/Widgets/TitleBox, title => loc( 'Cryptography' ) &>
 <&|/l&>Preferred GnuPG key</&>: <& /Elements/Crypt/SelectKeyForEncryption, Name => 'PreferredKey', EmailAddress => $UserObj->EmailAddress, Default => $UserObj->PreferredKey, Protocol => 'GnuPG' &>
 </&>

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