Author: amelentev
Date: 2008-02-07 00:22:49 +0100 (Thu, 07 Feb 2008)
New Revision: 7331
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/DeleteVersionsAction.java
Log:
XWIKI-1949: Deleting the most recent version from the history does not update
the actual document
rollback document if delete latest version
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/DeleteVersionsAction.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/DeleteVersionsAction.java
2008-02-06 21:37:39 UTC (rev 7330)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/DeleteVersionsAction.java
2008-02-06 23:22:49 UTC (rev 7331)
@@ -75,6 +75,12 @@
archive.removeVersions(v1, v2, context);
context.getWiki().getVersioningStore().saveXWikiDocArchive(archive, true,
context);
tdoc.setDocumentArchive(archive);
+ // if we delete latest version then rollback to latest undeleted
version
+ if (archive.getLatestVersion()!=null &&
!tdoc.getRCSVersion().equals(archive.getLatestVersion())) {
+ XWikiDocument newdoc =
archive.loadDocument(archive.getLatestVersion(), context);
+ context.getWiki().getStore().saveXWikiDoc(newdoc, context);
+ context.setDoc(newdoc);
+ }
}
sendRedirect(context);
return false;
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
