Author: ashish
Date: Sun Jul  3 06:59:46 2016
New Revision: 1751130

URL: http://svn.apache.org/viewvc?rev=1751130&view=rev
Log:
Applied patch from jira issue - OFBIZ-7258 - Duplicate product feature groups 
associated with a category when duplicating category and selected option to 
duplicate feature.
Thanks Ravi for the contribution. Thanks Rishi for your valuable comment.

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    
ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml
    ofbiz/trunk/applications/product/servicedef/services.xml
    ofbiz/trunk/applications/product/template/category/EditCategory.ftl

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1751130&r1=1751129&r2=1751130&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun Jul  3 
06:59:46 2016
@@ -17960,6 +17960,9 @@
         <value xml:lang="zh">特征分类和组</value>
         <value xml:lang="zh-TW">特性分類和群組</value>
     </property>
+    <property key="ProductFeatureCategories">
+        <value xml:lang="en">Feature Categories</value>
+    </property>
     <property key="ProductFeatureCategory">
         <value xml:lang="de">Merkmal Kategorie</value>
         <value xml:lang="en">Feature Category</value>
@@ -18031,6 +18034,9 @@
         <value xml:lang="zh">特征组</value>
         <value xml:lang="zh-TW">特性群組</value>
     </property>
+        <property key="ProductFeatureGroups">
+        <value xml:lang="en">Feature Groups</value>
+    </property>
     <property key="ProductFeatureGroupAppls">
         <value xml:lang="de">Merkmalgruppe Anwendungen</value>
         <value xml:lang="en">Feature Group Appls</value>

Modified: 
ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml?rev=1751130&r1=1751129&r2=1751130&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml 
(original)
+++ 
ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml 
Sun Jul  3 06:59:46 2016
@@ -528,10 +528,14 @@ under the License.
             <set field="entityName" value="ProductCategoryAttribute"/>
             <call-simple-method method-name="copyCategoryEntities"/>
         </if-not-empty>
-        <if-not-empty field="parameters.duplicateFeatures">
+        <if-not-empty field="parameters.duplicateFeatureCategories">
             <set field="entityName" value="ProductFeatureCategoryAppl"/>
             <call-simple-method method-name="copyCategoryEntities"/>
         </if-not-empty>
+        <if-not-empty field="parameters.duplicateFeatureGroups">
+            <set field="entityName" value="ProductFeatureCatGrpAppl"/>
+            <call-simple-method method-name="copyCategoryEntities"/>
+        </if-not-empty>
         <if-not-empty field="parameters.duplicateCatalogs">
             <set field="entityName" value="ProdCatalogCategory"/>
             <call-simple-method method-name="copyCategoryEntities"/>

Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1751130&r1=1751129&r2=1751130&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Sun Jul  3 
06:59:46 2016
@@ -691,7 +691,8 @@ under the License.
         <attribute name="duplicateChildRollup" type="String" mode="IN" 
optional="true"/>
         <attribute name="duplicateMembers" type="String" mode="IN" 
optional="true"/>
         <attribute name="duplicateCatalogs" type="String" mode="IN" 
optional="true"/>
-        <attribute name="duplicateFeatures" type="String" mode="IN" 
optional="true"/>
+        <attribute name="duplicateFeatureCategories" type="String" mode="IN" 
optional="true"/>
+        <attribute name="duplicateFeatureGroups" type="String" mode="IN" 
optional="true"/>
         <attribute name="duplicateAttributes" type="String" mode="IN" 
optional="true"/>
         <attribute name="duplicateRoles" type="String" mode="IN" 
optional="true"/>
     </service>

Modified: ofbiz/trunk/applications/product/template/category/EditCategory.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/category/EditCategory.ftl?rev=1751130&r1=1751129&r2=1751130&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/category/EditCategory.ftl 
(original)
+++ ofbiz/trunk/applications/product/template/category/EditCategory.ftl Sun Jul 
 3 06:59:46 2016
@@ -249,7 +249,8 @@ function insertImageName(type,nameValue)
                             
${uiLabelMap.ProductCategoryRollupChildCategories}&nbsp;<input type="checkbox" 
name="duplicateChildRollup" value="Y" />
                             ${uiLabelMap.ProductProducts}&nbsp;<input 
type="checkbox" name="duplicateMembers" value="Y" checked="checked" />
                             ${uiLabelMap.ProductCatalogs}&nbsp;<input 
type="checkbox" name="duplicateCatalogs" value="Y" checked="checked" />
-                            ${uiLabelMap.ProductFeatures}&nbsp;<input 
type="checkbox" name="duplicateFeatures" value="Y" checked="checked" />
+                            ${uiLabelMap.ProductFeatureCategories}&nbsp;<input 
type="checkbox" name="duplicateFeatureCategories" value="Y" checked="checked" />
+                            ${uiLabelMap.ProductFeatureGroups}&nbsp;<input 
type="checkbox" name="duplicateFeatureGroups" value="Y"/>
                             ${uiLabelMap.PartyParties}&nbsp;<input 
type="checkbox" name="duplicateRoles" value="Y" checked="checked" />
                             ${uiLabelMap.ProductAttributes}&nbsp;<input 
type="checkbox" name="duplicateAttributes" value="Y" checked="checked" />
                         </div>


Reply via email to