[Rt-commit] r8967 - in rt/branches/3.7-EXPERIMENTAL: . html/User lib/RT

sartak at bestpractical.com sartak at bestpractical.com
Fri Sep 7 15:42:40 EDT 2007


Author: sartak
Date: Fri Sep  7 15:42:35 2007
New Revision: 8967

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Prefs/Other.html
   rt/branches/3.7-EXPERIMENTAL/html/User/Prefs.html
   rt/branches/3.7-EXPERIMENTAL/lib/RT/User_Overlay.pm

Log:
 r42435 at onn:  sartak | 2007-09-07 15:42:21 -0400
 Move key preference to the Other page instead of cluttering the Main pref page with it


Modified: rt/branches/3.7-EXPERIMENTAL/html/Prefs/Other.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Prefs/Other.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Prefs/Other.html	Fri Sep  7 15:42:35 2007
@@ -68,6 +68,12 @@
 </&>
 % }
 
+% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
+<&|/Widgets/TitleBox, title => loc( 'Cryptography' ) &>
+Preferred key: <& /Elements/SelectKey, EmailAddress => $UserObj->EmailAddress, Default => $UserObj->PreferredKey &>
+</&>
+% }
+
 <& /Elements/Submit, Name => 'Update', Label => loc('Save changes') &>
 </form>
 <%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/User/Prefs.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/User/Prefs.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/User/Prefs.html	Fri Sep  7 15:42:35 2007
@@ -311,5 +311,4 @@
 $Pass1 => undef
 $Pass2=> undef
 $Create=> undef
-$PreferredKey => undef
 </%ARGS>

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/User_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/User_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/User_Overlay.pm	Fri Sep  7 15:42:35 2007
@@ -1629,6 +1629,7 @@
     return $prefkey->Content if $prefkey;
 
     # we don't have a preferred key for this user, so now we must query GPG
+    require RT::Crypt::GnuPG;
     my %res = RT::Crypt::GnuPG::GetKeysInfo($self->EmailAddress);
     return undef unless defined $res{'info'};
     my @keys = @{ $res{'info'} };


More information about the Rt-commit mailing list