Commit 17ca742f authored by Aurel's avatar Aurel

still remove useless fonctions for old diff


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4786 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bc640733
...@@ -51,7 +51,6 @@ from DateTime import DateTime ...@@ -51,7 +51,6 @@ from DateTime import DateTime
from OFS.Traversable import NotFound from OFS.Traversable import NotFound
from OFS import XMLExportImport from OFS import XMLExportImport
from cStringIO import StringIO from cStringIO import StringIO
import difflib
from copy import deepcopy from copy import deepcopy
from App.config import getConfiguration from App.config import getConfiguration
import OFS.XMLExportImport import OFS.XMLExportImport
...@@ -307,9 +306,6 @@ class BaseTemplateItem(Implicit, Persistent): ...@@ -307,9 +306,6 @@ class BaseTemplateItem(Implicit, Persistent):
# trash is quite similar to uninstall. # trash is quite similar to uninstall.
return self.uninstall(context, new_item=new_item, trash=1, **kw) return self.uninstall(context, new_item=new_item, trash=1, **kw)
def diff(self, **kw):
return ''
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
pass pass
...@@ -860,11 +856,8 @@ class SkinTemplateItem(ObjectTemplateItem): ...@@ -860,11 +856,8 @@ class SkinTemplateItem(ObjectTemplateItem):
ps.manage_skinLayers(skinpath = tuple(new_selection), skinname = skin_name, add_skin = 1) ps.manage_skinLayers(skinpath = tuple(new_selection), skinname = skin_name, add_skin = 1)
# Make sure that skin data is up-to-date (see CMFCore/Skinnable.py). # Make sure that skin data is up-to-date (see CMFCore/Skinnable.py).
context.getPortalObject().changeSkin(None) context.getPortalObject().changeSkin(None)
ObjectTemplateItem.uninstall(self, context, **kw) ObjectTemplateItem.uninstall(self, context, **kw)
def diff(self, max_deep=1, **kw):
return ObjectTemplateItem.diff(self, max_deep=max_deep, **kw)
class WorkflowTemplateItem(ObjectTemplateItem): class WorkflowTemplateItem(ObjectTemplateItem):
...@@ -1603,9 +1596,6 @@ class SitePropertyTemplateItem(BaseTemplateItem): ...@@ -1603,9 +1596,6 @@ class SitePropertyTemplateItem(BaseTemplateItem):
class ModuleTemplateItem(BaseTemplateItem): class ModuleTemplateItem(BaseTemplateItem):
def diff(self, max_deep=1, **kw):
return ''
def build(self, context, **kw): def build(self, context, **kw):
BaseTemplateItem.build(self, context, **kw) BaseTemplateItem.build(self, context, **kw)
p = context.getPortalObject() p = context.getPortalObject()
...@@ -2424,13 +2414,6 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -2424,13 +2414,6 @@ Business Template is a set of definitions, such as skins, portal types and categ
, 'permissions' : ( , 'permissions' : (
Permissions.View, ) Permissions.View, )
} }
, { 'id' : 'diff'
, 'name' : 'Diff'
, 'category' : 'object_view'
, 'action' : 'BusinessTemplate_viewDiff'
, 'permissions' : (
Permissions.View, )
}
, { 'id' : 'history' , { 'id' : 'history'
, 'name' : 'History' , 'name' : 'History'
, 'category' : 'object_view' , 'category' : 'object_view'
...@@ -2884,22 +2867,6 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -2884,22 +2867,6 @@ Business Template is a set of definitions, such as skins, portal types and categ
""" """
return self._getOrderedList('template_message_translation') return self._getOrderedList('template_message_translation')
security.declareProtected(Permissions.AccessContentsInformation,
'diff')
def diff(self, verbose=0):
"""
Return a 'diff' of the business template compared to the
__btsave__ version.
"""
diff_message = '%s : %s\n%s\n' % (self.getPath(), DateTime(),
'='*80)
# Diff everything
for item_name in self._item_name_list:
item = getattr(self, item_name)
if item is not None:
diff_message += item.diff(verbose=verbose)
return diff_message
security.declareProtected(Permissions.ManagePortal, 'export') security.declareProtected(Permissions.ManagePortal, 'export')
def export(self, path=None, local=0, **kw): def export(self, path=None, local=0, **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