[Zope3-checkins] SVN: Zope3/trunk/ undo 28423 and 28424

[Dominik Huber]

Log message for revision 28440:
  undo 28423 and 28424

Changed:
  U   Zope3/trunk/doc/CHANGES.txt
  U   Zope3/trunk/src/zope/app/uniqueid/browser/__init__.py
  U   Zope3/trunk/src/zope/app/uniqueid/browser/registrations.pt

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2004-11-11 17:14:35 UTC (rev 28439)
+++ Zope3/trunk/doc/CHANGES.txt	2004-11-11 20:13:55 UTC (rev 28440)
@@ -192,8 +192,6 @@
 
     Bug Fixes
 
-      - Fixed the registerd object view of the uniqueid utility.
-
       - Fixed the page that reports "system errors", errors that
         represent a failure of the system, rather than the user, to set
         the response status to 500.

Modified: Zope3/trunk/src/zope/app/uniqueid/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/uniqueid/browser/__init__.py	2004-11-11 17:14:35 UTC (rev 28439)
+++ Zope3/trunk/src/zope/app/uniqueid/browser/__init__.py	2004-11-11 20:13:55 UTC (rev 28440)
@@ -17,13 +17,6 @@
 """
 from zope.security.proxy import removeSecurityProxy
 from zope.app import zapi
-
-
-def saveGetPath(obj):
-    try:
-        return zapi.getPath(obj)
-    except:
-        return None
     
 
 class UniqueIdUtilityView(object):
@@ -38,4 +31,4 @@
         self.request.response.redirect('index.html')
 
     def items(self):  
-        return [(uid, saveGetPath(ref())) for uid, ref in self.context.items()]
+        return [(uid, zapi.getPath(ref())) for uid, ref in self.context.items()]

Modified: Zope3/trunk/src/zope/app/uniqueid/browser/registrations.pt
===================================================================
--- Zope3/trunk/src/zope/app/uniqueid/browser/registrations.pt	2004-11-11 17:14:35 UTC (rev 28439)
+++ Zope3/trunk/src/zope/app/uniqueid/browser/registrations.pt	2004-11-11 20:13:55 UTC (rev 28440)
@@ -9,7 +9,7 @@
 	<tr><th i18n:translate="">ID</th><th i18n:translate="">Object</th></tr>
 	<tr tal:repeat="row view/items">
 	  <td tal:content="python:row[0]" />
-	  <td><a tal:content="python:row[1] or default" tal:attributes="href python:row[1]">orphan</a></td>
+	  <td><a tal:content="python:row[1]" tal:attributes="href python:row[1]" /></td>
 	</tr>
       </table>
   </div>