r926 - in xwiki/trunk/src/main/java/com/xpn/xwiki: api doc web
C??dric Torcq
torcq at users.forge.objectweb.org
Wed Jan 18 10:34:48 CET 2006
Author: torcq
Date: 2006-01-18 10:34:47 +0100 (Wed, 18 Jan 2006)
New Revision: 926
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java
xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditForm.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/PrepareEditForm.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/ViewAction.java
Log:
Adde a default template property to a xwiki doc
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java 2005-12-12 14:43:49 UTC (rev 925)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java 2006-01-18 09:34:47 UTC (rev 926)
@@ -148,6 +148,10 @@
public String getDefaultLanguage() {
return doc.getDefaultLanguage();
}
+
+ public String getDefaultTemplate() {
+ return doc.getDefaultTemplate();
+ }
public List getTranslationList() throws XWikiException {
return doc.getTranslationList(context);
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2005-12-12 14:43:49 UTC (rev 925)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2006-01-18 09:34:47 UTC (rev 926)
@@ -122,6 +122,9 @@
private boolean fromCache = false;
private ArrayList objectsToRemove = new ArrayList();
+ // Template by default assign to a view
+ private String defaultTemplate;
+
private Object wikiNode;
private XWikiStoreInterface store;
@@ -1027,6 +1030,10 @@
String defaultLanguage = eform.getDefaultLanguage();
if (defaultLanguage!=null)
setDefaultLanguage(defaultLanguage);
+
+ String defaultTemplate = eform.getDefaultTemplate();
+ if (defaultTemplate!=null)
+ setDefaultTemplate(defaultTemplate);
// This is now done before
// readFromTemplate(eform, context);
@@ -1160,6 +1167,7 @@
doc.setParent(getParent());
doc.setCreator(getCreator());
doc.setDefaultLanguage(getDefaultLanguage());
+ doc.setDefaultTemplate(getDefaultTemplate());
doc.setLanguage(getLanguage());
doc.setTranslation(getTranslation());
doc.setxWikiClass((BaseClass)getxWikiClass().clone());
@@ -2355,4 +2363,12 @@
return getURL(action, editparams.toString(), context);
}
+ public String getDefaultTemplate() {
+ return defaultTemplate;
+ }
+
+ public void setDefaultTemplate(String defaultTemplate) {
+ this.defaultTemplate = defaultTemplate;
+ }
+
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java 2005-12-12 14:43:49 UTC (rev 925)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java 2006-01-18 09:34:47 UTC (rev 926)
@@ -23,6 +23,9 @@
String creator = peform.getCreator();
if (creator!=null)
doc.setCreator(creator);
+ String defaultTemplate = peform.getDefaultTemplate();
+ if (defaultTemplate!=null)
+ doc.setDefaultTemplate(defaultTemplate);
String defaultLanguage = peform.getDefaultLanguage();
if ((defaultLanguage!=null)&&!defaultLanguage.equals(""))
doc.setDefaultLanguage(defaultLanguage);
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditForm.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditForm.java 2005-12-12 14:43:49 UTC (rev 925)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditForm.java 2006-01-18 09:34:47 UTC (rev 926)
@@ -42,6 +42,7 @@
private String template;
private String language;
private String defaultLanguage;
+ private String defaultTemplate;
private String title;
private String comment;
@@ -52,6 +53,7 @@
setName(request.getParameter("name"));
setParent(request.getParameter("parent"));
setTemplate(request.getParameter("template"));
+ setDefaultTemplate(request.getParameter("default_template"));
setCreator(request.getParameter("creator"));
setLanguage(request.getParameter("language"));
setTitle(request.getParameter("title"));
@@ -137,6 +139,14 @@
this.template = template;
}
+ public String getDefaultTemplate() {
+ return defaultTemplate;
+ }
+
+ public void setDefaultTemplate(String defaultTemplate) {
+ this.defaultTemplate = defaultTemplate;
+ }
+
public String getDefaultLanguage() {
return defaultLanguage;
}
@@ -160,5 +170,8 @@
public void setComment(String comment) {
this.comment = comment;
}
+
+
+
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/PrepareEditForm.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/PrepareEditForm.java 2005-12-12 14:43:49 UTC (rev 925)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/PrepareEditForm.java 2006-01-18 09:34:47 UTC (rev 926)
@@ -28,6 +28,7 @@
private String template;
private String parent;
private String defaultLanguage;
+ private String defaultTemplate;
private String creator;
private boolean lockForce;
@@ -37,6 +38,7 @@
setParent(request.getParameter("parent"));
setCreator(request.getParameter("creator"));
setDefaultLanguage(request.getParameter("defaultLanguage"));
+ setDefaultTemplate(request.getParameter("defaultTemplate"));
setLockForce("1".equals(request.getParameter("lockforce")));
}
@@ -48,6 +50,14 @@
this.template = template;
}
+ public String getDefaultTemplate() {
+ return defaultTemplate;
+ }
+
+ public void setDefaultTemplate(String template) {
+ this.defaultTemplate = template;
+ }
+
public String getParent() {
return parent;
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/ViewAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/ViewAction.java 2005-12-12 14:43:49 UTC (rev 925)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/ViewAction.java 2006-01-18 09:34:47 UTC (rev 926)
@@ -2,10 +2,17 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.doc.XWikiDocument;
public class ViewAction extends XWikiAction {
public String render(XWikiContext context) throws XWikiException {
handleRevision(context);
- return "view";
+ XWikiDocument doc = (XWikiDocument) context.get("doc");
+ String defaultTemplate = doc.getDefaultTemplate();
+ if ((defaultTemplate !=null) && (!defaultTemplate.equals(""))) {
+ return defaultTemplate;
+ }
+ else
+ return "view";
}
}
More information about the Xwiki-notifications
mailing list