[Plone-cvs] CMFPlone StatelessTree.py,1.7,1.8

[<ro...@us...>]

Update of /cvsroot/plone/CMFPlone
In directory sc8-pr-cvs1:/tmp/cvs-serv14435

Modified Files:
	StatelessTree.py 
Log Message:
Fixed bugs in tree builder.


Index: StatelessTree.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/StatelessTree.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StatelessTree.py	3 Apr 2003 20:59:02 -0000	1.7
--- StatelessTree.py	30 Apr 2003 14:35:02 -0000	1.8
***************
*** 68,73 ****
      def checkPublished(self, o):
          try:
              if workflow_tool.getInfoFor(o,'review_state','') != 'published':
!                 return 0        
              now     = DateTime()
              start_pub = getattr(o,'effective_date',None)
--- 68,74 ----
      def checkPublished(self, o):
          try:
+ 	    workflow_tool = getToolByName(self, 'portal_workflow')
              if workflow_tool.getInfoFor(o,'review_state','') != 'published':
!                 return 0
              now     = DateTime()
              start_pub = getattr(o,'effective_date',None)
***************
*** 147,151 ****
                      
              if not showUnpublishedContent:  # the 'important' users may see unpublished content
!                 res = [o for o in res if checkPublished(o) ]
                      
              try:
--- 148,152 ----
                      
              if not showUnpublishedContent:  # the 'important' users may see unpublished content
!                 res = [o for o in res if self.checkPublished(o) ]
                      
              try: