Author: adrianc
Date: Tue Sep 25 13:51:27 2007
New Revision: 579376
URL: http://svn.apache.org/viewvc?rev=579376&view=rev
Log:
Small fixups for rev 578930.
Modified:
ofbiz/trunk/applications/product/entitydef/entitymodel.xml
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=579376&r1=579375&r2=579376&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Sep 25
13:51:27 2007
@@ -2213,9 +2213,9 @@
<key-map field-name="partyId"/>
<key-map field-name="roleTypeId"/>
</relation>
- <!-- <relation type="one" fk-name="PROD_RLE_CATEGORY"
rel-entity-name="Product">
- <key-map field-name="productCategoryId"/>
- </relation> -->
+ <relation type="one" fk-name="PROD_RLE_PRODUCT"
rel-entity-name="Product">
+ <key-map field-name="productId"/>
+ </relation>
</entity>
<entity entity-name="ProductAttribute"
package-name="org.ofbiz.product.product"
Modified:
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=579376&r1=579375&r2=579376&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
Tue Sep 25 13:51:27 2007
@@ -44,7 +44,7 @@
<input type="hidden" name="partyId"
value="${(productRole.partyId)?if_exists}">
<input type="hidden" name="roleTypeId"
value="${(productRole.roleTypeId)?if_exists}">
<input type="hidden" name="fromDate"
value="${(productRole.getTimestamp("fromDate"))?if_exists}">
- <input type="text" size="25" name="thruDate"
value="${(productRole. getTimestamp("thruDate"))?if_exists}" class="inputBox"
<#if hasExpired> style="color: red;"</#if>>
+ <input type="text" size="25" name="thruDate"
value="${(productRole. getTimestamp("thruDate"))?if_exists}"<#if hasExpired>
class="alert"</#if>>
<a href="javascript:call_cal(document.lineForm${line}.thruDate,
'${(productRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" border="0" alt="Calendar"></a>
<input type="submit" value="${uiLabelMap.CommonUpdate}">
</form>
