On Tue, Nov 30, 2010 at 16:00, jvdrean <[email protected]> wrote:
Author: jvdrean Date: 2010-11-30 16:00:36 +0100 (Tue, 30 Nov 2010) New Revision: 33193
Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/ImportAction.java platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/importer/import.js Log: XWIKI-5724 : On import document author is not the current user
Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/ImportAction.java =================================================================== --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/ImportAction.java 2010-11-30 14:43:36 UTC (rev 33192) +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/ImportAction.java 2010-11-30 15:00:36 UTC (rev 33193) @@ -133,6 +133,8 @@ // Set the backup pack option if (StringUtils.equals(request.getParameter("importAsBackup"), "true")) { importer.setBackupPack(true); + } else { + importer.setBackupPack(false); }
WDYT about: importer.setBackupPack(Boolean.valueOf(request.getParameter("importAsBackup"))); instead ?
// Import files importer.install();
Modified: platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/importer/import.js =================================================================== --- platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/importer/import.js 2010-11-30 14:43:36 UTC (rev 33192) +++ platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/importer/import.js 2010-11-30 15:00:36 UTC (rev 33193) @@ -298,6 +298,7 @@
parameters["historyStrategy"] = $('packageDescription').down("input[type=radio][value='add']").checked ? "add" : ($('packageDescription').down("input[type=radio][value='replace']").checked ? "replace" : "reset"); + parameters["importAsBackup"] = $('packageDescription').down("input[type=checkbox][name='importAsBackup']").checked ? "true" : "false"; parameters["ajax"] = "1";
var pages = [];
_______________________________________________ notifications mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/notifications
-- Thomas Mortagne