Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: 69c83eaa64799ef05034686a0577c19dc700742f https://github.com/xwiki/xwiki-platform/commit/69c83eaa64799ef05034686a0577c... Author: Marius Dumitru Florea <[email protected]> Date: 2025-10-21 (Tue, 21 Oct 2025) Changed paths: M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAndContinueAction.java M xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/web/SaveActionTest.java R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/Coeditor.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/CoeditorElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/CoeditorsDropdown.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/HistoryDropdown.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/RealtimeEditToolbar.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/SummaryModal.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/VersionElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Configuration.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/toolbar.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/actionbuttons/actionButtons.js Log Message: ----------- 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 669fc4d20d8b6aeb6463010c603936b9432439e9) Commit: 78f8825a10eb7ab988da52b46ebceab6eb1d6b4c https://github.com/xwiki/xwiki-platform/commit/78f8825a10eb7ab988da52b46ebce... Author: Marius Dumitru Florea <[email protected]> Date: 2025-10-21 (Tue, 21 Oct 2025) Changed paths: M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/HistoryDropdown.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/RealtimeEditToolbar.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/VersionElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/actionbuttons/actionButtons.js M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/meta.js Log Message: ----------- 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 789a2b9e09c94f63e7291f50a0ae957b0b2ed8e2) Compare: https://github.com/xwiki/xwiki-platform/compare/85073747fafc...78f8825a10eb To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications