[Jboss-svn-commits] JBL Code SVN: r814 - in trunk/forge/portal-extensions/forge-wiki/src: java/org/jboss/wiki web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-10 17:46:58 -0400 (Wed, 10 Aug 2005)
New Revision: 814

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
now it is ok.


Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-10 21:34:48 UTC (rev 813)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-10 21:46:58 UTC (rev 814)
@@ -22,14 +22,8 @@
 
 	private String defaultPage = "Main";
 
-	private String page = "Wiki.jsp";
-
-	private String wikiPage = defaultPage;
-
 	private WikiEngine wikiEngine;
 
-	private WikiContext wikiContext;
-
 	public void init() {
 		wikiEngine = new WikiEngine();
 	}
@@ -73,15 +67,16 @@
 	}
 
 	public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) {
-		if ((rReq.getParameter("action") != null)
-				&& (rReq.getParameter("action").equals("Edit"))) {
-			page = "Edit.jsp";
-		} else {
-			page = "Wiki.jsp";
+		
+		WikiContext wikiContext = new WikiContext(rReq.getUser(), new WikiType());
+		
+		if (rReq.getParameter("action") != null) {
+			rResp.setRenderParameter("action", rReq.getParameter("action"));
 		}
 
 		if (rReq.getParameter("page") != null) {
-			wikiPage = rReq.getParameter("page");
+			rResp.setRenderParameter("page", rReq.getParameter("page"));
+			
 		}
 
 		if (rReq.getParameter("editAction") != null) {
@@ -125,9 +120,24 @@
 
 	public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes)
 			throws PortletException, java.io.IOException {
+		
+		String page = "Wiki.jsp";
+		
+		String wikiPage = defaultPage;
+		
+		if ((rReq.getParameter("action") != null)
+				&& (rReq.getParameter("action").equals("Edit"))) {
+			page = "Edit.jsp";
+		} else {
+			page = "Wiki.jsp";
+		}
+		
+		if (rReq.getParameter("page") != null) {
+			wikiPage = rReq.getParameter("page");
+		}
+		
+		WikiContext wikiContext = new WikiContext(rReq.getUser(), new WikiType());
 
-		wikiContext = new WikiContext(rReq.getUser(), new WikiType());
-
 		PortletURL wikiURL = rRes.createActionURL();
 
 		rReq.setAttribute("actionURL", wikiURL.toString());

Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-10 21:34:48 UTC (rev 813)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-10 21:46:58 UTC (rev 814)
@@ -41,7 +41,7 @@
 <tr>
 <td class="wikiFooter">
 <hr />
-<a href="<%=actionURL%>&action=Edit">Edit this page</a> <a href="<%=actionURL%>">More info...</a> <a href="<%=actionURL%>">Attach file...</a> 
+<a href="<%=actionURL%>&action=Edit&page=<%=wikiPage%>">Edit this page</a> <a href="<%=actionURL%>">More info...</a> <a href="<%=actionURL%>">Attach file...</a> 
 </td>
 </tr>
 </table>