[Rt-commit] r7391 - in rt/branches/3.7-EXPERIMENTAL: . html/Admin/Users/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Thu Mar 29 11:52:48 2007
New Revision: 7391

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Elements/ShowPublicKeyInfo
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Modify.html

Log:
 r4847 at cubic-pc:  cubic | 2007-03-29 19:10:50 +0400
 * use an address as argument instead of an user's object


Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Elements/ShowPublicKeyInfo
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Elements/ShowPublicKeyInfo	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Elements/ShowPublicKeyInfo	Thu Mar 29 11:52:48 2007
@@ -12,13 +12,11 @@
 </&>
 
 <%ARGS>
-$UserObj
+$EmailAddress
 </%ARGS>
 <%INIT>
-return unless $UserObj->EmailAddress;
-
 require RT::Crypt::GnuPG;
-my %res = RT::Crypt::GnuPG::GetPublicKeyInfo( $UserObj->EmailAddress );
+my %res = RT::Crypt::GnuPG::GetPublicKeyInfo( $EmailAddress );
 
 </%INIT>
 

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Modify.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Modify.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Modify.html	Thu Mar 29 11:52:48 2007
@@ -232,7 +232,9 @@
 </&>
 % }
 
-<& Elements/ShowPublicKeyInfo, UserObj => $UserObj &>
+% if ( my $email = $UserObj->EmailAddress ) {
+<& Elements/ShowPublicKeyInfo, EmailAddress => $email &>
+% }
 
 </td>
 </tr>