svnno****@sourc*****
svnno****@sourc*****
2008年 9月 8日 (月) 13:44:52 JST
Revision: 1141
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1141
Author: shinsuke
Date: 2008-09-08 13:44:52 +0900 (Mon, 08 Sep 2008)
Log Message:
-----------
updated edit page behavior.
Modified Paths:
--------------
pal-wcm/tags/pal-wcm-1.0/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java
pal-wcm/tags/pal-wcm-1.0/src/main/webapp/WEB-INF/view/viewer/edit.jsp
-------------- next part --------------
Modified: pal-wcm/tags/pal-wcm-1.0/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java
===================================================================
--- pal-wcm/tags/pal-wcm-1.0/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java 2008-09-07 23:31:21 UTC (rev 1140)
+++ pal-wcm/tags/pal-wcm-1.0/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java 2008-09-08 04:44:52 UTC (rev 1141)
@@ -27,6 +27,7 @@
import javax.portlet.GenericPortlet;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
import javax.portlet.PortletRequest;
import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PortletSession;
@@ -82,10 +83,10 @@
public void processAction(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
-// PortletMode mode = request.getPortletMode();
-// if (PortletMode.EDIT.equals(mode)) {
-// response.setPortletMode(PortletMode.VIEW);
-// }
+ PortletMode mode = request.getPortletMode();
+ if (PortletMode.EDIT.equals(mode)) {
+ response.setPortletMode(PortletMode.VIEW);
+ }
}
protected void doEdit(RenderRequest request, RenderResponse response)
Modified: pal-wcm/tags/pal-wcm-1.0/src/main/webapp/WEB-INF/view/viewer/edit.jsp
===================================================================
--- pal-wcm/tags/pal-wcm-1.0/src/main/webapp/WEB-INF/view/viewer/edit.jsp 2008-09-07 23:31:21 UTC (rev 1140)
+++ pal-wcm/tags/pal-wcm-1.0/src/main/webapp/WEB-INF/view/viewer/edit.jsp 2008-09-08 04:44:52 UTC (rev 1141)
@@ -15,7 +15,7 @@
var url = '<%= request.getAttribute(WcmConstants.PORTAL_CONTEXT_PATH) %>/portal/system/customizer/wcm-editor.psml';
url = url + '?encodedPath=<%= request.getAttribute(WcmConstants.ENCODED_PATH) %>';
window.open(url, 'wcmEditor', 'width=700, height=550, menubar=no, toolbar=no, scrollbars=yes, location=no, resizable=yes');
- return true;
+ return false;
}
//-->
</script>