You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/01 17:57:27 UTC
svn commit: r760940 - in /ofbiz/trunk:
applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
specialpurpose/projectmgr/widget/ProjectScreens.xml
Author: jleroux
Date: Wed Apr 1 15:57:25 2009
New Revision: 760940
URL: http://svn.apache.org/viewvc?rev=760940&view=rev
Log:
A patch from Henning Schmiedehausen " Category delete links in Catalog view don't work" https://issues.apache.org/jira/browse/OFBIZ-2266
+ Securing URLs, link element in screens and menus : 14th set + tabs to 4 spaces
Modified:
ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml?rev=760940&r1=760939&r2=760940&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml Wed Apr 1 15:57:25 2009
@@ -83,8 +83,12 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="removeProdCatalogFromParty?prodCatalogId=${prodCatalogId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}"
- description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ <hyperlink target="removeProdCatalogFromParty" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="prodCatalogId" from-field="prodCatalogId" />
+ <parameter param-name="partyId" from-field="partyId" />
+ <parameter param-name="roleTypeId" from-field="roleTypeId" />
+ <parameter param-name="fromDate" from-field="fromDate" />
+ </hyperlink>
</field>
</form>
<form name="CreateProductStoreCatalog" type="single" target="createProdCatalogStore" title=""
@@ -115,9 +119,12 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="deleteProdCatalogStore?prodCatalogId=${prodCatalogId}&productStoreId=${productStoreId}&fromDate=${fromDate}"
- description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
- </field>
+ <hyperlink target="deleteProdCatalogStore" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="prodCatalogId" from-field="prodCatalogId" />
+ <parameter param-name="productStoreId" from-field="productStoreId" />
+ <parameter param-name="fromDate" from-field="fromDate" />
+ </hyperlink>
+ </field>
</form>
<form name="EditProdCatalogCategories" type="list" target="updateProductCategoryToProdCatalog" title="" list-name="prodCatalogCategories"
odd-row-style="alternate-row" default-table-style="basic-table">
@@ -135,8 +142,13 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="removeProductCategoryFromProdCatalog?prodCatalogId=${prodCatalogId}&productCategoryId=${productCategoryId}&fromDate=${fromDate}&prodCatalogCategoryTypeId=${prodCatalogCategoryTypeId}"
- description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ <hyperlink target="removeProductCategoryFromProdCatalog" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="prodCatalogId" from-field="prodCatalogId" />
+ <parameter param-name="productCategoryId" from-field="productCategoryId" />
+ <parameter param-name="partyId" from-field="partyId" />
+ <parameter param-name="fromDate" from-field="fromDate" />
+ <parameter param-name="prodCatalogCategoryTypeId" from-field="prodCatalogCategoryTypeId" />
+ </hyperlink>
</field>
<field name="makeTopLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="EditCategory?CATALOG_TOP_CATEGORY=${productCategoryId}&productCategoryId=${productCategoryId}"
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=760940&r1=760939&r2=760940&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Apr 1 15:57:25 2009
@@ -287,7 +287,11 @@
</widgets>
<!-- Edit an existing SubTask -->
<fail-widgets>
- <container><link text="${uiLabelMap.CommonGoBack}" target="FindTask?workEffortId=${task.workEffortParentId}&workEffortTypeId=TASK" style="buttontext"/></container>
+ <container>
+ <link text="${uiLabelMap.CommonGoBack}" target="FindTask" style="buttontext">
+ <parameter param-name="workEffortId" from-field="task.workEffortParentId"/>
+ </link>
+ </container>
<label style="h1">${uiLabelMap.ProjectMgrSubTaskName}: ${task.workEffortName}</label>
<container><label style="h1">${uiLabelMap.PageTitleEditSubTask}</label></container>
<platform-specific>