Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xwiki/xwiki-platform
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34e850c42a68
Choose a base ref
...
head repository: xwiki/xwiki-platform
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aebf0210f7c2
Choose a head ref
  • 3 commits
  • 15 files changed
  • 1 contributor

Commits on Oct 22, 2025

  1. XWIKI-2470: Improve saving to not save data that has not changed 

    * Remove duplicated code between SaveAction and SaveAndContinueAction that builds the JSON response. Put the "JSON" map object on the XWiki context and let various parts of the code add stuff that needs to be returned to the editor.
* Remove the redirect object before updating the authors, in order to be able to detect if the document is dirty before the authors are set.
* Move the line that sets the metadata dirty right before saving, because it is needed only to force incrementing the version.
* Small code improvements and more comments added.
* Let the editor know when the save doesn't create a new revision in order to not show the "Saved" notification because it can mislead the user into thinking that a new version was created.
* Add page objects for the history dropdown from the realtime toolbar.
* Add functional test.
* Don't propagate the version on save (to the other collaborators) if there's no new version.
* Bulletproof the history dropdown to not duplicate versions.

(cherry picked from commit 669fc4d)
    @mflorea
    mflorea committed Oct 22, 2025
    Configuration menu
    Copy the full SHA
    c4dfcc5 View commit details
    Browse the repository at this point in the history

  2. XWIKI-2470: Improve saving to not save data that has not changed 

    * Return the new (latest) version even when we don't create a new revision because the editor that sent the save request might have an outdated version number. This can happen if two users save the same document state, either because they didn't modify the document or because they made the same modifications.
* Update since version
* Fix RealtimeEditToolbar#waitForConcurrentEditingWarning() that was causing both the existing #editFullScreen() test and the new #preventEmptyRevisions() test to flicker (we need to wait for the fade-in / fade-out popover animation to end).
* Display the revision author, not modifier (last content updater), in the history dropdown.
* The auto-saver should check if the new version is different from the current version.
* Extend the #preventEmptyRevisions() functional test to check what happens when both users save the same document state.
* Simplify the version update handler in actionButtons.js
* Modify meta.js to not trigger the 'xwiki:document:changeVersion' event if the version didn't change.

(cherry picked from commit 789a2b9)
    @mflorea
    mflorea committed Oct 22, 2025
    Configuration menu
    Copy the full SHA
    58ebff4 View commit details
    Browse the repository at this point in the history

  3. XWIKI-2470: Improve saving to not save data that has not changed 

    * Update since version

(cherry picked from commit 9768c9e)
(cherry picked from commit e5b7a8b)
    @mflorea
    mflorea committed Oct 22, 2025
    Configuration menu
    Copy the full SHA
    aebf021 View commit details
    Browse the repository at this point in the history
Loading