Details
-
Bug
-
Resolution: Fixed
-
Major
-
2.7.1
-
Solaris 5.11, Tomcat 6.18, Java 1.6.0_22
Description
This almost duplicates http://jira.xwiki.org/jira/browse/XWIKI-3585 (and thus http://jira.xwiki.org/jira/browse/XWIKI-175, I guess) but is slightly different.
1) User1 edits a page, thus obtaining a lock, but does not save those edits
2) Lock expires (30 minutes by default)
3) User2 edits and saves the page. It is no longer locked by User1, so there is no warning/force editing option presented to User2.
4) User1 decides to save edits. User2 is no longer editing, so there is no lock. Saving this 'not most recent' edited page over writes User2's changes.
Depending on session timeout, User1 may be asked to login again, but there is no warning that the page has changed since he began editing.
It would be nice if User1 were given a warning that the page has changed, and even nicer if a merge option was presented.
Attachments
Issue Links
- duplicates
-
XWIKI-3585 Saving a modification with a lost page lock should warn the user.
- Closed
- is related to
-
XWIKI-16211 Users can overwrite existing attachments without being aware of it
- Open
-
XWIKI-16302 Display a saving message when doing save&view and disable immediately the editor
- Closed
-
XWIKI-16578 Add a conflict mechanism switch off property
- Closed
- relates to
-
TOUR-71 Conflict window is displayed when editing a Tour entry page
- Closed
-
XWIKI-16249 Warning conflict in first edition of the profile
- Closed
-
XWIKI-16299 Conflict window prevent creating a new translation
- Closed
-
XWIKI-16405 Conflict window is displayed when editing a Dashboard page
- Closed
-
XWIKI-16691 No conflict detected in case of concurrent edit of a document title
- Closed
-
XWIKI-16343 Save conflict warning shown after using the browser's Back button
- Closed
-
XWIKI-175 Merge on Save
- Closed
-
XWIKI-16346 Improve warning conflict to show diff and force save or reload editor to latest version
- Closed