[OFBiz] SVN: r4990 - in trunk/applications/product:
webapp/catalog/WEB-INF/actions/product webapp/catalog/product
widget/catalog
jacopo at svn.ofbiz.org
jacopo at svn.ofbiz.org
Sat May 14 06:01:13 EDT 2005
Author: jacopo
Date: 2005-05-14 05:00:28 -0500 (Sat, 14 May 2005)
New Revision: 4990
Removed:
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductKeyword.bsh
Modified:
trunk/applications/product/webapp/catalog/product/EditProductKeyword.ftl
trunk/applications/product/widget/catalog/ProductScreens.xml
Log:
Resolved issue OFBIZ-170 (product keywords containing unicode characters could not be removed): unicode chars are now passed as post parameters (not as uri parameters). Also resolved other issues probably introduced with the migration to screen widget: a wrong bsh script was called; I've also removed the old bsh script because it's no longer neede.
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductKeyword.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductKeyword.bsh 2005-05-12 22:02:49 UTC (rev 4989)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductKeyword.bsh 2005-05-14 10:00:28 UTC (rev 4990)
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-productId = request.getParameter("productId");
-if (productId == null) productId = request.getParameter("PRODUCT_ID");
-if (productId != null) context.put("productId", productId);
-
-product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
\ No newline at end of file
Modified: trunk/applications/product/webapp/catalog/product/EditProductKeyword.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductKeyword.ftl 2005-05-12 22:02:49 UTC (rev 4989)
+++ trunk/applications/product/webapp/catalog/product/EditProductKeyword.ftl 2005-05-14 10:00:28 UTC (rev 4990)
@@ -51,6 +51,7 @@
<form method="post" action="<@ofbizUrl>/UpdateProductKeyword</@ofbizUrl>" style="margin: 0;">
<input type="hidden" name="UPDATE_MODE" value="CREATE">
<input type="hidden" name="PRODUCT_ID" value="${productId?if_exists}">
+ <input type="hidden" name="productId" value="${productId?if_exists}">
<span class="tabletext">${uiLabelMap.ProductKeyword}: </span><input type="text" size="20" name="KEYWORD" value="" class="inputBox">
<span class="tabletext">${uiLabelMap.ProductWeight}: </span><input type="text" size="4" name="relevancyWeight" value="1" class="inputBox">
<input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
@@ -72,7 +73,7 @@
<DIV class="boxhead">${uiLabelMap.ProductKeywords}</DIV>
</TD>
<TD align="right">
- <a href="<@ofbizUrl>/UpdateProductKeywords?UPDATE_MODE=CREATE&PRODUCT_ID=${productId}</@ofbizUrl>" class="submenutext">${uiLabelMap.ProductReInduceKeywords}</a><a href="<@ofbizUrl>/UpdateProductKeywords?UPDATE_MODE=DELETE&PRODUCT_ID=${productId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.ProductDeleteAllKeywords}</a>
+ <a href="<@ofbizUrl>/UpdateProductKeywords?UPDATE_MODE=CREATE&PRODUCT_ID=${productId}&productId=${productId}</@ofbizUrl>" class="submenutext">${uiLabelMap.ProductReInduceKeywords}</a><a href="<@ofbizUrl>/UpdateProductKeywords?UPDATE_MODE=DELETE&PRODUCT_ID=${productId}&productId=${productId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.ProductDeleteAllKeywords}</a>
</td>
</tr>
</table>
@@ -94,8 +95,13 @@
<td align="left"> ${(productKeyword.keyword)?if_exists}</td>
<td> </td>
<td align="left">
- <a href="<@ofbizUrl>/UpdateProductKeyword?UPDATE_MODE=DELETE&PRODUCT_ID=${productId}&KEYWORD=${(productKeyword.keyword)?if_exists}</@ofbizUrl>" class="buttontext">
- [${uiLabelMap.CommonDelete}]</a>
+ <form method="post" action="<@ofbizUrl>/UpdateProductKeyword</@ofbizUrl>">
+ <input type="hidden" name="productId" value="${productId}">
+ <input type="hidden" name="UPDATE_MODE" value="DELETE">
+ <input type="hidden" name="PRODUCT_ID" value="${productId}">
+ <input type="hidden" name="KEYWORD" value="${(productKeyword.keyword)?if_exists}">
+ <input type="submit" value="${uiLabelMap.CommonDelete}" class="smallSubmit">
+ </form>
</td>
</tr>
<#assign kIdx = kIdx + 1>
Modified: trunk/applications/product/widget/catalog/ProductScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/ProductScreens.xml 2005-05-12 22:02:49 UTC (rev 4989)
+++ trunk/applications/product/widget/catalog/ProductScreens.xml 2005-05-14 10:00:28 UTC (rev 4990)
@@ -412,7 +412,6 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-name="product"/>
- <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh"/>
</actions>
<widgets>
<decorator-screen name="CommonProductDecorator">
More information about the Svn
mailing list