r1380 - xwiki/trunk/src/main/java/com/xpn/xwiki/web

Marta Girdea marta_girdea at users.forge.objectweb.org
Wed Oct 11 07:04:44 CEST 2006


Author: marta_girdea
Date: 2006-10-11 07:04:44 +0200 (Wed, 11 Oct 2006)
New Revision: 1380

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/web/PreviewAction.java
Log:
PreviewAction bugfix

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/PreviewAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/PreviewAction.java	2006-10-10 17:53:02 UTC (rev 1379)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/PreviewAction.java	2006-10-11 05:04:44 UTC (rev 1380)
@@ -95,6 +95,10 @@
 				vcontext.put("cdoc", vcontext.get("doc"));
 				doc2.readFromTemplate(((EditForm) form).getTemplate(), context);
 				doc2.readFromForm((EditForm) form, context);
+                doc2.setAuthor(context.getUser());
+                if(doc2.isNew()){
+                    doc2.setCreator(context.getUser());
+                }
 			} else {
 				// Need to save parent and defaultLanguage if they have changed
 				tdoc = doc.getTranslatedDocument(language, context);
@@ -106,8 +110,12 @@
 				vcontext.put("cdoc", vcontext.get("tdoc"));
 				tdoc2.readFromTemplate(((EditForm) form).getTemplate(), context);
 				tdoc2.readFromForm((EditForm) form, context);
+                tdoc2.setAuthor(context.getUser());
+                if(tdoc2.isNew()){
+                    tdoc2.setCreator(context.getUser());
+                }
 			}
-            // recomfirm edit (captcha) when jcaptcha is not correct
+            // reconfirm edit (captcha) when jcaptcha is not correct
             if ((context.get("recheckcaptcha") != null) && ((Boolean)context.get("recheckcaptcha")).booleanValue())
                 return "captcha";
             else return "preview";





More information about the Xwiki-notifications mailing list