This issue has been created
 
 
XWiki Platform / cid:jira-generated-image-avatar-dde93c27-bdd2-4fce-af37-27afefa1c726 XWIKI-23264 Open

Getting merge conflict when saving from in-place edit mode after updating document fields from the Information tab

 
View issue   ยท   Add comment
 

Issue created

 
cid:jira-generated-image-avatar-28e0e2c6-6824-4da0-9e4e-41cc5c132fdd Marius Dumitru Florea created this issue on 03/Jun/25 14:18
 
Summary: Getting merge conflict when saving from in-place edit mode after updating document fields from the Information tab
Issue Type: cid:jira-generated-image-avatar-dde93c27-bdd2-4fce-af37-27afefa1c726 Bug
Affects Versions: 16.10.8, 17.4.0
Assignee: Unassigned
Components: Web - Templates & Resources
Created: 03/Jun/25 14:18
Priority: cid:jira-generated-image-static-major-7a56a619-f9c5-4ecc-a496-655a0a2e8bce Major
Reporter: Marius Dumitru Florea
Description:

Same steps as XWIKI-23262. After saving the new syntax, make some changes to the document content and save. You get a merge conflict. The root problem is that the syntax change incremented the document version, but this has not been propagated / announced by triggering the xwiki:document:changeVersion event, so the WYSIWYG editor on the same page is submitting the content with the previous document version, causing a merge conflict.

This can be fixed by modifying editableProperty.js to trigger the xwiki:document:changeVersion event, but we can't call meta's setVersion unless the edited property is from the current document, which might not be always the case (it's possible to edit on page X a property from page Y).