Menu
▾
▴
[Plone-cvs] CMFPlone ChangeLog,1.7,1.8 Configuration.py,1.5,1.6 CustomizationPolicy.py,1.52,1.53 PloneFolder.py,1.30,1.31 PrivateSitePolicy.py,1.10,1.11 __init__.py,1.34,1.35
Update of /cvsroot/plone/CMFPlone
In directory sc8-pr-cvs1:/tmp/cvs-serv25426
Modified Files:
ChangeLog Configuration.py CustomizationPolicy.py
PloneFolder.py PrivateSitePolicy.py __init__.py
Log Message:
Fixed Plone-HEAD with CMF-HEAD. *REQUIRES* CMF-HEAD
Index: ChangeLog
===================================================================
RCS file: /cvsroot/plone/CMFPlone/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog 16 Apr 2003 17:43:11 -0000 1.7
--- ChangeLog 23 Apr 2003 16:13:15 -0000 1.8
***************
*** 1,2 ****
--- 1,13 ----
+ 2003-04-23 Sidnei da Silva <si...@x3...>
+
+ * skins/plone_scripts/browserDefault.py (act): For some reason, I
+ was getting very strange behavior when the folder had no
+ 'index.html'. It was being redirected to
+ http://localhost/plone//folder_contents, and generating a NotFound
+ error. If this breaks something, let me know and Ill find an alternative.
+
+ * PloneFolder.py (factory_type_information): Made it work with
+ CMF-HEAD (as a side-effect, it also requires CMF-HEAD).
+
2003-04-16 Sidnei da Silva <si...@x3...>
Index: Configuration.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/Configuration.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Configuration.py 10 Apr 2003 22:31:56 -0000 1.5
--- Configuration.py 23 Apr 2003 16:13:16 -0000 1.6
***************
*** 42,46 ****
_versions=versions
for methodname in _methods:
! setattr(configuration, methodname, getattr(ConfigurationMethods, methodname))
_registry[_versions]=configuration
--- 42,47 ----
_versions=versions
for methodname in _methods:
! if not hasattr(configuration, methodname):
! setattr(configuration, methodname, getattr(ConfigurationMethods, methodname))
_registry[_versions]=configuration
***************
*** 178,182 ****
# Unreleased is CMF-HEAD. It should use OneFourConfiguration when the
# types_tool_as_apb branch is merged.
- registerConfiguration(('Unreleased',), OriginalConfiguration)
class OneFourConfiguration(OriginalConfiguration):
--- 179,182 ----
***************
*** 192,197 ****
category='object')
! def _installExternalEditor(self, portal):
! types_tool=getToolByName(self, 'portal_types')
methods=('PUT', 'manage_FTPget')
exclude=('Topic', 'Event', 'Folder')
--- 192,197 ----
category='object')
! def installExternalEditor(self, portal):
! types_tool=getToolByName(portal, 'portal_types')
methods=('PUT', 'manage_FTPget')
exclude=('Topic', 'Event', 'Folder')
***************
*** 230,234 ****
action.action=Expression('string:${portal_url}/portal_form/join_form')
actions_tool._actions=tuple(actions)
! registerConfiguration(('1.4',), OneFourConfiguration)
--- 230,253 ----
action.action=Expression('string:${portal_url}/portal_form/join_form')
actions_tool._actions=tuple(actions)
!
! def modifySkins(self, portal):
! #remove non Plone skins from skins tool
! #since we implemented the portal_form proxy these skins will no longer work
! st=getToolByName(portal, 'portal_skins')
! tt=getToolByName(portal, 'portal_types')
! skins_map=st._getSelections()
! del skins_map['No CSS']
! del skins_map['Nouvelle']
! del skins_map['Basic']
! st.selections=skins_map
!
! for t in tt.objectValues():
! _actions=t._cloneActions()
! for a in _actions:
! if a.id == 'metadata':
! a.name = 'Properties'
! t._actions=_actions
!
! registerConfiguration(('1.4','Unreleased'), OneFourConfiguration)
Index: CustomizationPolicy.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/CustomizationPolicy.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** CustomizationPolicy.py 30 Mar 2003 22:21:23 -0000 1.52
--- CustomizationPolicy.py 23 Apr 2003 16:13:16 -0000 1.53
***************
*** 1,6 ****
#These CustomizationPolicies *are not* persisted!!
from Products.CMFPlone.Portal import addPolicy
! from interfaces.CustomizationPolicy import ICustomizationPolicy
! import Configuration
class DefaultCustomizationPolicy:
--- 1,6 ----
#These CustomizationPolicies *are not* persisted!!
from Products.CMFPlone.Portal import addPolicy
! from Products.CMFPlone.interfaces.CustomizationPolicy import ICustomizationPolicy
! from Products.CMFPlone import Configuration
class DefaultCustomizationPolicy:
Index: PloneFolder.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/PloneFolder.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** PloneFolder.py 15 Apr 2003 21:17:31 -0000 1.30
--- PloneFolder.py 23 Apr 2003 16:13:16 -0000 1.31
***************
*** 28,32 ****
( { 'id' : 'view'
, 'name' : 'View'
! , 'action' : 'index_html'
, 'permissions' :
(CMFCorePermissions.View,)
--- 28,32 ----
( { 'id' : 'view'
, 'name' : 'View'
! , 'action' : 'string:${folder_url}/index_html'
, 'permissions' :
(CMFCorePermissions.View,)
***************
*** 35,39 ****
, { 'id' : 'folderlisting'
, 'name' : 'Folder Listing'
! , 'action' : 'folder_listing'
, 'permissions' :
(Permissions.access_contents_information,)
--- 35,39 ----
, { 'id' : 'folderlisting'
, 'name' : 'Folder Listing'
! , 'action' : 'string:${folder_url}/folder_listing'
, 'permissions' :
(Permissions.access_contents_information,)
***************
*** 42,46 ****
, { 'id' : 'local_roles'
, 'name' : 'Local Roles'
! , 'action' : 'folder_localrole_form'
, 'permissions' :
(CMFCorePermissions.ChangePermissions,)
--- 42,46 ----
, { 'id' : 'local_roles'
, 'name' : 'Local Roles'
! , 'action' : 'string:${folder_url}/folder_localrole_form'
, 'permissions' :
(CMFCorePermissions.ChangePermissions,)
***************
*** 49,53 ****
, { 'id' : 'edit'
, 'name' : 'Edit'
! , 'action' : 'folder_edit_form'
, 'permissions' :
(CMFCorePermissions.ManageProperties,)
--- 49,53 ----
, { 'id' : 'edit'
, 'name' : 'Edit'
! , 'action' : 'string:${folder_url}/folder_edit_form'
, 'permissions' :
(CMFCorePermissions.ManageProperties,)
***************
*** 83,86 ****
--- 83,87 ----
else:
return view()
+
### DefaultDublinCoreImpl.editMetadata() has a very bad assumption
### which it does not declare in its interface which is
***************
*** 150,160 ****
ti = obj.getTypeInfo()
if ti is not None:
! actions = ti.getActions()
for action in actions:
if action.get('id', None) == default:
default=action
if action.get('id', None) == view:
! if _verifyActionPermissions(obj, action) and action['action']!='':
! action = obj.restrictedTraverse(action['action'])
if action is not None:
return action
--- 151,161 ----
ti = obj.getTypeInfo()
if ti is not None:
! actions = [a.getAction() for a in ti.getActions()]
for action in actions:
if action.get('id', None) == default:
default=action
if action.get('id', None) == view:
! if _verifyActionPermissions(obj, action) and action['url']!='':
! action = obj.restrictedTraverse(action['url'])
if action is not None:
return action
***************
*** 162,166 ****
if default is not None:
if _verifyActionPermissions(obj, default):
! return obj.restrictedTraverse(default['action'])
# "view" action is not present or not allowed.
--- 163,167 ----
if default is not None:
if _verifyActionPermissions(obj, default):
! return obj.restrictedTraverse(default['url'])
# "view" action is not present or not allowed.
Index: PrivateSitePolicy.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/PrivateSitePolicy.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PrivateSitePolicy.py 30 Mar 2003 22:19:26 -0000 1.10
--- PrivateSitePolicy.py 23 Apr 2003 16:13:16 -0000 1.11
***************
*** 7,17 ****
from Products.CMFPlone.Portal import addPolicy
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.Expression import Expression
from Products.CMFCore import CMFCorePermissions
from Products.CMFCore.CMFCorePermissions import AddPortalMember
- from CustomizationPolicy import DefaultCustomizationPolicy
-
- from interfaces.CustomizationPolicy import ICustomizationPolicy
def register(context, app_state):
--- 7,16 ----
from Products.CMFPlone.Portal import addPolicy
+ from Products.CMFPlone.interfaces.CustomizationPolicy import ICustomizationPolicy
+ from Products.CMFPlone.CustomizationPolicy import DefaultCustomizationPolicy
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.Expression import Expression
from Products.CMFCore import CMFCorePermissions
from Products.CMFCore.CMFCorePermissions import AddPortalMember
def register(context, app_state):
***************
*** 23,27 ****
def customize(self, portal):
! DefaultCustomizationPolicy.customize(self, portal)
wf_tool=getToolByName(portal,'portal_workflow')
wf_tool._delObject('plone_workflow')
--- 22,26 ----
def customize(self, portal):
! DefaultCustomizationPolicy().customize(self, portal)
wf_tool=getToolByName(portal,'portal_workflow')
wf_tool._delObject('plone_workflow')
Index: __init__.py
===================================================================
RCS file: /cvsroot/plone/CMFPlone/__init__.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** __init__.py 13 Apr 2003 18:10:59 -0000 1.34
--- __init__.py 23 Apr 2003 16:13:16 -0000 1.35
***************
*** 8,13 ****
import PloneFolder, Portal, PloneWorkflow, FolderWorkflow
- import CustomizationPolicy, PrivateSitePolicy
-
import sys
import StatelessTreeNav
--- 8,11 ----
***************
*** 99,102 ****
--- 97,104 ----
).initialize( context )
Portal.register(context, cmfplone_globals)
+
+ import CustomizationPolicy
+ import PrivateSitePolicy
+
CustomizationPolicy.register(context, cmfplone_globals)
PrivateSitePolicy.register(context, cmfplone_globals)
|