Uploaded image for project: 'XWiki Platform'
  1. XWiki Platform
  2. XWIKI-23264

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

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • Major
    • None
    • 16.10.8, 17.4.0
    • None
    • Unknown

    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).

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              mflorea Marius Dumitru Florea
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated: