[Plone-cvs] CMFPlone CustomizationPolicy.py,1.47,1.48 MembershipTool.py,1.15,1.16 StatelessTree.py,1.3,1.4

[<mag...@us...>]

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

Modified Files:
	CustomizationPolicy.py MembershipTool.py StatelessTree.py 
Log Message:

*** CMF HEAD REQUIRED ***

Added support for :

  * Un-hardwired members folder. (CMF Collector #128)

It is now possible to change Members folder id using
portal_membership. All references to a hardcoded 'Members' should be
removed now.


Index: CustomizationPolicy.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/CustomizationPolicy.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** CustomizationPolicy.py	17 Feb 2003 02:36:32 -0000	1.47
--- CustomizationPolicy.py	21 Feb 2003 12:38:50 -0000	1.48
***************
*** 173,177 ****
  
          at.addAction('index_html','Welcome','portal_url','', 'View', 'portal_tabs')
!         at.addAction('Members','Members','string:$portal_url/Members','','View','portal_tabs')
          at.addAction('news','News','string:$portal_url/news','','View', 'portal_tabs')	
          at.addAction('search_form','Search','string:$portal_url/search_form','','View','portal_tabs')
--- 173,177 ----
  
          at.addAction('index_html','Welcome','portal_url','', 'View', 'portal_tabs')
!         at.addAction('Members','Members','python:portal.portal_membership.getMembersFolder().absolute_url()','python:portal.portal_membership.getMembersFolder()','View','portal_tabs')
          at.addAction('news','News','string:$portal_url/news','','View', 'portal_tabs')	
          at.addAction('search_form','Search','string:$portal_url/search_form','','View','portal_tabs')

Index: MembershipTool.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/MembershipTool.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MembershipTool.py	18 Feb 2003 13:47:01 -0000	1.15
--- MembershipTool.py	21 Feb 2003 12:38:50 -0000	1.16
***************
*** 86,94 ****
          """
          parent = self.aq_inner.aq_parent
!         members =  getattr(parent, 'Members', None)
  
          if members is None:
!             parent.manage_addPloneFolder(id='Members', title='Members')
!             members = getattr(parent, 'Members', None)
              
          if members is not None and not hasattr(members, member_id):
--- 86,106 ----
          """
          parent = self.aq_inner.aq_parent
!         members =  self.getMembersFolder()
  
          if members is None:
!             parent.manage_addPloneFolder(id=self.membersfolder_id, title='Members')
!             members =  self.getMembersFolder()
!             if members:
!                 # XXX This is the same code as in Portal.py 
!                 members._setProperty('right_slots', (), 'lines')
!                 
!                 portal_catalog = getToolByName( self, 'portal_catalog' )
!                 portal_catalog.unindexObject(members) #unindex Members folder
!                 members.manage_addProduct['OFSP'].manage_addDTMLMethod('index_html',
!                                                                        'Member list',
!                                                                        '<dtml-return member_search_form>')
!                 members._setPortalTypeName( 'Folder' )
!                 members.setTitle('Members')
!                 members.setDescription("Container for portal members' home directories")
              
          if members is not None and not hasattr(members, member_id):

Index: StatelessTree.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/StatelessTree.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StatelessTree.py	21 Feb 2003 11:52:22 -0000	1.3
--- StatelessTree.py	21 Feb 2003 12:38:50 -0000	1.4
***************
*** 95,99 ****
              
              # shall all Members be listed or just myself!
!             if self.showMyUserFolderOnly and obj.id=='Members':
                  try:
                      return [getattr(obj,user.getId())]
--- 95,99 ----
              
              # shall all Members be listed or just myself!
!             if self.showMyUserFolderOnly and obj == portal.portal_membership.getMembersFolder():
                  try:
                      return [getattr(obj,user.getId())]