You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2010/09/19 18:13:13 UTC
svn commit: r998691 - in /ofbiz/trunk/framework:
common/webcommon/WEB-INF/portal-controller.xml
common/webcommon/portal/editPortalPage.ftl
webtools/webapp/webtools/WEB-INF/controller.xml
Author: buscob
Date: Sun Sep 19 16:13:12 2010
New Revision: 998691
URL: http://svn.apache.org/viewvc?rev=998691&view=rev
Log:
- Removed more ***Adm requests from webtools application. Used view-last/save-last-view pattern instead to have the same portlet handling requests usable from everywhere.
Modified:
ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=998691&r1=998690&r2=998691&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Sun Sep 19 16:13:12 2010
@@ -92,8 +92,8 @@ under the License.
<request-map uri="movePortletToPortalPage">
<security https="true" auth="true"/>
<event type="service" invoke="movePortletToPortalPage"/>
- <response name="success" type="request" value="ManagePortalPages"/>
- <response name="error" type="request" value="ManagePortalPages"/>
+ <response name="success" type="view-last" value="main" save-last-view="true"/>
+ <response name="error" type="request" value="main"/>
</request-map>
<request-map uri="updatePortalPagePortletSeqAjax">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=998691&r1=998690&r2=998691&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Sun Sep 19 16:13:12 2010
@@ -62,7 +62,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="freeMove_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form>
<#list portalPages as portalPageList>
<#if portalPage.portalPageId != portalPageList.portalPageId>
- <form method="post" action="<@o...@ofbizUrl>" name="movePP_${portlet_index}_${portalPageList_index}">
+ <form method="post" action="<@o...@ofbizUrl>" name="movePP_${portlet_index}_${portalPageList_index}">
${portletFields}
<input name="newPortalPageId" value="${portalPageList.portalPageId}" type="hidden"/>
</form>
@@ -77,10 +77,10 @@ under the License.
</#if>
<#if !firstInColumn>
- <li class="move-up"><form method="post" action="<@o...@ofbizUrl>" name="moveUpPP_${portlet_index}">${portletFields}<input name="mode" value="UP" type="hidden"/></form><a href="javascript:document.moveUpPP_${portlet_index}.submit()"> </a></li>
+ <li class="move-up"><form method="post" action="<@o...@ofbizUrl>" name="moveUpPP_${portlet_index}">${portletFields}<input name="mode" value="UP" type="hidden"/></form><a href="javascript:document.moveUpPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if portlet_has_next>
- <li class="move-down"><form method="post" action="<@o...@ofbizUrl>" name="moveDownPP_${portlet_index}">${portletFields}<input name="mode" value="DOWN" type="hidden"/></form><a href="javascript:document.moveDownPP_${portlet_index}.submit()"> </a></li>
+ <li class="move-down"><form method="post" action="<@o...@ofbizUrl>" name="moveDownPP_${portlet_index}">${portletFields}<input name="mode" value="DOWN" type="hidden"/></form><a href="javascript:document.moveDownPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if portalPageColumn_has_next>
<li class="move-right"><form method="post" action="<@o...@ofbizUrl>" name="moveRightPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index+1].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form><a href="javascript:document.moveRightPP_${portlet_index}.submit()"> </a></li>
@@ -89,10 +89,10 @@ under the License.
<li class="move-left"><form method="post" action="<@o...@ofbizUrl>" name="moveLeftPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index-1].columnSeqId}" type="hidden"/><input name="mode" value="LEFT" type="hidden"/></form><a href="javascript:document.moveLeftPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if !firstInColumn>
- <li class="move-top"><form method="post" action="<@o...@ofbizUrl>" name="moveTopPP_${portlet_index}">${portletFields}<input name="mode" value="TOP" type="hidden"/></form><a href="javascript:document.moveTopPP_${portlet_index}.submit()"> </a></li>
+ <li class="move-top"><form method="post" action="<@o...@ofbizUrl>" name="moveTopPP_${portlet_index}">${portletFields}<input name="mode" value="TOP" type="hidden"/></form><a href="javascript:document.moveTopPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if portlet_has_next>
- <li class="move-bottom"><form method="post" action="<@o...@ofbizUrl>" name="moveBottomPP_${portlet_index}">${portletFields}<input name="mode" value="BOTTOM" type="hidden"/></form><a href="javascript:document.moveBottomPP_${portlet_index}.submit()"> </a></li>
+ <li class="move-bottom"><form method="post" action="<@o...@ofbizUrl>" name="moveBottomPP_${portlet_index}">${portletFields}<input name="mode" value="BOTTOM" type="hidden"/></form><a href="javascript:document.moveBottomPP_${portlet_index}.submit()"> </a></li>
</#if>
<#if (portalPages.size() > 1)>
<li>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=998691&r1=998690&r2=998691&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sun Sep 19 16:13:12 2010
@@ -554,26 +554,6 @@ under the License.
<response name="error" type="view" value="EditPortalPage"/>
</request-map>
- <!-- PortalPage detail administration, copy from portal-controller with response target change to EditPortalPage-->
- <request-map uri="movePortletToPortalPageAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="movePortletToPortalPage"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
- <request-map uri="updatePortalPagePortletSeqAdm">
- <security https="true" auth="true"/>
- <event type="service" invoke="updatePortalPagePortletSeq"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
- <request-map uri="setPortalPortletAttributesAdm">
- <security https="true" auth="true"/>
- <event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
- <response name="success" type="view" value="EditPortalPage"/>
- <response name="error" type="view" value="EditPortalPage"/>
- </request-map>
-
<!-- Geo Management -->
<request-map uri="FindGeo"><security https="true" auth="true"/><response name="success" type="view" value="FindGeo" save-home-view="true"/></request-map>
<request-map uri="EditGeo"><security https="true" auth="true"/><response name="success" type="view" value="EditGeo"/></request-map>