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 2010/10/01 10:48:07 UTC
svn commit: r1003438 - in /ofbiz/branches/release10.04: ./
applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
Author: jleroux
Date: Fri Oct 1 08:48:07 2010
New Revision: 1003438
URL: http://svn.apache.org/viewvc?rev=1003438&view=rev
Log:
"Applied fix from trunk for revision: 1003434 "
------------------------------------------------------------------------
r1003434 | jleroux | 2010-10-01 10:42:15 +0200 (ven. 01 oct. 2010) | 1 ligne
Fixes "Categories removing in Product Quick Admin" (https://issues.apache.org/jira/browse/OFBIZ-3950) - OFBIZ-3950
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 1 08:48:07 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434
Modified: ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=1003438&r1=1003437&r2=1003438&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original)
+++ ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Fri Oct 1 08:48:07 2010
@@ -397,8 +397,15 @@ function doPublish() {
<#list productCategoryMembers as prodCatMemb>
<#assign prodCat = prodCatMemb.getRelatedOne("ProductCategory")/>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td colspan="2"><a href='<@o...@ofbizUrl>' class="buttontext">x</a>
- ${prodCat.description?if_exists} ${prodCat.productCategoryId}</td>
+ <td colspan="2">
+ <form name="quickAdminRemoveProductFromCategory_${prodCat.productCategoryId}" action="<@o...@ofbizUrl>" method="post">
+ <input type="hidden" name="productId" value="${prodCatMemb.productId?if_exists}" />
+ <input type="hidden" name="productCategoryId" value="${prodCatMemb.productCategoryId}" />
+ <input type="hidden" name="fromDate" value="${prodCatMemb.getString("fromDate")}" />
+ <a href="javascript:document.quickAdminRemoveProductFromCategory_${prodCat.productCategoryId}.submit();" class="buttontext">x</a>
+ ${prodCat.description?if_exists} ${prodCat.productCategoryId}
+ </form>
+ </td>
</tr>
<#-- toggle the row color -->
<#if rowClass == "2">