[Zope-Checkins] CVS: Zope/lib/python/Products/SiteErrorLog/www - main.pt:1.3.4.1 showEntry.pt:1.3.30.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/SiteErrorLog/www
In directory cvs.zope.org:/tmp/cvs-serv27921/Products/SiteErrorLog/www

Modified Files:
      Tag: Zope-2_6-branch
	main.pt showEntry.pt 
Log Message:
Fix up calls to user objects' getUserName which should really be calls to 
getId.  This is a change designed to make it possible to disambiguate user names and user ids in subclasses of user folders, while still doing the "right thing" with respect to local data structures that keep pointers to user ids (eg. local roles, etc.)


=== Zope/lib/python/Products/SiteErrorLog/www/main.pt 1.3 => 1.3.4.1 ===
--- Zope/lib/python/Products/SiteErrorLog/www/main.pt:1.3	Wed Aug 21 10:23:25 2002
+++ Zope/lib/python/Products/SiteErrorLog/www/main.pt	Wed Oct 16 17:34:37 2002
@@ -67,7 +67,7 @@
 <table tal:condition="entries">
  <tr>
   <th align="left">Time</th>
-  <th align="left">User</th>
+  <th align="left">Username (User Id)</th>
   <th align="left">Exception</th>
  </tr>
  <tr tal:repeat="entry entries">
@@ -75,7 +75,9 @@
    <span tal:content="python: DateTime(entry['time']).Time()">13:04:41</span>
   </td>
   <td>
-   <span tal:content="entry/username">joe</span>
+   <span tal:content="string: ${entry/username} (${entry/userid})">
+      joe (joe)
+   </span>
   </td>
   <td valign="top">
    <a href="showEntry" tal:attributes="href string:showEntry?id=${entry/id}"


=== Zope/lib/python/Products/SiteErrorLog/www/showEntry.pt 1.3 => 1.3.30.1 ===
--- Zope/lib/python/Products/SiteErrorLog/www/showEntry.pt:1.3	Thu Apr  4 11:25:43 2002
+++ Zope/lib/python/Products/SiteErrorLog/www/showEntry.pt	Wed Oct 16 17:34:37 2002
@@ -17,8 +17,8 @@
   <td tal:content="python: DateTime(entry['time'])"></td>
  </tr>
  <tr>
-  <th align="left" valign="top">User</th>
-  <td tal:content="entry/username">joe</td>
+  <th align="left" valign="top">User Name (User Id)</th>
+  <td tal:content="string: ${entry/username} (${entry/userid})">joe (joe)</td>
  </tr>
  <tr>
   <th align="left" valign="top">Request URL</th>