Commit b47e7689 authored by Aurel's avatar Aurel

sort module keys and worklfow chain keys to make diff consistent


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4120 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 97e4313c
...@@ -915,7 +915,9 @@ class PortalTypeTemplateItem(ObjectTemplateItem): ...@@ -915,7 +915,9 @@ class PortalTypeTemplateItem(ObjectTemplateItem):
BaseTemplateItem.export(self, context, bta, **kw) BaseTemplateItem.export(self, context, bta, **kw)
# export workflow chain # export workflow chain
xml_data = '<workflow_chain>' xml_data = '<workflow_chain>'
for key in self._workflow_chain_archive.keys(): keys = self._workflow_chain_archive.keys()
keys.sort()
for key in keys:
xml_data += os.linesep+' <chain>' xml_data += os.linesep+' <chain>'
xml_data += os.linesep+' <type>%s</type>' %(key,) xml_data += os.linesep+' <type>%s</type>' %(key,)
xml_data += os.linesep+' <workflow>%s</workflow>' %(self._workflow_chain_archive[key],) xml_data += os.linesep+' <workflow>%s</workflow>' %(self._workflow_chain_archive[key],)
...@@ -1395,9 +1397,11 @@ class ModuleTemplateItem(BaseTemplateItem): ...@@ -1395,9 +1397,11 @@ class ModuleTemplateItem(BaseTemplateItem):
return return
path = os.path.join(bta.path, self.__class__.__name__) path = os.path.join(bta.path, self.__class__.__name__)
bta.addFolder(path) bta.addFolder(path)
for id in self._objects.keys(): keys = self._objects.keys()
keys.sort()
for id in keys:
dict = self._objects[id] dict = self._objects[id]
xml_data = '<module>' xml_data = '<module>'
for key in dict.keys(): for key in dict.keys():
if key =='permission_list': if key =='permission_list':
# separe permission dict into xml # separe permission dict into xml
......
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