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

Improve warning conflict to show diff and force save or reload editor to latest version

    XMLWordPrintable

Details

    • Integration
    • Unknown

    Description

      Starting with XWiki 11.2RC1 we can get a version conflict when saving a page, see XWIKI-6665 . I think we need to have a way to force the save because:

      • the conflict might not be real (a bug like XWIKI-16343)
      • it may be easier to force the save and roll back afterwards some of the changes lost than to copy the changes made by the current user. Take for instance this use case:
        • user A starts editing and makes a lot of changes in various parts of the content
        • user B edits the same page to fix a typo
        • user A wants to save and gets the version conflict. He checks the diff. It would certainly be easier for him to force the save and fix the typo afterwards than to copy all the various changes he did.

      Attachments

        1. conflict-window-danger.png
          38 kB
          Simon Urli
        2. conflict-window-force-save-explanation.png
          42 kB
          Simon Urli
        3. current.png
          366 kB
          Ecaterina Moraru (Valica)
        4. diff_conflict_window.png
          38 kB
          Simon Urli
        5. idea.png
          392 kB
          Ecaterina Moraru (Valica)
        6. leaving-edit-without-saving.png
          8 kB
          Simon Urli

        Issue Links

          Activity

            People

              surli Simon Urli
              mflorea Marius Dumitru Florea
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: