[Zope3-checkins] CVS: zopeproducts/demo/messageboard/step10/browser - message.py:1.3 messageboard.py:1.3 thread.py:1.2

[Stephan Richter]

Update of /cvs-repository/zopeproducts/demo/messageboard/step10/browser
In directory cvs.zope.org:/tmp/cvs-serv19169/browser

Modified Files:
	message.py messageboard.py thread.py 
Log Message:
Fixed step 10.


=== zopeproducts/demo/messageboard/step10/browser/message.py 1.2 => 1.3 ===
--- zopeproducts/demo/messageboard/step10/browser/message.py:1.2	Thu Aug 21 16:53:34 2003
+++ zopeproducts/demo/messageboard/step10/browser/message.py	Mon Dec 15 09:38:21 2003
@@ -25,7 +25,7 @@
 class MessageDetails:
 
     def author(self):
-        """Get user who last modified the Wiki Page."""
+        """Get user who last modified the message."""
         creators = zapi.getAdapter(self.context, ICMFDublinCore).creators
         if not creators:
             return 'unknown'


=== zopeproducts/demo/messageboard/step10/browser/messageboard.py 1.2 => 1.3 ===
--- zopeproducts/demo/messageboard/step10/browser/messageboard.py:1.2	Thu Aug 21 16:53:34 2003
+++ zopeproducts/demo/messageboard/step10/browser/messageboard.py	Mon Dec 15 09:38:21 2003
@@ -23,7 +23,6 @@
 from zopeproducts.messageboard.interfaces import IMessage
 
 from zope.app.browser.container.adding import Adding
-from zope.app.context import ContextWrapper
 from zope.app.services.service import ServiceManager, ServiceRegistration
 from zope.app.services.servicenames import Workflows
 from zope.app.traversing import getPath, getParent, traverse
@@ -97,10 +96,9 @@
         msgs = []
         for name, msg in wrapped_pmsg.items():
             if IMessage.isImplementedBy(msg):
-                wrapped_msg = ContextWrapper(msg, wrapped_pmsg, name=name)
                 if hasMessageStatus(msg, 'pending'):
-                    msgs.append(ContextWrapper(msg, wrapped_msg, name=name))
-                msgs += self.getPendingMessages(wrapped_msg)
+                    msgs.append(msg)
+                msgs += self.getPendingMessages(msg)
         return msgs
 
     def getPendingMessagesInfo(self):


=== zopeproducts/demo/messageboard/step10/browser/thread.py 1.1 => 1.2 ===
--- zopeproducts/demo/messageboard/step10/browser/thread.py:1.1	Thu Jul 17 14:23:21 2003
+++ zopeproducts/demo/messageboard/step10/browser/thread.py	Mon Dec 15 09:38:21 2003
@@ -17,7 +17,6 @@
 """
 from messageboard import hasMessageStatus
 from zopeproducts.messageboard.interfaces import IMessage
-from zope.app.context import ContextWrapper
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 
 class Thread:
@@ -32,12 +31,11 @@
         for name, child in self.context.items():
             if IMessage.isImplementedBy(child) and \
                    hasMessageStatus(child, 'published'):
-                wrapped = ContextWrapper(child, self.context, name=name)
                 info = {}
                 info['title'] = child.title
                 url = self.base_url + name + '/'
                 info['url'] = url + '@@thread.html'
-                thread = Thread(wrapped, self.request, url)
+                thread = Thread(child, self.request, url)
                 info['thread'] = thread.subthread()
                 children.append(info)
         return children