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

[C??dric Torcq]

Author: torcq
Date: 2006-05-11 16:04:21 +0200 (Thu, 11 May 2006)
New Revision: 1067

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/web/ViewAction.java
Log:
A view can have a template by default

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/ViewAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/ViewAction.java	2006-05-11 04:14:42 UTC (rev 1066)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/ViewAction.java	2006-05-11 14:04:21 UTC (rev 1067)
@@ -46,6 +46,13 @@
     }
 
     public String render(XWikiContext context) throws XWikiException {
-        return "view";
+        handleRevision(context);
+        XWikiDocument doc = (XWikiDocument) context.get("doc");
+        String defaultTemplate = doc.getDefaultTemplate();
+        if ((defaultTemplate !=null) && (!defaultTemplate.equals(""))) {
+        	return defaultTemplate;
+        }
+        else
+        	return "view";
     }
 }