Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alecs_myu
erp5
Commits
3c93e915
Commit
3c93e915
authored
May 23, 2011
by
Nicolas Delaby
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
extend support of other content_types
Do not try to parse contents which are not XML with xml parser.
parent
6a8a4776
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
product/ERP5SyncML/Tool/SynchronizationTool.py
product/ERP5SyncML/Tool/SynchronizationTool.py
+3
-1
No files found.
product/ERP5SyncML/Tool/SynchronizationTool.py
View file @
3c93e915
...
...
@@ -2201,10 +2201,12 @@ class SynchronizationTool(BaseTool):
xml_object
=
conduit
.
replaceIdFromXML
(
xml_object
,
'id'
,
object
.
getId
(),
as_string
=
True
)
el
se
:
el
if
conduit
.
getContentType
()
==
'text/xml'
:
# no previous, this is the first synchronization
# store xml view from object as it has been provided.
xml_object
=
etree
.
tostring
(
data_subnode
)
else
:
xml_object
=
data_subnode
signature
.
setTemporaryData
(
xml_object
)
if
conflict_list
:
status_code
=
'conflict'
...
...
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