Commit f5aacbf9 authored by Julien Muchembled's avatar Julien Muchembled

Revert fix to getInstancePropertyAndBaseCategoryList

This reverts commit 51d40d1e.
parent bef3c525
...@@ -45,7 +45,6 @@ ERP5TYPE_SECURITY_GROUP_ID_GENERATION_SCRIPT = 'ERP5Type_asSecurityGroupId' ...@@ -45,7 +45,6 @@ ERP5TYPE_SECURITY_GROUP_ID_GENERATION_SCRIPT = 'ERP5Type_asSecurityGroupId'
from TranslationProviderBase import TranslationProviderBase from TranslationProviderBase import TranslationProviderBase
from sys import exc_info from sys import exc_info
from types import StringType
from zLOG import LOG, ERROR from zLOG import LOG, ERROR
from Products.CMFCore.exceptions import zExceptions_Unauthorized from Products.CMFCore.exceptions import zExceptions_Unauthorized
...@@ -522,20 +521,10 @@ class ERP5TypeInformation(XMLObject, ...@@ -522,20 +521,10 @@ class ERP5TypeInformation(XMLObject,
ob = self.constructTempInstance(self, self.getId()) ob = self.constructTempInstance(self, self.getId())
property_list = list(getattr(ob.__class__, '_properties', [])) property_list = list(getattr(ob.__class__, '_properties', []))
self.updatePropertySheetDefinitionDict({'_properties': property_list}) self.updatePropertySheetDefinitionDict({'_properties': property_list})
return_set = set() for property_sheet in getClassPropertyList(ob.__class__):
class_property_list = list(getClassPropertyList(ob.__class__))
for property_sheet in ob.getTypePropertySheetList():
if property_sheet not in class_property_list:
class_property_list.append(property_sheet)
for property_sheet in iter(class_property_list):
property_sheet_tool = self.getPortalObject().portal_property_sheets
if type(property_sheet) == StringType:
property_sheet_obj = property_sheet_tool[property_sheet]
for property in property_sheet_obj.contentValues():
return_set.add(property.getTitle())
else:
property_list += getattr(property_sheet, '_properties', () ) property_list += getattr(property_sheet, '_properties', () )
return_set = set()
for property in property_list: for property in property_list:
if property['type'] == 'content': if property['type'] == 'content':
for suffix in property['acquired_property_id']: for suffix in property['acquired_property_id']:
......
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