From 9c1469501a88b86e3e12fcd835a8258f371f0ba8 Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Tue, 9 Mar 2004 17:23:18 +0000
Subject: [PATCH] indent of 4 for ERP5CPS
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@577 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5CPS/CPSCorePatch.py | 135 ++++++-----
product/ERP5CPS/CPSDocumentPatch.py | 333 ++++++++++++++--------------
2 files changed, 227 insertions(+), 241 deletions(-)
diff --git a/product/ERP5CPS/CPSCorePatch.py b/product/ERP5CPS/CPSCorePatch.py
index 1c6de02d00..7ecd76ca44 100755
--- a/product/ERP5CPS/CPSCorePatch.py
+++ b/product/ERP5CPS/CPSCorePatch.py
@@ -35,79 +35,68 @@ from zLOG import LOG
class PatchedProxyBase(ProxyBase):
- security = ClassSecurityInfo()
-
- # Object attributes update method
-# security.declarePrivate( '_edit' )
-# def _edit(self, REQUEST=None, force_update = 0, **kw):
-# """
-# call also the proxytool
-# """
-# Base._edit(self, REQUEST=REQUEST,force_update=force_update, **kw)
-# px_tool= getToolByName(self,'portal_proxies')
-# utool = getToolByName(self, 'portal_url')
-# rpath = utool.getRelativeUrl(self)
-# px_tool._modifyProxy(self,rpath)
-
- def manage_afterEdit(self):
- """
- We have to notify the proxy tool we have modified
- this object
- """
- px_tool= getToolByName(self,'portal_proxies')
- utool = getToolByName(self, 'portal_url')
- rpath = utool.getRelativeUrl(self)
- px_tool._modifyProxy(self,rpath)
-
-
-
- def _propertyMap(self):
- """
- Returns fake property sheet
- """
- property_sheet = []
-
- #property_sheet += self._properties
-
- property_sheet += [
- {
- 'id' : 'docid',
- 'type' : 'string'
- },
- {
- 'id' : 'default_language',
- 'type' : 'string'
- },
- {
- 'id' : 'sync_language_revisions', # XXX we have to manage dict type
- 'type' : 'dict'
- }
- ]
- return tuple(property_sheet + list(getattr(self, '_local_properties', ())))
-
- security.declareProtected(View, 'getSyncLanguageRevisions')
- def getSyncLanguageRevisions(self):
- """Get the mapping of language -> revision."""
- return self._language_revs.copy()
-
- security.declareProtected(View, 'setSyncLanguageRevisions')
- def setSyncLanguageRevisions(self, dict):
- """Set the mapping of language -> revision."""
- for lang in dict.keys():
- self.setLanguageRevision(lang,dict[lang])
-
- security.declareProtected(View, 'getSyncRepoHistory')
- def getSyncRepoHistory(self):
- """Get the mapping of language -> revision."""
- return self._language_revs.copy()
-
- security.declareProtected(View, 'setSyncRepoHistory')
- def setSyncRepoHistory(self, dict):
- """Set the mapping of language -> revision."""
- repotool = getToolByName(self, 'portal_repository')
- #repotool.
- for lang in dict.keys():
- self.setLanguageRevision(lang,dict[lang])
+ security = ClassSecurityInfo()
+
+
+ def manage_afterEdit(self):
+ """
+ We have to notify the proxy tool we have modified
+ this object
+ """
+ px_tool= getToolByName(self,'portal_proxies')
+ utool = getToolByName(self, 'portal_url')
+ rpath = utool.getRelativeUrl(self)
+ px_tool._modifyProxy(self,rpath)
+
+
+
+ def _propertyMap(self):
+ """
+ Returns fake property sheet
+ """
+ property_sheet = []
+
+ #property_sheet += self._properties
+
+ property_sheet += [
+ {
+ 'id' : 'docid',
+ 'type' : 'string'
+ },
+ {
+ 'id' : 'default_language',
+ 'type' : 'string'
+ },
+ {
+ 'id' : 'sync_language_revisions', # XXX we have to manage dict type
+ 'type' : 'dict'
+ }
+ ]
+ return tuple(property_sheet + list(getattr(self, '_local_properties', ())))
+
+ security.declareProtected(View, 'getSyncLanguageRevisions')
+ def getSyncLanguageRevisions(self):
+ """Get the mapping of language -> revision."""
+ return self._language_revs.copy()
+
+ security.declareProtected(View, 'setSyncLanguageRevisions')
+ def setSyncLanguageRevisions(self, dict):
+ """Set the mapping of language -> revision."""
+ for lang in dict.keys():
+ self.setLanguageRevision(lang,dict[lang])
+
+ security.declareProtected(View, 'getSyncRepoHistory')
+ def getSyncRepoHistory(self):
+ """Get the mapping of language -> revision."""
+ return self._language_revs.copy()
+
+ security.declareProtected(View, 'setSyncRepoHistory')
+ def setSyncRepoHistory(self, dict):
+ """Set the mapping of language -> revision."""
+ repotool = getToolByName(self, 'portal_repository')
+ #repotool.
+ for lang in dict.keys():
+ self.setLanguageRevision(lang,dict[lang])
ProxyBase.getPath = Base.getPath
diff --git a/product/ERP5CPS/CPSDocumentPatch.py b/product/ERP5CPS/CPSDocumentPatch.py
index a2c945440c..4645be13a0 100755
--- a/product/ERP5CPS/CPSDocumentPatch.py
+++ b/product/ERP5CPS/CPSDocumentPatch.py
@@ -28,193 +28,190 @@ from zLOG import LOG
class PatchedCPSDocument(CPSDocument):
- security = ClassSecurityInfo()
-
- security.declareProtected( View, '_propertyMap' )
- def _propertyMap(self):
- """
- Returns fake property sheet
- """
- property_sheet = []
- property_sheet.append(
- {
- 'id' : 'layout_and_schema',
- 'type' : 'object'
- }
- )
- type_info = self.getTypeInfo()
- field_list = []
- if type_info is not None:
- if hasattr(type_info,'getDataModel'):
- data_model = type_info.getDataModel(self)
- if data_model is not None:
- field_list = data_model._fields.items()
- field_list.sort()
- for (prop_id,field) in field_list:
- #for field in schema.objectValues():
- #LOG('testjp',0,'field: %s' % str(field))
- f_type = None
- #for p in field._properties:
- # if p['id'] == 'default':
- # f_type = p['type']
- if isinstance(field,CPSImageField):
- f_type = 'object'
- elif isinstance(field,CPSStringField):
- f_type = 'string'
- elif isinstance(field,CPSDateTimeField):
- f_type = 'date'
- elif isinstance(field,CPSFileField):
- f_type = 'object'
- elif isinstance(field,CPSIntField):
- f_type = 'int'
- elif isinstance(field,CPSDocument):
- pass
- if prop_id.find('attachedFile')==0:
- f_type='object' # In a flexible content, we do have some attachedFile_f1
- # which are CPStringFiels with some binary data
- # XXX This should NOT BE NEEDED!!
- if f_type is not None:
+ security = ClassSecurityInfo()
+
+ security.declareProtected( View, '_propertyMap' )
+ def _propertyMap(self):
+ """
+ Returns fake property sheet
+ """
+ property_sheet = []
property_sheet.append(
- {
- 'id' : prop_id,
- 'type' : f_type
- }
- )
- return tuple(property_sheet + list(getattr(self, '_local_properties', ())))
+ {
+ 'id' : 'layout_and_schema',
+ 'type' : 'object'
+ }
+ )
+ type_info = self.getTypeInfo()
+ field_list = []
+ if type_info is not None:
+ if hasattr(type_info,'getDataModel'):
+ data_model = type_info.getDataModel(self)
+ if data_model is not None:
+ field_list = data_model._fields.items()
+ field_list.sort()
+ for (prop_id,field) in field_list:
+ f_type = None
+ if isinstance(field,CPSImageField):
+ f_type = 'object'
+ elif isinstance(field,CPSStringField):
+ f_type = 'string'
+ elif isinstance(field,CPSDateTimeField):
+ f_type = 'date'
+ elif isinstance(field,CPSFileField):
+ f_type = 'object'
+ elif isinstance(field,CPSIntField):
+ f_type = 'int'
+ elif isinstance(field,CPSDocument):
+ pass
+ if prop_id.find('attachedFile')==0:
+ f_type='object' # In a flexible content, we do have some attachedFile_f1
+ # which are CPStringFiels with some binary data
+ # XXX This should NOT BE NEEDED!!
+ if f_type is not None:
+ property_sheet.append(
+ {
+ 'id' : prop_id,
+ 'type' : f_type
+ }
+ )
+ return tuple(property_sheet + list(getattr(self, '_local_properties', ())))
+
+
+ security.declareProtected( View, 'getProperty' )
+ def getProperty(self, key, d=None):
+ """
+ Previous Name: getValue
+
+ Generic accessor. Calls the real accessor
+ """
+ data_model = self.getTypeInfo().getDataModel(self)
+ accessor_name = 'get' + UpperCase(key)
+ base = aq_base(self)
+ if data_model.has_key(key):
+ return data_model.get(key)
+ elif hasattr(base,accessor_name):
+ method = getattr(base,accessor_name)
+ return method()
+ return None
+
+ security.declarePrivate('getLayoutAndSchema' )
+ def getLayoutAndSchema(self):
+ if hasattr(self,'.cps_layouts') and hasattr(self,'.cps_schemas'):
+ return (aq_base(self._getOb(".cps_layouts")),aq_base(self._getOb(".cps_schemas")))
+ return None
+
+ security.declarePrivate('setLayoutAndSchema' )
+ def setLayoutAndSchema(self, data):
+ """
+ data must be : (layout,schema)
+ """
+ if data is not None:
+ self._setOb(".cps_layouts",data[0])
+ self._setOb(".cps_schemas",data[1])
+
+ security.declarePrivate('_setProperty' )
+ def _setProperty(self, key, value, type='string'):
+ """
+ Set the property for cps objects
+ """
+ LOG('PatchCPSDoc._setProperty',0,'key: %s, value: %s' % (repr(key),repr(value)))
+ accessor_name = 'set' + UpperCase(key)
+ if hasattr(aq_base(self),accessor_name):
+ method = getattr(self, accessor_name)
+ return method(value)
+ else:
+ setattr(self,key,value)
+ # This solution below doesn't works well, it is better
+ # to just set the attribute.
+ #data_model = self.getTypeInfo().getDataModel(self)
+ #type_info = self.getTypeInfo()
+ #kw = {key:value}
+ #type_info.editObject(self,kw)
+
+ security.declarePrivate('edit' )
+ def edit(self, REQUEST=None, force_update = 0, reindex_object = 0, **kw):
+ return self._edit(REQUEST=REQUEST, force_update=force_update, reindex_object=reindex_object, **kw)
+
+
+ # Object attributes update method
+ security.declarePrivate( '_edit' )
+ def _edit(self, REQUEST=None, force_update = 0, reindex_object = 0, **kw):
+ """
+ Generic edit Method for all ERP5 object
+ The purpose of this method is to update attributed, eventually do
+ some kind of type checking according to the property sheet and index
+ the object.
+
+ Each time attributes of an object are updated, they should
+ be updated through this generic edit method
+ """
+ LOG('PatchCPSDoc._edit, kw: ',0,kw)
+ try:
+ categoryIds = self._getCategoryTool().getBaseCategoryIds()
+ except:
+ categoryIds = []
+ #if kw.has_key('layout_and_schema'):
+ # self.setLayoutAndSchema(kw['layout_and_schema'])
+ for key in kw.keys():
+ accessor = 'get' + UpperCase(key)
+ #if key in categoryIds:
+ # self._setCategoryMembership(key, kw[key])
+ #if key != 'id' and key!= 'layout_and_schema':
+ if key != 'id' :
+ # We only change if the value is different
+ # This may be very long....
+ self._setProperty(key, kw[key])
-
- security.declareProtected( View, 'getProperty' )
- def getProperty(self, key, d=None):
+def getCoverage(self):
"""
- Previous Name: getValue
-
- Generic accessor. Calls the real accessor
"""
- data_model = self.getTypeInfo().getDataModel(self)
- accessor_name = 'get' + UpperCase(key)
- base = aq_base(self)
- if data_model.has_key(key):
- return data_model.get(key)
- elif hasattr(base,accessor_name):
- method = getattr(base,accessor_name)
- return method()
+ if hasattr(self,'coverage'):
+ return self.coverage
return None
- security.declarePrivate('getLayoutAndSchema' )
- def getLayoutAndSchema(self):
- if hasattr(self,'.cps_layouts') and hasattr(self,'.cps_schemas'):
- return (aq_base(self._getOb(".cps_layouts")),aq_base(self._getOb(".cps_schemas")))
- return None
-
- security.declarePrivate('setLayoutAndSchema' )
- def setLayoutAndSchema(self, data):
- """
- data must be : (layout,schema)
- """
- if data is not None:
- self._setOb(".cps_layouts",data[0])
- self._setOb(".cps_schemas",data[1])
-
- security.declarePrivate('_setProperty' )
- def _setProperty(self, key, value, type='string'):
- """
- Set the property for cps objects
- """
- LOG('PatchCPSDoc._setProperty',0,'key: %s, value: %s' % (repr(key),repr(value)))
- accessor_name = 'set' + UpperCase(key)
- if hasattr(aq_base(self),accessor_name):
- method = getattr(self, accessor_name)
- return method(value)
- else:
- setattr(self,key,value)
- #data_model = self.getTypeInfo().getDataModel(self)
- #type_info = self.getTypeInfo()
- #kw = {key:value}
- #type_info.editObject(self,kw)
-
- security.declarePrivate('edit' )
- def edit(self, REQUEST=None, force_update = 0, reindex_object = 0, **kw):
- return self._edit(REQUEST=REQUEST, force_update=force_update, reindex_object=reindex_object, **kw)
-
-
- # Object attributes update method
- security.declarePrivate( '_edit' )
- def _edit(self, REQUEST=None, force_update = 0, reindex_object = 0, **kw):
- """
- Generic edit Method for all ERP5 object
- The purpose of this method is to update attributed, eventually do
- some kind of type checking according to the property sheet and index
- the object.
-
- Each time attributes of an object are updated, they should
- be updated through this generic edit method
- """
- LOG('PatchCPSDoc._edit, kw: ',0,kw)
- try:
- categoryIds = self._getCategoryTool().getBaseCategoryIds()
- except:
- categoryIds = []
- #if kw.has_key('layout_and_schema'):
- # self.setLayoutAndSchema(kw['layout_and_schema'])
- for key in kw.keys():
- accessor = 'get' + UpperCase(key)
- #if key in categoryIds:
- # self._setCategoryMembership(key, kw[key])
- #if key != 'id' and key!= 'layout_and_schema':
- if key != 'id' :
- # We only change if the value is different
- # This may be very long....
- self._setProperty(key, kw[key])
-
-def getCoverage(self):
- """
- """
- if hasattr(self,'coverage'):
- return self.coverage
- return None
-
def getCreator(self):
- """
- """
- #if hasattr(self,'coverage'):
- # return self.coverage
- return None
+ """
+ """
+ #if hasattr(self,'coverage'):
+ # return self.coverage
+ return None
def getRelation(self):
- """
- """
- if hasattr(self,'relation'):
- return self.relation
- return None
+ """
+ """
+ if hasattr(self,'relation'):
+ return self.relation
+ return None
def setRelation(self,value):
- """
- """
- setattr(self,'relation',value)
+ """
+ """
+ setattr(self,'relation',value)
def getSource(self):
- """
- """
- if hasattr(self,'source'):
- return self.source
- return None
+ """
+ """
+ if hasattr(self,'source'):
+ return self.source
+ return None
def getPreview(self):
- """
- """
- if hasattr(self,'preview'):
- return self.preview
- return None
+ """
+ """
+ if hasattr(self,'preview'):
+ return self.preview
+ return None
def setCreator(self,value):
- """
- """
- setattr(self,'creator',value)
+ """
+ """
+ setattr(self,'creator',value)
def setCreationDate(self,value):
- """
- """
- setattr(self,'creation_date',value)
+ """
+ """
+ setattr(self,'creation_date',value)
CPSDocument.getCoverage = getCoverage
CPSDocument.getCreator = getCreator
--
2.30.9