Commit 681b4e3f authored by Yoshinori Okuji's avatar Yoshinori Okuji

Rename getDefaultReindexParametersDict to getDefaultReindexParameterDict.

Remove the security declaration for objectCount which has no effect.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16483 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a7a88612
...@@ -2480,8 +2480,6 @@ class Base( CopyContainer, ...@@ -2480,8 +2480,6 @@ class Base( CopyContainer,
portal_workflow = self.portal_workflow portal_workflow = self.portal_workflow
return portal_workflow.getInfoFor(self, name, wf_id=wf_id) return portal_workflow.getInfoFor(self, name, wf_id=wf_id)
security.declareProtected(Permissions.AccessContentsInformation,
'objectCount')
# Hide Acquisition to prevent loops (ex. in cells) # Hide Acquisition to prevent loops (ex. in cells)
# Another approach is to use XMLObject everywhere # Another approach is to use XMLObject everywhere
# DIRTY TRICK XXX # DIRTY TRICK XXX
...@@ -2530,7 +2528,7 @@ class Base( CopyContainer, ...@@ -2530,7 +2528,7 @@ class Base( CopyContainer,
if activate_kw is None: if activate_kw is None:
activate_kw = {} activate_kw = {}
reindex_kw = self.getDefaultReindexParametersDict() reindex_kw = self.getDefaultReindexParameterDict()
if reindex_kw is not None: if reindex_kw is not None:
kw.update(reindex_kw) kw.update(reindex_kw)
...@@ -3313,7 +3311,7 @@ class Base( CopyContainer, ...@@ -3313,7 +3311,7 @@ class Base( CopyContainer,
tv[key] = kw tv[key] = kw
security.declareProtected(Permissions.View, 'getDefaultReindexParameterDict' ) security.declareProtected(Permissions.View, 'getDefaultReindexParameterDict' )
def getDefaultReindexParametersDict(self): def getDefaultReindexParameterDict(self):
# This method returns default reindex parameters to self. # This method returns default reindex parameters to self.
# The result can be either a dict object or None. # The result can be either a dict object or None.
tv = getTransactionalVariable(self) tv = getTransactionalVariable(self)
......
...@@ -854,7 +854,7 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn, ...@@ -854,7 +854,7 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn,
if activate_kw is None: if activate_kw is None:
activate_kw = {} activate_kw = {}
reindex_kw = self.getDefaultReindexParametersDict() reindex_kw = self.getDefaultReindexParameterDict()
if reindex_kw is not None: if reindex_kw is not None:
kw.update(reindex_kw) kw.update(reindex_kw)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment