Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_workflow
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wenjie.zheng
erp5_workflow
Commits
014f0059
Commit
014f0059
authored
Nov 05, 2013
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BT: fix diff for ZODB components
parent
841d4a5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
product/ERP5/Document/BusinessTemplate.py
product/ERP5/Document/BusinessTemplate.py
+4
-0
No files found.
product/ERP5/Document/BusinessTemplate.py
View file @
014f0059
...
...
@@ -5989,7 +5989,11 @@ Business Template is a set of definitions, such as skins, portal types and categ
elif
item_name
in
item_list_3
:
# Diff between text objects
if
hasattr
(
new_object
,
'getTextContent'
):
# ZODB component
new_object
=
new_object
.
getTextContent
()
new_obj_lines
=
new_object
.
splitlines
()
if
hasattr
(
installed_object
,
'getTextContent'
):
installed_object
=
installed_object
.
getTextContent
()
installed_obj_lines
=
installed_object
.
splitlines
()
diff_list
=
list
(
unified_diff
(
installed_obj_lines
,
new_obj_lines
,
tofile
=
new_bt
.
getId
(),
fromfile
=
installed_bt
.
getId
(),
lineterm
=
''
))
if
len
(
diff_list
)
!=
0
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment