[OFBiz] SVN: r4988 - in trunk/applications/product: entitydef webapp/catalog/category

[jaz at svn.ofbiz.org]

Author: jaz
Date: 2005-05-12 16:14:50 -0500 (Thu, 12 May 2005)
New Revision: 4988

Modified:
   trunk/applications/product/entitydef/entitymodel.xml
   trunk/applications/product/webapp/catalog/category/EditCategory.ftl
Log:
added categoryName field


Modified: trunk/applications/product/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel.xml	2005-05-12 12:07:44 UTC (rev 4987)
+++ trunk/applications/product/entitydef/entitymodel.xml	2005-05-12 21:14:50 UTC (rev 4988)
@@ -166,6 +166,7 @@
       <field name="productCategoryId" type="id-ne"></field>
       <field name="productCategoryTypeId" type="id"></field>
       <field name="primaryParentCategoryId" type="id"></field>
+      <field name="categoryName" type="name"></field>  
       <field name="description" type="description"></field>
       <field name="longDescription" type="very-long"></field>
       <field name="categoryImageUrl" type="url"></field>

Modified: trunk/applications/product/webapp/catalog/category/EditCategory.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/category/EditCategory.ftl	2005-05-12 12:07:44 UTC (rev 4987)
+++ trunk/applications/product/webapp/catalog/category/EditCategory.ftl	2005-05-12 21:14:50 UTC (rev 4988)
@@ -1,22 +1,22 @@
 <#--
  *  Copyright (c) 2003-2005 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 
+ *  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 
+ *  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 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 (jonesde at ofbiz.org)
@@ -45,8 +45,8 @@
 
 <br/>
 
-<#if ! productCategory?has_content> 
-  <#if productCategoryId?has_content> 
+<#if ! productCategory?has_content>
+  <#if productCategoryId?has_content>
     <h3>${uiLabelMap.ProductCouldNotFindProductCategoryWithId} "${productCategoryId}".</h3>
     <form action="<@ofbizUrl>/createProductCategory</@ofbizUrl>" method="post" style="margin: 0;" name="productCategoryForm">
     <table border="0" cellpadding="2" cellspacing="0">
@@ -92,6 +92,11 @@
       </select>
     </td>
   </tr>
+   <tr>
+    <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductName}</div></td>
+    <td>&nbsp;</td>
+    <td width="74%"><input type="text" <#if productCategory?has_content>value="${productCategory.categoryName?if_exists}"</#if> name="categoryName" size="60" maxlength="60" class="inputBox"/></td>
+  </tr>
   <tr>
     <td width="26%" align="right"><div class="tabletext">${uiLabelMap.ProductDescription}</div></td>
     <td>&nbsp;</td>
@@ -179,7 +184,7 @@
     <td>&nbsp;</td>
     <td width="74%">
       <select name="primaryParentCategoryId" size="1" class="selectbox">
-        <#if productCategory?has_content> 
+        <#if productCategory?has_content>
         <#if (productCategory.primaryParentCategoryId)?exists>
           <option value="${productCategory.primaryParentCategoryId}">${(primaryParentCategory.description)?if_exists} [${productCategory. primaryParentCategoryId}]</option>
         </#if>