[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - PageTemplateFile.py:1.30

[Stuart Bishop]

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv22166/lib/python/Products/PageTemplates

Modified Files:
	PageTemplateFile.py 
Log Message:
Merging to HEAD

Added getId() to Item_w__name__, since the one inherited from Item
has broken __name__ handling.

PageTemplateFile now using Item_w__name__ mixin, making getId()
and absolute_url() actually work.



=== Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.29 => 1.30 ===
--- Zope/lib/python/Products/PageTemplates/PageTemplateFile.py:1.29	Sat Oct  4 14:56:58 2003
+++ Zope/lib/python/Products/PageTemplates/PageTemplateFile.py	Sat Dec 13 02:57:50 2003
@@ -29,8 +29,9 @@
 from ComputedAttribute import ComputedAttribute
 from Acquisition import aq_parent, aq_inner
 from App.config import getConfiguration
+from OFS.SimpleItem import Item_w__name__
 
-class PageTemplateFile(Script, PageTemplate, Traversable):
+class PageTemplateFile(Item_w__name__, Script, PageTemplate, Traversable):
     "Zope wrapper for filesystem Page Template using TAL, TALES, and METAL"
 
     meta_type = 'Page Template (File)'