Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
Locked
Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
 
Administrator
|
Hi Nicolas,
When possible please put a least the number of the Jira issue in commit, it's easier to follow things (links are even easier ;) Thanks Jacques Le 30/09/2014 13:59, [hidden email] a écrit : > Author: nmalin > Date: Tue Sep 30 11:59:29 2014 > New Revision: 1628405 > > URL: http://svn.apache.org/r1628405 > Log: > Convert the ProdCatalog CRUD simple service to entity-auto > > Modified: > ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml > ofbiz/trunk/applications/product/servicedef/services.xml > > Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1628405&r1=1628404&r2=1628405&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) > +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Sep 30 11:59:29 2014 > @@ -20,92 +20,6 @@ under the License. > > <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> > - <simple-method method-name="createProdCatalog" short-description="Create an ProdCatalog"> > - <make-value value-field="newEntity" entity-name="ProdCatalog"/> > - <set-nonpk-fields map="parameters" value-field="newEntity"/> > - > - <if-empty field="parameters.prodCatalogId"> > - <sequenced-id sequence-name="ProdCatalog" field="newEntity.prodCatalogId"/> > - <else> > - <set field="newEntity.prodCatalogId" from-field="parameters.prodCatalogId"/> > - <check-id field="newEntity.prodCatalogId"/> > - <check-errors/> > - </else> > - </if-empty> > - <field-to-result field="newEntity.prodCatalogId" result-name="prodCatalogId"/> > - > - <create-value value-field="newEntity"/> > - </simple-method> > - <simple-method method-name="updateProdCatalog" short-description="Update an ProdCatalog"> > - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> > - <set-nonpk-fields map="parameters" value-field="prodCatalog"/> > - <store-value value-field="prodCatalog"/> > - </simple-method> > - <simple-method method-name="deleteProdCatalog" short-description="Delete an ProdCatalog"> > - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> > - <remove-value value-field="prodCatalog"/> > - </simple-method> > - > - <simple-method method-name="addProductCategoryToProdCatalog" short-description="Add Category To ProdCatalog"> > - <!-- Check that the ProductCategory exists --> > - <entity-one entity-name="ProductCategory" value-field="productCategory"/> > - <if-empty field="productCategory"> > - <add-error><fail-property resource="ProductUiLabels" property="ProductCategoryNotFoundForCategoryID"/></add-error> > - </if-empty> > - <check-errors/> > - > - <make-value value-field="newEntity" entity-name="ProdCatalogCategory"/> > - <set-pk-fields map="parameters" value-field="newEntity"/> > - <set-nonpk-fields map="parameters" value-field="newEntity"/> > - > - <if-empty field="newEntity.fromDate"> > - <now-timestamp field="nowTimestamp"/> > - <set from-field="nowTimestamp" field="newEntity.fromDate"/> > - </if-empty> > - > - <create-value value-field="newEntity"/> > - </simple-method> > - <simple-method method-name="updateProductCategoryToProdCatalog" short-description="Remove ContactMech From ProdCatalog"> > - > - <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> > - <set-pk-fields map="parameters" value-field="lookupPKMap"/> > - <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/> > - <set-nonpk-fields map="parameters" value-field="prodCatalogCategory"/> > - <store-value value-field="prodCatalogCategory"/> > - </simple-method> > - <simple-method method-name="removeProductCategoryFromProdCatalog" short-description="Remove ContactMech From ProdCatalog"> > - > - <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> > - <set-pk-fields map="parameters" value-field="lookupPKMap"/> > - <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/> > - <remove-value value-field="prodCatalogCategory"/> > - </simple-method> > - > - <!-- Party and Catalog services --> > - <simple-method method-name="addProdCatalogToParty" short-description="Add ProdCatalog To Party"> > - <make-value value-field="newEntity" entity-name="ProdCatalogRole"/> > - <set-pk-fields map="parameters" value-field="newEntity"/> > - <set-nonpk-fields map="parameters" value-field="newEntity"/> > - > - <if-empty field="newEntity.fromDate"> > - <now-timestamp field="newEntity.fromDate"/> > - </if-empty> > - > - <create-value value-field="newEntity"/> > - </simple-method> > - <simple-method method-name="updateProdCatalogToParty" short-description="Update ProdCatalog To Party"> > - <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/> > - <set-pk-fields map="parameters" value-field="lookupPKMap"/> > - <find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/> > - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> > - <store-value value-field="lookedUpValue"/> > - </simple-method> > - <simple-method method-name="removeProdCatalogFromParty" short-description="Remove ProdCatalog From Party"> > - <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/> > - <set-pk-fields map="parameters" value-field="lookupPKMap"/> > - <find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/> > - <remove-value value-field="lookedUpValue"/> > - </simple-method> > > <simple-method method-name="getAllCategories" short-description="get All categories" login-required="false"> > <if-not-empty field="parameters.topCategory"> > @@ -127,6 +41,7 @@ under the License. > <log level="info" message="=========${category.productCategoryId}"/> > </iterate --> > </simple-method> > + > <simple-method method-name="getRelatedCategories" short-description="get All Related categories" login-required="false"> > <set value="sequenceNum" field="orderByString"/> > <field-to-list list="orderByStringList" field="orderByString"/> > @@ -182,6 +97,7 @@ under the License. > </iterate --> > <field-to-result result-name="categories" field="categories"/> > </simple-method> > + > <simple-method method-name="checkImageUrlForAllCategories" short-description="Check for image url exists or not for All categories" login-required="false"> > <!-- Get all the categories from top category --> > <set-service-fields to-map="categoryFindContext" service-name="getAllCategories" map="parameters"/> > @@ -401,6 +317,7 @@ under the License. > <field-to-result field="filesImageMap" result-name="filesImageMap"/> > </if-not-empty> > </simple-method> > + > <simple-method method-name="checkImageUrlForProduct" short-description="Check for image url exists or not for product" login-required="false"> > <if-not-empty field="parameters.productId"> > <set field="productFindContext.productId" from-field="parameters.productId"/> > @@ -466,8 +383,8 @@ under the License. > <!-- set-service-fields service-name="updateProduct" map-name="product" to-map-name="updateProductContext"/> > <call-service service-name="updateProduct" in-map-name="updateProductContext" / --> > </if-not-empty> > - > </simple-method> > + > <!-- get file image url and return Y or N --> > <simple-method method-name="checkImageUrl" short-description="Check for image url exists or not" login-required="false"> > <set field="imageUrl" from-field="parameters.imageUrl"/> > @@ -530,7 +447,7 @@ under the License. > <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false"> > <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> > </entity-and> > - > + > <!-- Get all categories --> > <call-class-method method-name="newInstance" class-name="javolution.util.FastList" ret-field="parameters.productCategories"/> > <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList"> > @@ -541,9 +458,8 @@ under the License. > <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/> > <call-simple-method method-name="createMissingCategoryAltUrlInline"/> > </iterate> > - > + > <iterate entry="productCategoryList" list="parameters.productCategories"> > - > <!-- Create Product Category Alternative URLs --> > <if-empty field="category"> > <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true"> > @@ -598,7 +514,7 @@ under the License. > </else> > </if-empty> > </if-empty> > - > + > <!-- Create Product Alternative URLs --> > <if-empty field="product"> > <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true"> > @@ -659,6 +575,7 @@ under the License. > <field-to-result field="categoriesUpdated" result-name="categoriesUpdated"/> > <field-to-result field="productsUpdated" result-name="productsUpdated"/> > </simple-method> > + > <simple-method method-name="createMissingCategoryAltUrlInline" short-description="create missing category alternative inline"> > <entity-and list="productCategoryRollups" entity-name="ProductCategoryRollup" filter-by-date="true"> > <field-map field-name="parentProductCategoryId" from-field="parameters.parentProductCategoryId"/> > @@ -669,7 +586,6 @@ under the License. > <field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/> > </entity-one> > <field-to-list list="parameters.productCategories" field="productCategory"/> > - > <!-- find rollup product categories --> > <set field="parameters.parentProductCategoryId" from-field="productCategoryRollup.productCategoryId"/> > <call-simple-method method-name="createMissingCategoryAltUrlInline"/> > > Modified: ofbiz/trunk/applications/product/servicedef/services.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1628405&r1=1628404&r2=1628405&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/servicedef/services.xml (original) > +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Sep 30 11:59:29 2014 > @@ -624,69 +624,60 @@ under the License. > <!-- ======================================== --> > <!-- Product Catalog Services --> > <!-- ======================================== --> > - <service name="createProdCatalog" default-entity-name="ProdCatalog" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="createProdCatalog" auth="true"> > + <service name="createProdCatalog" default-entity-name="ProdCatalog" engine="entity-auto" invoke="create" auth="true"> > <description>Create a ProdCatalog</description> > <permission-service service-name="catalogPermissionCheck" main-action="CREATE"/> > <auto-attributes include="pk" mode="INOUT" optional="true"/> > <auto-attributes include="nonpk" mode="IN" optional="true"/> > <override name="catalogName" optional="false"/> > </service> > - <service name="updateProdCatalog" default-entity-name="ProdCatalog" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="updateProdCatalog" auth="true"> > + <service name="updateProdCatalog" default-entity-name="ProdCatalog" engine="entity-auto" invoke="update" auth="true"> > <description>Update an ProdCatalog</description> > <permission-service service-name="catalogPermissionCheck" main-action="UPDATE"/> > <auto-attributes include="pk" mode="IN" optional="false"/> > <auto-attributes include="nonpk" mode="IN" optional="true"/> > <override name="catalogName" optional="false"/> > </service> > - <service name="deleteProdCatalog" default-entity-name="ProdCatalog" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="deleteProdCatalog" auth="true"> > + <service name="deleteProdCatalog" default-entity-name="ProdCatalog" engine="entity-auto" invoke="delete" auth="true"> > <description>Delete an ProdCatalog</description> > <permission-service service-name="catalogPermissionCheck" main-action="DELETE"/> > <auto-attributes include="pk" mode="IN" optional="false"/> > </service> > > - <service name="addProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="addProductCategoryToProdCatalog" auth="true"> > + <service name="addProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="entity-auto" invoke="create" auth="true"> > <description>Add ProductCategory To ProdCatalog</description> > <permission-service service-name="catalogPermissionCheck" main-action="CREATE"/> > <auto-attributes include="pk" mode="IN" optional="false"/> > <auto-attributes include="nonpk" mode="IN" optional="true"/> > <override name="fromDate" optional="true"/> > </service> > - <service name="updateProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="updateProductCategoryToProdCatalog" auth="true"> > + <service name="updateProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="entity-auto" invoke="update" auth="true"> > <description>Add ProductCategory To ProdCatalog</description> > <permission-service service-name="catalogPermissionCheck" main-action="UPDATE"/> > <auto-attributes include="pk" mode="IN" optional="false"/> > <auto-attributes include="nonpk" mode="IN" optional="true"/> > <override name="prodCatalogCategoryTypeId" optional="false"/> > </service> > - <service name="removeProductCategoryFromProdCatalog" default-entity-name="ProdCatalogCategory" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="removeProductCategoryFromProdCatalog" auth="true"> > + <service name="removeProductCategoryFromProdCatalog" default-entity-name="ProdCatalogCategory" engine="entity-auto" invoke="delete" auth="true"> > <description>Remove ProductCategory From ProdCatalog</description> > <permission-service service-name="catalogPermissionCheck" main-action="DELETE"/> > <auto-attributes include="pk" mode="IN" optional="false"/> > </service> > > - <service name="addProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="addProdCatalogToParty" auth="true"> > + <service name="addProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="entity-auto" invoke="create" auth="true"> > <description>Add ProdCatalog To Party</description> > <permission-service service-name="prodCatalogToPartyPermissionCheck" main-action="CREATE"/> > <auto-attributes include="pk" mode="IN" optional="false"/> > <auto-attributes include="nonpk" mode="IN" optional="true"/> > <override name="fromDate" optional="true"/> > </service> > - <service name="updateProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="updateProdCatalogToParty" auth="true"> > + <service name="updateProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="entity-auto" invoke="update" auth="true"> > <description>Add ProdCatalog To Party</description> > <permission-service service-name="prodCatalogToPartyPermissionCheck" main-action="UPDATE"/> > <auto-attributes include="pk" mode="IN" optional="false"/> > <auto-attributes include="nonpk" mode="IN" optional="true"/> > </service> > - <service name="removeProdCatalogFromParty" default-entity-name="ProdCatalogRole" engine="simple" > - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="removeProdCatalogFromParty" auth="true"> > + <service name="removeProdCatalogFromParty" default-entity-name="ProdCatalogRole" engine="entity-auto" invoke="delete" auth="true"> > <description>Remove ProdCatalog From Party</description> > <permission-service service-name="prodCatalogToPartyPermissionCheck" main-action="DELETE"/> > <auto-attributes include="pk" mode="IN" optional="false"/> > > > |
Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
|
Ho, sorry Jacques,
I misunderstood this : "Also, not everone knows how jira works. Or confluence. Or AutoConfigMaintenceWidgetApplication. What you may thing as a sensible cross-reference(OFBIZ-####, debbugs ####) may mean nothing to the person reading your changelog." (https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Committers+Roles+and+Responsibilities) I read and understood "do not set issue reference", but I totally wrong. It's more "do not issue reference only !". Thanks for this remark, I will correct my commit's comment the next time. Nicolas Le 30/09/2014 18:43, Jacques Le Roux a écrit : > Hi Nicolas, > > When possible please put a least the number of the Jira issue in > commit, it's easier to follow things (links are even easier ;) > > Thanks > > Jacques > > Le 30/09/2014 13:59, [hidden email] a écrit : >> Author: nmalin >> Date: Tue Sep 30 11:59:29 2014 >> New Revision: 1628405 >> >> URL: http://svn.apache.org/r1628405 >> Log: >> Convert the ProdCatalog CRUD simple service to entity-auto >> >> Modified: >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> ofbiz/trunk/applications/product/servicedef/services.xml >> >> Modified: >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> (original) >> +++ >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> Tue Sep 30 11:59:29 2014 >> @@ -20,92 +20,6 @@ under the License. >> <simple-methods >> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> >> - <simple-method method-name="createProdCatalog" >> short-description="Create an ProdCatalog"> >> - <make-value value-field="newEntity" entity-name="ProdCatalog"/> >> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >> - >> - <if-empty field="parameters.prodCatalogId"> >> - <sequenced-id sequence-name="ProdCatalog" >> field="newEntity.prodCatalogId"/> >> - <else> >> - <set field="newEntity.prodCatalogId" >> from-field="parameters.prodCatalogId"/> >> - <check-id field="newEntity.prodCatalogId"/> >> - <check-errors/> >> - </else> >> - </if-empty> >> - <field-to-result field="newEntity.prodCatalogId" >> result-name="prodCatalogId"/> >> - >> - <create-value value-field="newEntity"/> >> - </simple-method> >> - <simple-method method-name="updateProdCatalog" >> short-description="Update an ProdCatalog"> >> - <entity-one entity-name="ProdCatalog" >> value-field="prodCatalog"/> >> - <set-nonpk-fields map="parameters" value-field="prodCatalog"/> >> - <store-value value-field="prodCatalog"/> >> - </simple-method> >> - <simple-method method-name="deleteProdCatalog" >> short-description="Delete an ProdCatalog"> >> - <entity-one entity-name="ProdCatalog" >> value-field="prodCatalog"/> >> - <remove-value value-field="prodCatalog"/> >> - </simple-method> >> - >> - <simple-method method-name="addProductCategoryToProdCatalog" >> short-description="Add Category To ProdCatalog"> >> - <!-- Check that the ProductCategory exists --> >> - <entity-one entity-name="ProductCategory" >> value-field="productCategory"/> >> - <if-empty field="productCategory"> >> - <add-error><fail-property resource="ProductUiLabels" >> property="ProductCategoryNotFoundForCategoryID"/></add-error> >> - </if-empty> >> - <check-errors/> >> - >> - <make-value value-field="newEntity" >> entity-name="ProdCatalogCategory"/> >> - <set-pk-fields map="parameters" value-field="newEntity"/> >> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >> - >> - <if-empty field="newEntity.fromDate"> >> - <now-timestamp field="nowTimestamp"/> >> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> >> - </if-empty> >> - >> - <create-value value-field="newEntity"/> >> - </simple-method> >> - <simple-method method-name="updateProductCategoryToProdCatalog" >> short-description="Remove ContactMech From ProdCatalog"> >> - >> - <make-value value-field="lookupPKMap" >> entity-name="ProdCatalogCategory"/> >> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >> - <find-by-primary-key entity-name="ProdCatalogCategory" >> map="lookupPKMap" value-field="prodCatalogCategory"/> >> - <set-nonpk-fields map="parameters" >> value-field="prodCatalogCategory"/> >> - <store-value value-field="prodCatalogCategory"/> >> - </simple-method> >> - <simple-method >> method-name="removeProductCategoryFromProdCatalog" >> short-description="Remove ContactMech From ProdCatalog"> >> - >> - <make-value value-field="lookupPKMap" >> entity-name="ProdCatalogCategory"/> >> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >> - <find-by-primary-key entity-name="ProdCatalogCategory" >> map="lookupPKMap" value-field="prodCatalogCategory"/> >> - <remove-value value-field="prodCatalogCategory"/> >> - </simple-method> >> - >> - <!-- Party and Catalog services --> >> - <simple-method method-name="addProdCatalogToParty" >> short-description="Add ProdCatalog To Party"> >> - <make-value value-field="newEntity" >> entity-name="ProdCatalogRole"/> >> - <set-pk-fields map="parameters" value-field="newEntity"/> >> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >> - >> - <if-empty field="newEntity.fromDate"> >> - <now-timestamp field="newEntity.fromDate"/> >> - </if-empty> >> - >> - <create-value value-field="newEntity"/> >> - </simple-method> >> - <simple-method method-name="updateProdCatalogToParty" >> short-description="Update ProdCatalog To Party"> >> - <make-value value-field="lookupPKMap" >> entity-name="ProdCatalogRole"/> >> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >> - <find-by-primary-key entity-name="ProdCatalogRole" >> map="lookupPKMap" value-field="lookedUpValue"/> >> - <set-nonpk-fields map="parameters" >> value-field="lookedUpValue"/> >> - <store-value value-field="lookedUpValue"/> >> - </simple-method> >> - <simple-method method-name="removeProdCatalogFromParty" >> short-description="Remove ProdCatalog From Party"> >> - <make-value value-field="lookupPKMap" >> entity-name="ProdCatalogRole"/> >> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >> - <find-by-primary-key entity-name="ProdCatalogRole" >> map="lookupPKMap" value-field="lookedUpValue"/> >> - <remove-value value-field="lookedUpValue"/> >> - </simple-method> >> <simple-method method-name="getAllCategories" >> short-description="get All categories" login-required="false"> >> <if-not-empty field="parameters.topCategory"> >> @@ -127,6 +41,7 @@ under the License. >> <log level="info" >> message="=========${category.productCategoryId}"/> >> </iterate --> >> </simple-method> >> + >> <simple-method method-name="getRelatedCategories" >> short-description="get All Related categories" login-required="false"> >> <set value="sequenceNum" field="orderByString"/> >> <field-to-list list="orderByStringList" >> field="orderByString"/> >> @@ -182,6 +97,7 @@ under the License. >> </iterate --> >> <field-to-result result-name="categories" field="categories"/> >> </simple-method> >> + >> <simple-method method-name="checkImageUrlForAllCategories" >> short-description="Check for image url exists or not for All >> categories" login-required="false"> >> <!-- Get all the categories from top category --> >> <set-service-fields to-map="categoryFindContext" >> service-name="getAllCategories" map="parameters"/> >> @@ -401,6 +317,7 @@ under the License. >> <field-to-result field="filesImageMap" >> result-name="filesImageMap"/> >> </if-not-empty> >> </simple-method> >> + >> <simple-method method-name="checkImageUrlForProduct" >> short-description="Check for image url exists or not for product" >> login-required="false"> >> <if-not-empty field="parameters.productId"> >> <set field="productFindContext.productId" >> from-field="parameters.productId"/> >> @@ -466,8 +383,8 @@ under the License. >> <!-- set-service-fields service-name="updateProduct" >> map-name="product" to-map-name="updateProductContext"/> >> <call-service service-name="updateProduct" >> in-map-name="updateProductContext" / --> >> </if-not-empty> >> - >> </simple-method> >> + >> <!-- get file image url and return Y or N --> >> <simple-method method-name="checkImageUrl" >> short-description="Check for image url exists or not" >> login-required="false"> >> <set field="imageUrl" from-field="parameters.imageUrl"/> >> @@ -530,7 +447,7 @@ under the License. >> <entity-and list="prodCatalogCategoryList" >> entity-name="ProdCatalogCategory" filter-by-date="false"> >> <field-map field-name="prodCatalogId" >> from-field="parameters.prodCatalogId"/> >> </entity-and> >> - >> + >> <!-- Get all categories --> >> <call-class-method method-name="newInstance" >> class-name="javolution.util.FastList" >> ret-field="parameters.productCategories"/> >> <iterate entry="prodCatalogCategory" >> list="prodCatalogCategoryList"> >> @@ -541,9 +458,8 @@ under the License. >> <set field="parameters.parentProductCategoryId" >> from-field="rootProductCategoryId"/> >> <call-simple-method >> method-name="createMissingCategoryAltUrlInline"/> >> </iterate> >> - >> + >> <iterate entry="productCategoryList" >> list="parameters.productCategories"> >> - >> <!-- Create Product Category Alternative URLs --> >> <if-empty field="category"> >> <entity-condition >> list="productCategoryContentAndInfoList" >> entity-name="ProductCategoryContentAndInfo" filter-by-date="true" >> use-cache="true"> >> @@ -598,7 +514,7 @@ under the License. >> </else> >> </if-empty> >> </if-empty> >> - >> + >> <!-- Create Product Alternative URLs --> >> <if-empty field="product"> >> <entity-condition list="productCategoryMemberList" >> entity-name="ProductCategoryMember" filter-by-date="true" >> use-cache="true"> >> @@ -659,6 +575,7 @@ under the License. >> <field-to-result field="categoriesUpdated" >> result-name="categoriesUpdated"/> >> <field-to-result field="productsUpdated" >> result-name="productsUpdated"/> >> </simple-method> >> + >> <simple-method method-name="createMissingCategoryAltUrlInline" >> short-description="create missing category alternative inline"> >> <entity-and list="productCategoryRollups" >> entity-name="ProductCategoryRollup" filter-by-date="true"> >> <field-map field-name="parentProductCategoryId" >> from-field="parameters.parentProductCategoryId"/> >> @@ -669,7 +586,6 @@ under the License. >> <field-map field-name="productCategoryId" >> from-field="productCategoryRollup.productCategoryId"/> >> </entity-one> >> <field-to-list list="parameters.productCategories" >> field="productCategory"/> >> - >> <!-- find rollup product categories --> >> <set field="parameters.parentProductCategoryId" >> from-field="productCategoryRollup.productCategoryId"/> >> <call-simple-method >> method-name="createMissingCategoryAltUrlInline"/> >> >> Modified: ofbiz/trunk/applications/product/servicedef/services.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >> ============================================================================== >> >> --- ofbiz/trunk/applications/product/servicedef/services.xml (original) >> +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Sep >> 30 11:59:29 2014 >> @@ -624,69 +624,60 @@ under the License. >> <!-- ======================================== --> >> <!-- Product Catalog Services --> >> <!-- ======================================== --> >> - <service name="createProdCatalog" >> default-entity-name="ProdCatalog" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="createProdCatalog" auth="true"> >> + <service name="createProdCatalog" >> default-entity-name="ProdCatalog" engine="entity-auto" >> invoke="create" auth="true"> >> <description>Create a ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="CREATE"/> >> <auto-attributes include="pk" mode="INOUT" optional="true"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="catalogName" optional="false"/> >> </service> >> - <service name="updateProdCatalog" >> default-entity-name="ProdCatalog" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="updateProdCatalog" auth="true"> >> + <service name="updateProdCatalog" >> default-entity-name="ProdCatalog" engine="entity-auto" >> invoke="update" auth="true"> >> <description>Update an ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="UPDATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="catalogName" optional="false"/> >> </service> >> - <service name="deleteProdCatalog" >> default-entity-name="ProdCatalog" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="deleteProdCatalog" auth="true"> >> + <service name="deleteProdCatalog" >> default-entity-name="ProdCatalog" engine="entity-auto" >> invoke="delete" auth="true"> >> <description>Delete an ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="DELETE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> </service> >> - <service name="addProductCategoryToProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="addProductCategoryToProdCatalog" auth="true"> >> + <service name="addProductCategoryToProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="entity-auto" >> invoke="create" auth="true"> >> <description>Add ProductCategory To ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="CREATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="fromDate" optional="true"/> >> </service> >> - <service name="updateProductCategoryToProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="updateProductCategoryToProdCatalog" auth="true"> >> + <service name="updateProductCategoryToProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="entity-auto" >> invoke="update" auth="true"> >> <description>Add ProductCategory To ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="UPDATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="prodCatalogCategoryTypeId" optional="false"/> >> </service> >> - <service name="removeProductCategoryFromProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="removeProductCategoryFromProdCatalog" auth="true"> >> + <service name="removeProductCategoryFromProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="entity-auto" >> invoke="delete" auth="true"> >> <description>Remove ProductCategory From >> ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="DELETE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> </service> >> - <service name="addProdCatalogToParty" >> default-entity-name="ProdCatalogRole" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="addProdCatalogToParty" auth="true"> >> + <service name="addProdCatalogToParty" >> default-entity-name="ProdCatalogRole" engine="entity-auto" >> invoke="create" auth="true"> >> <description>Add ProdCatalog To Party</description> >> <permission-service >> service-name="prodCatalogToPartyPermissionCheck" main-action="CREATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="fromDate" optional="true"/> >> </service> >> - <service name="updateProdCatalogToParty" >> default-entity-name="ProdCatalogRole" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="updateProdCatalogToParty" auth="true"> >> + <service name="updateProdCatalogToParty" >> default-entity-name="ProdCatalogRole" engine="entity-auto" >> invoke="update" auth="true"> >> <description>Add ProdCatalog To Party</description> >> <permission-service >> service-name="prodCatalogToPartyPermissionCheck" main-action="UPDATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> </service> >> - <service name="removeProdCatalogFromParty" >> default-entity-name="ProdCatalogRole" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="removeProdCatalogFromParty" auth="true"> >> + <service name="removeProdCatalogFromParty" >> default-entity-name="ProdCatalogRole" engine="entity-auto" >> invoke="delete" auth="true"> >> <description>Remove ProdCatalog From Party</description> >> <permission-service >> service-name="prodCatalogToPartyPermissionCheck" main-action="DELETE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> >> >> |
Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
|
|
In reply to this post by Jacques Le Roux
Also, please put the revision number in the Jira issue. That helps
others doing research on changes. Adrian Crum Sandglass Software www.sandglass-software.com On 9/30/2014 5:43 PM, Jacques Le Roux wrote: > Hi Nicolas, > > When possible please put a least the number of the Jira issue in commit, > it's easier to follow things (links are even easier ;) > > Thanks > > Jacques > > Le 30/09/2014 13:59, [hidden email] a écrit : >> Author: nmalin >> Date: Tue Sep 30 11:59:29 2014 >> New Revision: 1628405 >> >> URL: http://svn.apache.org/r1628405 >> Log: >> Convert the ProdCatalog CRUD simple service to entity-auto >> >> Modified: >> >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> >> ofbiz/trunk/applications/product/servicedef/services.xml >> >> Modified: >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >> >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> (original) >> +++ >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> Tue Sep 30 11:59:29 2014 >> @@ -20,92 +20,6 @@ under the License. >> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >> >> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> >> >> - <simple-method method-name="createProdCatalog" >> short-description="Create an ProdCatalog"> >> - <make-value value-field="newEntity" entity-name="ProdCatalog"/> >> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >> - >> - <if-empty field="parameters.prodCatalogId"> >> - <sequenced-id sequence-name="ProdCatalog" >> field="newEntity.prodCatalogId"/> >> - <else> >> - <set field="newEntity.prodCatalogId" >> from-field="parameters.prodCatalogId"/> >> - <check-id field="newEntity.prodCatalogId"/> >> - <check-errors/> >> - </else> >> - </if-empty> >> - <field-to-result field="newEntity.prodCatalogId" >> result-name="prodCatalogId"/> >> - >> - <create-value value-field="newEntity"/> >> - </simple-method> >> - <simple-method method-name="updateProdCatalog" >> short-description="Update an ProdCatalog"> >> - <entity-one entity-name="ProdCatalog" >> value-field="prodCatalog"/> >> - <set-nonpk-fields map="parameters" value-field="prodCatalog"/> >> - <store-value value-field="prodCatalog"/> >> - </simple-method> >> - <simple-method method-name="deleteProdCatalog" >> short-description="Delete an ProdCatalog"> >> - <entity-one entity-name="ProdCatalog" >> value-field="prodCatalog"/> >> - <remove-value value-field="prodCatalog"/> >> - </simple-method> >> - >> - <simple-method method-name="addProductCategoryToProdCatalog" >> short-description="Add Category To ProdCatalog"> >> - <!-- Check that the ProductCategory exists --> >> - <entity-one entity-name="ProductCategory" >> value-field="productCategory"/> >> - <if-empty field="productCategory"> >> - <add-error><fail-property resource="ProductUiLabels" >> property="ProductCategoryNotFoundForCategoryID"/></add-error> >> - </if-empty> >> - <check-errors/> >> - >> - <make-value value-field="newEntity" >> entity-name="ProdCatalogCategory"/> >> - <set-pk-fields map="parameters" value-field="newEntity"/> >> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >> - >> - <if-empty field="newEntity.fromDate"> >> - <now-timestamp field="nowTimestamp"/> >> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> >> - </if-empty> >> - >> - <create-value value-field="newEntity"/> >> - </simple-method> >> - <simple-method method-name="updateProductCategoryToProdCatalog" >> short-description="Remove ContactMech From ProdCatalog"> >> - >> - <make-value value-field="lookupPKMap" >> entity-name="ProdCatalogCategory"/> >> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >> - <find-by-primary-key entity-name="ProdCatalogCategory" >> map="lookupPKMap" value-field="prodCatalogCategory"/> >> - <set-nonpk-fields map="parameters" >> value-field="prodCatalogCategory"/> >> - <store-value value-field="prodCatalogCategory"/> >> - </simple-method> >> - <simple-method method-name="removeProductCategoryFromProdCatalog" >> short-description="Remove ContactMech From ProdCatalog"> >> - >> - <make-value value-field="lookupPKMap" >> entity-name="ProdCatalogCategory"/> >> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >> - <find-by-primary-key entity-name="ProdCatalogCategory" >> map="lookupPKMap" value-field="prodCatalogCategory"/> >> - <remove-value value-field="prodCatalogCategory"/> >> - </simple-method> >> - >> - <!-- Party and Catalog services --> >> - <simple-method method-name="addProdCatalogToParty" >> short-description="Add ProdCatalog To Party"> >> - <make-value value-field="newEntity" >> entity-name="ProdCatalogRole"/> >> - <set-pk-fields map="parameters" value-field="newEntity"/> >> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >> - >> - <if-empty field="newEntity.fromDate"> >> - <now-timestamp field="newEntity.fromDate"/> >> - </if-empty> >> - >> - <create-value value-field="newEntity"/> >> - </simple-method> >> - <simple-method method-name="updateProdCatalogToParty" >> short-description="Update ProdCatalog To Party"> >> - <make-value value-field="lookupPKMap" >> entity-name="ProdCatalogRole"/> >> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >> - <find-by-primary-key entity-name="ProdCatalogRole" >> map="lookupPKMap" value-field="lookedUpValue"/> >> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> >> - <store-value value-field="lookedUpValue"/> >> - </simple-method> >> - <simple-method method-name="removeProdCatalogFromParty" >> short-description="Remove ProdCatalog From Party"> >> - <make-value value-field="lookupPKMap" >> entity-name="ProdCatalogRole"/> >> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >> - <find-by-primary-key entity-name="ProdCatalogRole" >> map="lookupPKMap" value-field="lookedUpValue"/> >> - <remove-value value-field="lookedUpValue"/> >> - </simple-method> >> <simple-method method-name="getAllCategories" >> short-description="get All categories" login-required="false"> >> <if-not-empty field="parameters.topCategory"> >> @@ -127,6 +41,7 @@ under the License. >> <log level="info" >> message="=========${category.productCategoryId}"/> >> </iterate --> >> </simple-method> >> + >> <simple-method method-name="getRelatedCategories" >> short-description="get All Related categories" login-required="false"> >> <set value="sequenceNum" field="orderByString"/> >> <field-to-list list="orderByStringList" field="orderByString"/> >> @@ -182,6 +97,7 @@ under the License. >> </iterate --> >> <field-to-result result-name="categories" field="categories"/> >> </simple-method> >> + >> <simple-method method-name="checkImageUrlForAllCategories" >> short-description="Check for image url exists or not for All >> categories" login-required="false"> >> <!-- Get all the categories from top category --> >> <set-service-fields to-map="categoryFindContext" >> service-name="getAllCategories" map="parameters"/> >> @@ -401,6 +317,7 @@ under the License. >> <field-to-result field="filesImageMap" >> result-name="filesImageMap"/> >> </if-not-empty> >> </simple-method> >> + >> <simple-method method-name="checkImageUrlForProduct" >> short-description="Check for image url exists or not for product" >> login-required="false"> >> <if-not-empty field="parameters.productId"> >> <set field="productFindContext.productId" >> from-field="parameters.productId"/> >> @@ -466,8 +383,8 @@ under the License. >> <!-- set-service-fields service-name="updateProduct" >> map-name="product" to-map-name="updateProductContext"/> >> <call-service service-name="updateProduct" >> in-map-name="updateProductContext" / --> >> </if-not-empty> >> - >> </simple-method> >> + >> <!-- get file image url and return Y or N --> >> <simple-method method-name="checkImageUrl" >> short-description="Check for image url exists or not" >> login-required="false"> >> <set field="imageUrl" from-field="parameters.imageUrl"/> >> @@ -530,7 +447,7 @@ under the License. >> <entity-and list="prodCatalogCategoryList" >> entity-name="ProdCatalogCategory" filter-by-date="false"> >> <field-map field-name="prodCatalogId" >> from-field="parameters.prodCatalogId"/> >> </entity-and> >> - >> + >> <!-- Get all categories --> >> <call-class-method method-name="newInstance" >> class-name="javolution.util.FastList" >> ret-field="parameters.productCategories"/> >> <iterate entry="prodCatalogCategory" >> list="prodCatalogCategoryList"> >> @@ -541,9 +458,8 @@ under the License. >> <set field="parameters.parentProductCategoryId" >> from-field="rootProductCategoryId"/> >> <call-simple-method >> method-name="createMissingCategoryAltUrlInline"/> >> </iterate> >> - >> + >> <iterate entry="productCategoryList" >> list="parameters.productCategories"> >> - >> <!-- Create Product Category Alternative URLs --> >> <if-empty field="category"> >> <entity-condition >> list="productCategoryContentAndInfoList" >> entity-name="ProductCategoryContentAndInfo" filter-by-date="true" >> use-cache="true"> >> @@ -598,7 +514,7 @@ under the License. >> </else> >> </if-empty> >> </if-empty> >> - >> + >> <!-- Create Product Alternative URLs --> >> <if-empty field="product"> >> <entity-condition list="productCategoryMemberList" >> entity-name="ProductCategoryMember" filter-by-date="true" >> use-cache="true"> >> @@ -659,6 +575,7 @@ under the License. >> <field-to-result field="categoriesUpdated" >> result-name="categoriesUpdated"/> >> <field-to-result field="productsUpdated" >> result-name="productsUpdated"/> >> </simple-method> >> + >> <simple-method method-name="createMissingCategoryAltUrlInline" >> short-description="create missing category alternative inline"> >> <entity-and list="productCategoryRollups" >> entity-name="ProductCategoryRollup" filter-by-date="true"> >> <field-map field-name="parentProductCategoryId" >> from-field="parameters.parentProductCategoryId"/> >> @@ -669,7 +586,6 @@ under the License. >> <field-map field-name="productCategoryId" >> from-field="productCategoryRollup.productCategoryId"/> >> </entity-one> >> <field-to-list list="parameters.productCategories" >> field="productCategory"/> >> - >> <!-- find rollup product categories --> >> <set field="parameters.parentProductCategoryId" >> from-field="productCategoryRollup.productCategoryId"/> >> <call-simple-method >> method-name="createMissingCategoryAltUrlInline"/> >> >> Modified: ofbiz/trunk/applications/product/servicedef/services.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >> >> ============================================================================== >> >> --- ofbiz/trunk/applications/product/servicedef/services.xml (original) >> +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Sep >> 30 11:59:29 2014 >> @@ -624,69 +624,60 @@ under the License. >> <!-- ======================================== --> >> <!-- Product Catalog Services --> >> <!-- ======================================== --> >> - <service name="createProdCatalog" >> default-entity-name="ProdCatalog" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="createProdCatalog" auth="true"> >> + <service name="createProdCatalog" >> default-entity-name="ProdCatalog" engine="entity-auto" invoke="create" >> auth="true"> >> <description>Create a ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="CREATE"/> >> <auto-attributes include="pk" mode="INOUT" optional="true"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="catalogName" optional="false"/> >> </service> >> - <service name="updateProdCatalog" >> default-entity-name="ProdCatalog" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="updateProdCatalog" auth="true"> >> + <service name="updateProdCatalog" >> default-entity-name="ProdCatalog" engine="entity-auto" invoke="update" >> auth="true"> >> <description>Update an ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="UPDATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="catalogName" optional="false"/> >> </service> >> - <service name="deleteProdCatalog" >> default-entity-name="ProdCatalog" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="deleteProdCatalog" auth="true"> >> + <service name="deleteProdCatalog" >> default-entity-name="ProdCatalog" engine="entity-auto" invoke="delete" >> auth="true"> >> <description>Delete an ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="DELETE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> </service> >> - <service name="addProductCategoryToProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="addProductCategoryToProdCatalog" auth="true"> >> + <service name="addProductCategoryToProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="entity-auto" >> invoke="create" auth="true"> >> <description>Add ProductCategory To ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="CREATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="fromDate" optional="true"/> >> </service> >> - <service name="updateProductCategoryToProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="updateProductCategoryToProdCatalog" auth="true"> >> + <service name="updateProductCategoryToProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="entity-auto" >> invoke="update" auth="true"> >> <description>Add ProductCategory To ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="UPDATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="prodCatalogCategoryTypeId" optional="false"/> >> </service> >> - <service name="removeProductCategoryFromProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="removeProductCategoryFromProdCatalog" auth="true"> >> + <service name="removeProductCategoryFromProdCatalog" >> default-entity-name="ProdCatalogCategory" engine="entity-auto" >> invoke="delete" auth="true"> >> <description>Remove ProductCategory From >> ProdCatalog</description> >> <permission-service service-name="catalogPermissionCheck" >> main-action="DELETE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> </service> >> - <service name="addProdCatalogToParty" >> default-entity-name="ProdCatalogRole" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="addProdCatalogToParty" auth="true"> >> + <service name="addProdCatalogToParty" >> default-entity-name="ProdCatalogRole" engine="entity-auto" >> invoke="create" auth="true"> >> <description>Add ProdCatalog To Party</description> >> <permission-service >> service-name="prodCatalogToPartyPermissionCheck" main-action="CREATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> <override name="fromDate" optional="true"/> >> </service> >> - <service name="updateProdCatalogToParty" >> default-entity-name="ProdCatalogRole" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="updateProdCatalogToParty" auth="true"> >> + <service name="updateProdCatalogToParty" >> default-entity-name="ProdCatalogRole" engine="entity-auto" >> invoke="update" auth="true"> >> <description>Add ProdCatalog To Party</description> >> <permission-service >> service-name="prodCatalogToPartyPermissionCheck" main-action="UPDATE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> <auto-attributes include="nonpk" mode="IN" optional="true"/> >> </service> >> - <service name="removeProdCatalogFromParty" >> default-entity-name="ProdCatalogRole" engine="simple" >> - >> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >> invoke="removeProdCatalogFromParty" auth="true"> >> + <service name="removeProdCatalogFromParty" >> default-entity-name="ProdCatalogRole" engine="entity-auto" >> invoke="delete" auth="true"> >> <description>Remove ProdCatalog From Party</description> >> <permission-service >> service-name="prodCatalogToPartyPermissionCheck" main-action="DELETE"/> >> <auto-attributes include="pk" mode="IN" optional="false"/> >> >> >> |
Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
|
Administrator
|
In reply to this post by Nicolas Malin-2
Le 30/09/2014 23:19, Nicolas Malin a écrit : > Ho, sorry Jacques, > > I misunderstood this : > "Also, not everone knows how jira works. Or confluence. Or AutoConfigMaintenceWidgetApplication. What you may thing as a sensible > cross-reference(OFBIZ-####, debbugs ####) may mean nothing to the person reading your changelog." > (https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Committers+Roles+and+Responsibilities) > > I read and understood "do not set issue reference", but I totally wrong. It's more "do not issue reference only !". I did not find what you are referring too, only <<3) The commit log must identify the name of the contributor and, if relevant, the JIRA issue for it.>> Anyway it's fine since you got it ;) Jacques > Thanks for this remark, I will correct my commit's comment the next time. > > Nicolas > > Le 30/09/2014 18:43, Jacques Le Roux a écrit : >> Hi Nicolas, >> >> When possible please put a least the number of the Jira issue in commit, it's easier to follow things (links are even easier ;) >> >> Thanks >> >> Jacques >> >> Le 30/09/2014 13:59, [hidden email] a écrit : >>> Author: nmalin >>> Date: Tue Sep 30 11:59:29 2014 >>> New Revision: 1628405 >>> >>> URL: http://svn.apache.org/r1628405 >>> Log: >>> Convert the ProdCatalog CRUD simple service to entity-auto >>> >>> Modified: >>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>> ofbiz/trunk/applications/product/servicedef/services.xml >>> >>> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>> ============================================================================== >>> --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) >>> +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Sep 30 11:59:29 2014 >>> @@ -20,92 +20,6 @@ under the License. >>> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> >>> - <simple-method method-name="createProdCatalog" short-description="Create an ProdCatalog"> >>> - <make-value value-field="newEntity" entity-name="ProdCatalog"/> >>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>> - >>> - <if-empty field="parameters.prodCatalogId"> >>> - <sequenced-id sequence-name="ProdCatalog" field="newEntity.prodCatalogId"/> >>> - <else> >>> - <set field="newEntity.prodCatalogId" from-field="parameters.prodCatalogId"/> >>> - <check-id field="newEntity.prodCatalogId"/> >>> - <check-errors/> >>> - </else> >>> - </if-empty> >>> - <field-to-result field="newEntity.prodCatalogId" result-name="prodCatalogId"/> >>> - >>> - <create-value value-field="newEntity"/> >>> - </simple-method> >>> - <simple-method method-name="updateProdCatalog" short-description="Update an ProdCatalog"> >>> - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> >>> - <set-nonpk-fields map="parameters" value-field="prodCatalog"/> >>> - <store-value value-field="prodCatalog"/> >>> - </simple-method> >>> - <simple-method method-name="deleteProdCatalog" short-description="Delete an ProdCatalog"> >>> - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> >>> - <remove-value value-field="prodCatalog"/> >>> - </simple-method> >>> - >>> - <simple-method method-name="addProductCategoryToProdCatalog" short-description="Add Category To ProdCatalog"> >>> - <!-- Check that the ProductCategory exists --> >>> - <entity-one entity-name="ProductCategory" value-field="productCategory"/> >>> - <if-empty field="productCategory"> >>> - <add-error><fail-property resource="ProductUiLabels" property="ProductCategoryNotFoundForCategoryID"/></add-error> >>> - </if-empty> >>> - <check-errors/> >>> - >>> - <make-value value-field="newEntity" entity-name="ProdCatalogCategory"/> >>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>> - >>> - <if-empty field="newEntity.fromDate"> >>> - <now-timestamp field="nowTimestamp"/> >>> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> >>> - </if-empty> >>> - >>> - <create-value value-field="newEntity"/> >>> - </simple-method> >>> - <simple-method method-name="updateProductCategoryToProdCatalog" short-description="Remove ContactMech From ProdCatalog"> >>> - >>> - <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> >>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>> - <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/> >>> - <set-nonpk-fields map="parameters" value-field="prodCatalogCategory"/> >>> - <store-value value-field="prodCatalogCategory"/> >>> - </simple-method> >>> - <simple-method method-name="removeProductCategoryFromProdCatalog" short-description="Remove ContactMech From ProdCatalog"> >>> - >>> - <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> >>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>> - <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/> >>> - <remove-value value-field="prodCatalogCategory"/> >>> - </simple-method> >>> - >>> - <!-- Party and Catalog services --> >>> - <simple-method method-name="addProdCatalogToParty" short-description="Add ProdCatalog To Party"> >>> - <make-value value-field="newEntity" entity-name="ProdCatalogRole"/> >>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>> - >>> - <if-empty field="newEntity.fromDate"> >>> - <now-timestamp field="newEntity.fromDate"/> >>> - </if-empty> >>> - >>> - <create-value value-field="newEntity"/> >>> - </simple-method> >>> - <simple-method method-name="updateProdCatalogToParty" short-description="Update ProdCatalog To Party"> >>> - <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/> >>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>> - <find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/> >>> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> >>> - <store-value value-field="lookedUpValue"/> >>> - </simple-method> >>> - <simple-method method-name="removeProdCatalogFromParty" short-description="Remove ProdCatalog From Party"> >>> - <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/> >>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>> - <find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/> >>> - <remove-value value-field="lookedUpValue"/> >>> - </simple-method> >>> <simple-method method-name="getAllCategories" short-description="get All categories" login-required="false"> >>> <if-not-empty field="parameters.topCategory"> >>> @@ -127,6 +41,7 @@ under the License. >>> <log level="info" message="=========${category.productCategoryId}"/> >>> </iterate --> >>> </simple-method> >>> + >>> <simple-method method-name="getRelatedCategories" short-description="get All Related categories" login-required="false"> >>> <set value="sequenceNum" field="orderByString"/> >>> <field-to-list list="orderByStringList" field="orderByString"/> >>> @@ -182,6 +97,7 @@ under the License. >>> </iterate --> >>> <field-to-result result-name="categories" field="categories"/> >>> </simple-method> >>> + >>> <simple-method method-name="checkImageUrlForAllCategories" short-description="Check for image url exists or not for All categories" >>> login-required="false"> >>> <!-- Get all the categories from top category --> >>> <set-service-fields to-map="categoryFindContext" service-name="getAllCategories" map="parameters"/> >>> @@ -401,6 +317,7 @@ under the License. >>> <field-to-result field="filesImageMap" result-name="filesImageMap"/> >>> </if-not-empty> >>> </simple-method> >>> + >>> <simple-method method-name="checkImageUrlForProduct" short-description="Check for image url exists or not for product" login-required="false"> >>> <if-not-empty field="parameters.productId"> >>> <set field="productFindContext.productId" from-field="parameters.productId"/> >>> @@ -466,8 +383,8 @@ under the License. >>> <!-- set-service-fields service-name="updateProduct" map-name="product" to-map-name="updateProductContext"/> >>> <call-service service-name="updateProduct" in-map-name="updateProductContext" / --> >>> </if-not-empty> >>> - >>> </simple-method> >>> + >>> <!-- get file image url and return Y or N --> >>> <simple-method method-name="checkImageUrl" short-description="Check for image url exists or not" login-required="false"> >>> <set field="imageUrl" from-field="parameters.imageUrl"/> >>> @@ -530,7 +447,7 @@ under the License. >>> <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false"> >>> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> >>> </entity-and> >>> - >>> + >>> <!-- Get all categories --> >>> <call-class-method method-name="newInstance" class-name="javolution.util.FastList" ret-field="parameters.productCategories"/> >>> <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList"> >>> @@ -541,9 +458,8 @@ under the License. >>> <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/> >>> <call-simple-method method-name="createMissingCategoryAltUrlInline"/> >>> </iterate> >>> - >>> + >>> <iterate entry="productCategoryList" list="parameters.productCategories"> >>> - >>> <!-- Create Product Category Alternative URLs --> >>> <if-empty field="category"> >>> <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" >>> use-cache="true"> >>> @@ -598,7 +514,7 @@ under the License. >>> </else> >>> </if-empty> >>> </if-empty> >>> - >>> + >>> <!-- Create Product Alternative URLs --> >>> <if-empty field="product"> >>> <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true"> >>> @@ -659,6 +575,7 @@ under the License. >>> <field-to-result field="categoriesUpdated" result-name="categoriesUpdated"/> >>> <field-to-result field="productsUpdated" result-name="productsUpdated"/> >>> </simple-method> >>> + >>> <simple-method method-name="createMissingCategoryAltUrlInline" short-description="create missing category alternative inline"> >>> <entity-and list="productCategoryRollups" entity-name="ProductCategoryRollup" filter-by-date="true"> >>> <field-map field-name="parentProductCategoryId" from-field="parameters.parentProductCategoryId"/> >>> @@ -669,7 +586,6 @@ under the License. >>> <field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/> >>> </entity-one> >>> <field-to-list list="parameters.productCategories" field="productCategory"/> >>> - >>> <!-- find rollup product categories --> >>> <set field="parameters.parentProductCategoryId" from-field="productCategoryRollup.productCategoryId"/> >>> <call-simple-method method-name="createMissingCategoryAltUrlInline"/> >>> >>> Modified: ofbiz/trunk/applications/product/servicedef/services.xml >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>> ============================================================================== >>> --- ofbiz/trunk/applications/product/servicedef/services.xml (original) >>> +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Sep 30 11:59:29 2014 >>> @@ -624,69 +624,60 @@ under the License. >>> <!-- ======================================== --> >>> <!-- Product Catalog Services --> >>> <!-- ======================================== --> >>> - <service name="createProdCatalog" default-entity-name="ProdCatalog" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="createProdCatalog" auth="true"> >>> + <service name="createProdCatalog" default-entity-name="ProdCatalog" engine="entity-auto" invoke="create" auth="true"> >>> <description>Create a ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" main-action="CREATE"/> >>> <auto-attributes include="pk" mode="INOUT" optional="true"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="catalogName" optional="false"/> >>> </service> >>> - <service name="updateProdCatalog" default-entity-name="ProdCatalog" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="updateProdCatalog" auth="true"> >>> + <service name="updateProdCatalog" default-entity-name="ProdCatalog" engine="entity-auto" invoke="update" auth="true"> >>> <description>Update an ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" main-action="UPDATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="catalogName" optional="false"/> >>> </service> >>> - <service name="deleteProdCatalog" default-entity-name="ProdCatalog" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="deleteProdCatalog" auth="true"> >>> + <service name="deleteProdCatalog" default-entity-name="ProdCatalog" engine="entity-auto" invoke="delete" auth="true"> >>> <description>Delete an ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" main-action="DELETE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> </service> >>> - <service name="addProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="addProductCategoryToProdCatalog" auth="true"> >>> + <service name="addProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="entity-auto" invoke="create" auth="true"> >>> <description>Add ProductCategory To ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" main-action="CREATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="fromDate" optional="true"/> >>> </service> >>> - <service name="updateProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="updateProductCategoryToProdCatalog" auth="true"> >>> + <service name="updateProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="entity-auto" invoke="update" auth="true"> >>> <description>Add ProductCategory To ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" main-action="UPDATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="prodCatalogCategoryTypeId" optional="false"/> >>> </service> >>> - <service name="removeProductCategoryFromProdCatalog" default-entity-name="ProdCatalogCategory" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="removeProductCategoryFromProdCatalog" auth="true"> >>> + <service name="removeProductCategoryFromProdCatalog" default-entity-name="ProdCatalogCategory" engine="entity-auto" invoke="delete" auth="true"> >>> <description>Remove ProductCategory From ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" main-action="DELETE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> </service> >>> - <service name="addProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="addProdCatalogToParty" auth="true"> >>> + <service name="addProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="entity-auto" invoke="create" auth="true"> >>> <description>Add ProdCatalog To Party</description> >>> <permission-service service-name="prodCatalogToPartyPermissionCheck" main-action="CREATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="fromDate" optional="true"/> >>> </service> >>> - <service name="updateProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="updateProdCatalogToParty" auth="true"> >>> + <service name="updateProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="entity-auto" invoke="update" auth="true"> >>> <description>Add ProdCatalog To Party</description> >>> <permission-service service-name="prodCatalogToPartyPermissionCheck" main-action="UPDATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> </service> >>> - <service name="removeProdCatalogFromParty" default-entity-name="ProdCatalogRole" engine="simple" >>> - location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="removeProdCatalogFromParty" auth="true"> >>> + <service name="removeProdCatalogFromParty" default-entity-name="ProdCatalogRole" engine="entity-auto" invoke="delete" auth="true"> >>> <description>Remove ProdCatalog From Party</description> >>> <permission-service service-name="prodCatalogToPartyPermissionCheck" main-action="DELETE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> >>> >>> > > > |
Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
|
Administrator
|
In reply to this post by Adrian Crum-3
Thanks Adrian,
I would like everyone to do that... Jacques Le 01/10/2014 02:01, Adrian Crum a écrit : > Also, please put the revision number in the Jira issue. That helps others doing research on changes. > > Adrian Crum > Sandglass Software > www.sandglass-software.com > > On 9/30/2014 5:43 PM, Jacques Le Roux wrote: >> Hi Nicolas, >> >> When possible please put a least the number of the Jira issue in commit, >> it's easier to follow things (links are even easier ;) >> >> Thanks >> >> Jacques >> >> Le 30/09/2014 13:59, [hidden email] a écrit : >>> Author: nmalin >>> Date: Tue Sep 30 11:59:29 2014 >>> New Revision: 1628405 >>> >>> URL: http://svn.apache.org/r1628405 >>> Log: >>> Convert the ProdCatalog CRUD simple service to entity-auto >>> >>> Modified: >>> >>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>> >>> ofbiz/trunk/applications/product/servicedef/services.xml >>> >>> Modified: >>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>> >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>> >>> >>> ============================================================================== >>> >>> --- >>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>> (original) >>> +++ >>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>> Tue Sep 30 11:59:29 2014 >>> @@ -20,92 +20,6 @@ under the License. >>> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >>> >>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> >>> >>> - <simple-method method-name="createProdCatalog" >>> short-description="Create an ProdCatalog"> >>> - <make-value value-field="newEntity" entity-name="ProdCatalog"/> >>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>> - >>> - <if-empty field="parameters.prodCatalogId"> >>> - <sequenced-id sequence-name="ProdCatalog" >>> field="newEntity.prodCatalogId"/> >>> - <else> >>> - <set field="newEntity.prodCatalogId" >>> from-field="parameters.prodCatalogId"/> >>> - <check-id field="newEntity.prodCatalogId"/> >>> - <check-errors/> >>> - </else> >>> - </if-empty> >>> - <field-to-result field="newEntity.prodCatalogId" >>> result-name="prodCatalogId"/> >>> - >>> - <create-value value-field="newEntity"/> >>> - </simple-method> >>> - <simple-method method-name="updateProdCatalog" >>> short-description="Update an ProdCatalog"> >>> - <entity-one entity-name="ProdCatalog" >>> value-field="prodCatalog"/> >>> - <set-nonpk-fields map="parameters" value-field="prodCatalog"/> >>> - <store-value value-field="prodCatalog"/> >>> - </simple-method> >>> - <simple-method method-name="deleteProdCatalog" >>> short-description="Delete an ProdCatalog"> >>> - <entity-one entity-name="ProdCatalog" >>> value-field="prodCatalog"/> >>> - <remove-value value-field="prodCatalog"/> >>> - </simple-method> >>> - >>> - <simple-method method-name="addProductCategoryToProdCatalog" >>> short-description="Add Category To ProdCatalog"> >>> - <!-- Check that the ProductCategory exists --> >>> - <entity-one entity-name="ProductCategory" >>> value-field="productCategory"/> >>> - <if-empty field="productCategory"> >>> - <add-error><fail-property resource="ProductUiLabels" >>> property="ProductCategoryNotFoundForCategoryID"/></add-error> >>> - </if-empty> >>> - <check-errors/> >>> - >>> - <make-value value-field="newEntity" >>> entity-name="ProdCatalogCategory"/> >>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>> - >>> - <if-empty field="newEntity.fromDate"> >>> - <now-timestamp field="nowTimestamp"/> >>> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> >>> - </if-empty> >>> - >>> - <create-value value-field="newEntity"/> >>> - </simple-method> >>> - <simple-method method-name="updateProductCategoryToProdCatalog" >>> short-description="Remove ContactMech From ProdCatalog"> >>> - >>> - <make-value value-field="lookupPKMap" >>> entity-name="ProdCatalogCategory"/> >>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>> - <find-by-primary-key entity-name="ProdCatalogCategory" >>> map="lookupPKMap" value-field="prodCatalogCategory"/> >>> - <set-nonpk-fields map="parameters" >>> value-field="prodCatalogCategory"/> >>> - <store-value value-field="prodCatalogCategory"/> >>> - </simple-method> >>> - <simple-method method-name="removeProductCategoryFromProdCatalog" >>> short-description="Remove ContactMech From ProdCatalog"> >>> - >>> - <make-value value-field="lookupPKMap" >>> entity-name="ProdCatalogCategory"/> >>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>> - <find-by-primary-key entity-name="ProdCatalogCategory" >>> map="lookupPKMap" value-field="prodCatalogCategory"/> >>> - <remove-value value-field="prodCatalogCategory"/> >>> - </simple-method> >>> - >>> - <!-- Party and Catalog services --> >>> - <simple-method method-name="addProdCatalogToParty" >>> short-description="Add ProdCatalog To Party"> >>> - <make-value value-field="newEntity" >>> entity-name="ProdCatalogRole"/> >>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>> - >>> - <if-empty field="newEntity.fromDate"> >>> - <now-timestamp field="newEntity.fromDate"/> >>> - </if-empty> >>> - >>> - <create-value value-field="newEntity"/> >>> - </simple-method> >>> - <simple-method method-name="updateProdCatalogToParty" >>> short-description="Update ProdCatalog To Party"> >>> - <make-value value-field="lookupPKMap" >>> entity-name="ProdCatalogRole"/> >>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>> - <find-by-primary-key entity-name="ProdCatalogRole" >>> map="lookupPKMap" value-field="lookedUpValue"/> >>> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> >>> - <store-value value-field="lookedUpValue"/> >>> - </simple-method> >>> - <simple-method method-name="removeProdCatalogFromParty" >>> short-description="Remove ProdCatalog From Party"> >>> - <make-value value-field="lookupPKMap" >>> entity-name="ProdCatalogRole"/> >>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>> - <find-by-primary-key entity-name="ProdCatalogRole" >>> map="lookupPKMap" value-field="lookedUpValue"/> >>> - <remove-value value-field="lookedUpValue"/> >>> - </simple-method> >>> <simple-method method-name="getAllCategories" >>> short-description="get All categories" login-required="false"> >>> <if-not-empty field="parameters.topCategory"> >>> @@ -127,6 +41,7 @@ under the License. >>> <log level="info" >>> message="=========${category.productCategoryId}"/> >>> </iterate --> >>> </simple-method> >>> + >>> <simple-method method-name="getRelatedCategories" >>> short-description="get All Related categories" login-required="false"> >>> <set value="sequenceNum" field="orderByString"/> >>> <field-to-list list="orderByStringList" field="orderByString"/> >>> @@ -182,6 +97,7 @@ under the License. >>> </iterate --> >>> <field-to-result result-name="categories" field="categories"/> >>> </simple-method> >>> + >>> <simple-method method-name="checkImageUrlForAllCategories" >>> short-description="Check for image url exists or not for All >>> categories" login-required="false"> >>> <!-- Get all the categories from top category --> >>> <set-service-fields to-map="categoryFindContext" >>> service-name="getAllCategories" map="parameters"/> >>> @@ -401,6 +317,7 @@ under the License. >>> <field-to-result field="filesImageMap" >>> result-name="filesImageMap"/> >>> </if-not-empty> >>> </simple-method> >>> + >>> <simple-method method-name="checkImageUrlForProduct" >>> short-description="Check for image url exists or not for product" >>> login-required="false"> >>> <if-not-empty field="parameters.productId"> >>> <set field="productFindContext.productId" >>> from-field="parameters.productId"/> >>> @@ -466,8 +383,8 @@ under the License. >>> <!-- set-service-fields service-name="updateProduct" >>> map-name="product" to-map-name="updateProductContext"/> >>> <call-service service-name="updateProduct" >>> in-map-name="updateProductContext" / --> >>> </if-not-empty> >>> - >>> </simple-method> >>> + >>> <!-- get file image url and return Y or N --> >>> <simple-method method-name="checkImageUrl" >>> short-description="Check for image url exists or not" >>> login-required="false"> >>> <set field="imageUrl" from-field="parameters.imageUrl"/> >>> @@ -530,7 +447,7 @@ under the License. >>> <entity-and list="prodCatalogCategoryList" >>> entity-name="ProdCatalogCategory" filter-by-date="false"> >>> <field-map field-name="prodCatalogId" >>> from-field="parameters.prodCatalogId"/> >>> </entity-and> >>> - >>> + >>> <!-- Get all categories --> >>> <call-class-method method-name="newInstance" >>> class-name="javolution.util.FastList" >>> ret-field="parameters.productCategories"/> >>> <iterate entry="prodCatalogCategory" >>> list="prodCatalogCategoryList"> >>> @@ -541,9 +458,8 @@ under the License. >>> <set field="parameters.parentProductCategoryId" >>> from-field="rootProductCategoryId"/> >>> <call-simple-method >>> method-name="createMissingCategoryAltUrlInline"/> >>> </iterate> >>> - >>> + >>> <iterate entry="productCategoryList" >>> list="parameters.productCategories"> >>> - >>> <!-- Create Product Category Alternative URLs --> >>> <if-empty field="category"> >>> <entity-condition >>> list="productCategoryContentAndInfoList" >>> entity-name="ProductCategoryContentAndInfo" filter-by-date="true" >>> use-cache="true"> >>> @@ -598,7 +514,7 @@ under the License. >>> </else> >>> </if-empty> >>> </if-empty> >>> - >>> + >>> <!-- Create Product Alternative URLs --> >>> <if-empty field="product"> >>> <entity-condition list="productCategoryMemberList" >>> entity-name="ProductCategoryMember" filter-by-date="true" >>> use-cache="true"> >>> @@ -659,6 +575,7 @@ under the License. >>> <field-to-result field="categoriesUpdated" >>> result-name="categoriesUpdated"/> >>> <field-to-result field="productsUpdated" >>> result-name="productsUpdated"/> >>> </simple-method> >>> + >>> <simple-method method-name="createMissingCategoryAltUrlInline" >>> short-description="create missing category alternative inline"> >>> <entity-and list="productCategoryRollups" >>> entity-name="ProductCategoryRollup" filter-by-date="true"> >>> <field-map field-name="parentProductCategoryId" >>> from-field="parameters.parentProductCategoryId"/> >>> @@ -669,7 +586,6 @@ under the License. >>> <field-map field-name="productCategoryId" >>> from-field="productCategoryRollup.productCategoryId"/> >>> </entity-one> >>> <field-to-list list="parameters.productCategories" >>> field="productCategory"/> >>> - >>> <!-- find rollup product categories --> >>> <set field="parameters.parentProductCategoryId" >>> from-field="productCategoryRollup.productCategoryId"/> >>> <call-simple-method >>> method-name="createMissingCategoryAltUrlInline"/> >>> >>> Modified: ofbiz/trunk/applications/product/servicedef/services.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/product/servicedef/services.xml (original) >>> +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Sep >>> 30 11:59:29 2014 >>> @@ -624,69 +624,60 @@ under the License. >>> <!-- ======================================== --> >>> <!-- Product Catalog Services --> >>> <!-- ======================================== --> >>> - <service name="createProdCatalog" >>> default-entity-name="ProdCatalog" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="createProdCatalog" auth="true"> >>> + <service name="createProdCatalog" >>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="create" >>> auth="true"> >>> <description>Create a ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" >>> main-action="CREATE"/> >>> <auto-attributes include="pk" mode="INOUT" optional="true"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="catalogName" optional="false"/> >>> </service> >>> - <service name="updateProdCatalog" >>> default-entity-name="ProdCatalog" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="updateProdCatalog" auth="true"> >>> + <service name="updateProdCatalog" >>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="update" >>> auth="true"> >>> <description>Update an ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" >>> main-action="UPDATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="catalogName" optional="false"/> >>> </service> >>> - <service name="deleteProdCatalog" >>> default-entity-name="ProdCatalog" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="deleteProdCatalog" auth="true"> >>> + <service name="deleteProdCatalog" >>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="delete" >>> auth="true"> >>> <description>Delete an ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" >>> main-action="DELETE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> </service> >>> - <service name="addProductCategoryToProdCatalog" >>> default-entity-name="ProdCatalogCategory" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="addProductCategoryToProdCatalog" auth="true"> >>> + <service name="addProductCategoryToProdCatalog" >>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>> invoke="create" auth="true"> >>> <description>Add ProductCategory To ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" >>> main-action="CREATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="fromDate" optional="true"/> >>> </service> >>> - <service name="updateProductCategoryToProdCatalog" >>> default-entity-name="ProdCatalogCategory" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="updateProductCategoryToProdCatalog" auth="true"> >>> + <service name="updateProductCategoryToProdCatalog" >>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>> invoke="update" auth="true"> >>> <description>Add ProductCategory To ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" >>> main-action="UPDATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="prodCatalogCategoryTypeId" optional="false"/> >>> </service> >>> - <service name="removeProductCategoryFromProdCatalog" >>> default-entity-name="ProdCatalogCategory" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="removeProductCategoryFromProdCatalog" auth="true"> >>> + <service name="removeProductCategoryFromProdCatalog" >>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>> invoke="delete" auth="true"> >>> <description>Remove ProductCategory From >>> ProdCatalog</description> >>> <permission-service service-name="catalogPermissionCheck" >>> main-action="DELETE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> </service> >>> - <service name="addProdCatalogToParty" >>> default-entity-name="ProdCatalogRole" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="addProdCatalogToParty" auth="true"> >>> + <service name="addProdCatalogToParty" >>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>> invoke="create" auth="true"> >>> <description>Add ProdCatalog To Party</description> >>> <permission-service >>> service-name="prodCatalogToPartyPermissionCheck" main-action="CREATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> <override name="fromDate" optional="true"/> >>> </service> >>> - <service name="updateProdCatalogToParty" >>> default-entity-name="ProdCatalogRole" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="updateProdCatalogToParty" auth="true"> >>> + <service name="updateProdCatalogToParty" >>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>> invoke="update" auth="true"> >>> <description>Add ProdCatalog To Party</description> >>> <permission-service >>> service-name="prodCatalogToPartyPermissionCheck" main-action="UPDATE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>> </service> >>> - <service name="removeProdCatalogFromParty" >>> default-entity-name="ProdCatalogRole" engine="simple" >>> - >>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>> invoke="removeProdCatalogFromParty" auth="true"> >>> + <service name="removeProdCatalogFromParty" >>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>> invoke="delete" auth="true"> >>> <description>Remove ProdCatalog From Party</description> >>> <permission-service >>> service-name="prodCatalogToPartyPermissionCheck" main-action="DELETE"/> >>> <auto-attributes include="pk" mode="IN" optional="false"/> >>> >>> >>> > |
Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
|
Administrator
|
If it's not in the https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Committers+Roles+and+Responsibilities I will add it as a best practice
Jacques Le 01/10/2014 11:45, Jacques Le Roux a écrit : > Thanks Adrian, > > I would like everyone to do that... > > Jacques > > Le 01/10/2014 02:01, Adrian Crum a écrit : >> Also, please put the revision number in the Jira issue. That helps others doing research on changes. >> >> Adrian Crum >> Sandglass Software >> www.sandglass-software.com >> >> On 9/30/2014 5:43 PM, Jacques Le Roux wrote: >>> Hi Nicolas, >>> >>> When possible please put a least the number of the Jira issue in commit, >>> it's easier to follow things (links are even easier ;) >>> >>> Thanks >>> >>> Jacques >>> >>> Le 30/09/2014 13:59, [hidden email] a écrit : >>>> Author: nmalin >>>> Date: Tue Sep 30 11:59:29 2014 >>>> New Revision: 1628405 >>>> >>>> URL: http://svn.apache.org/r1628405 >>>> Log: >>>> Convert the ProdCatalog CRUD simple service to entity-auto >>>> >>>> Modified: >>>> >>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>> >>>> ofbiz/trunk/applications/product/servicedef/services.xml >>>> >>>> Modified: >>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>> >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>>> >>>> >>>> ============================================================================== >>>> >>>> --- >>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>> (original) >>>> +++ >>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>> Tue Sep 30 11:59:29 2014 >>>> @@ -20,92 +20,6 @@ under the License. >>>> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >>>> >>>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> >>>> >>>> - <simple-method method-name="createProdCatalog" >>>> short-description="Create an ProdCatalog"> >>>> - <make-value value-field="newEntity" entity-name="ProdCatalog"/> >>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>> - >>>> - <if-empty field="parameters.prodCatalogId"> >>>> - <sequenced-id sequence-name="ProdCatalog" >>>> field="newEntity.prodCatalogId"/> >>>> - <else> >>>> - <set field="newEntity.prodCatalogId" >>>> from-field="parameters.prodCatalogId"/> >>>> - <check-id field="newEntity.prodCatalogId"/> >>>> - <check-errors/> >>>> - </else> >>>> - </if-empty> >>>> - <field-to-result field="newEntity.prodCatalogId" >>>> result-name="prodCatalogId"/> >>>> - >>>> - <create-value value-field="newEntity"/> >>>> - </simple-method> >>>> - <simple-method method-name="updateProdCatalog" >>>> short-description="Update an ProdCatalog"> >>>> - <entity-one entity-name="ProdCatalog" >>>> value-field="prodCatalog"/> >>>> - <set-nonpk-fields map="parameters" value-field="prodCatalog"/> >>>> - <store-value value-field="prodCatalog"/> >>>> - </simple-method> >>>> - <simple-method method-name="deleteProdCatalog" >>>> short-description="Delete an ProdCatalog"> >>>> - <entity-one entity-name="ProdCatalog" >>>> value-field="prodCatalog"/> >>>> - <remove-value value-field="prodCatalog"/> >>>> - </simple-method> >>>> - >>>> - <simple-method method-name="addProductCategoryToProdCatalog" >>>> short-description="Add Category To ProdCatalog"> >>>> - <!-- Check that the ProductCategory exists --> >>>> - <entity-one entity-name="ProductCategory" >>>> value-field="productCategory"/> >>>> - <if-empty field="productCategory"> >>>> - <add-error><fail-property resource="ProductUiLabels" >>>> property="ProductCategoryNotFoundForCategoryID"/></add-error> >>>> - </if-empty> >>>> - <check-errors/> >>>> - >>>> - <make-value value-field="newEntity" >>>> entity-name="ProdCatalogCategory"/> >>>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>> - >>>> - <if-empty field="newEntity.fromDate"> >>>> - <now-timestamp field="nowTimestamp"/> >>>> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> >>>> - </if-empty> >>>> - >>>> - <create-value value-field="newEntity"/> >>>> - </simple-method> >>>> - <simple-method method-name="updateProductCategoryToProdCatalog" >>>> short-description="Remove ContactMech From ProdCatalog"> >>>> - >>>> - <make-value value-field="lookupPKMap" >>>> entity-name="ProdCatalogCategory"/> >>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>> - <find-by-primary-key entity-name="ProdCatalogCategory" >>>> map="lookupPKMap" value-field="prodCatalogCategory"/> >>>> - <set-nonpk-fields map="parameters" >>>> value-field="prodCatalogCategory"/> >>>> - <store-value value-field="prodCatalogCategory"/> >>>> - </simple-method> >>>> - <simple-method method-name="removeProductCategoryFromProdCatalog" >>>> short-description="Remove ContactMech From ProdCatalog"> >>>> - >>>> - <make-value value-field="lookupPKMap" >>>> entity-name="ProdCatalogCategory"/> >>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>> - <find-by-primary-key entity-name="ProdCatalogCategory" >>>> map="lookupPKMap" value-field="prodCatalogCategory"/> >>>> - <remove-value value-field="prodCatalogCategory"/> >>>> - </simple-method> >>>> - >>>> - <!-- Party and Catalog services --> >>>> - <simple-method method-name="addProdCatalogToParty" >>>> short-description="Add ProdCatalog To Party"> >>>> - <make-value value-field="newEntity" >>>> entity-name="ProdCatalogRole"/> >>>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>> - >>>> - <if-empty field="newEntity.fromDate"> >>>> - <now-timestamp field="newEntity.fromDate"/> >>>> - </if-empty> >>>> - >>>> - <create-value value-field="newEntity"/> >>>> - </simple-method> >>>> - <simple-method method-name="updateProdCatalogToParty" >>>> short-description="Update ProdCatalog To Party"> >>>> - <make-value value-field="lookupPKMap" >>>> entity-name="ProdCatalogRole"/> >>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>> - <find-by-primary-key entity-name="ProdCatalogRole" >>>> map="lookupPKMap" value-field="lookedUpValue"/> >>>> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> >>>> - <store-value value-field="lookedUpValue"/> >>>> - </simple-method> >>>> - <simple-method method-name="removeProdCatalogFromParty" >>>> short-description="Remove ProdCatalog From Party"> >>>> - <make-value value-field="lookupPKMap" >>>> entity-name="ProdCatalogRole"/> >>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>> - <find-by-primary-key entity-name="ProdCatalogRole" >>>> map="lookupPKMap" value-field="lookedUpValue"/> >>>> - <remove-value value-field="lookedUpValue"/> >>>> - </simple-method> >>>> <simple-method method-name="getAllCategories" >>>> short-description="get All categories" login-required="false"> >>>> <if-not-empty field="parameters.topCategory"> >>>> @@ -127,6 +41,7 @@ under the License. >>>> <log level="info" >>>> message="=========${category.productCategoryId}"/> >>>> </iterate --> >>>> </simple-method> >>>> + >>>> <simple-method method-name="getRelatedCategories" >>>> short-description="get All Related categories" login-required="false"> >>>> <set value="sequenceNum" field="orderByString"/> >>>> <field-to-list list="orderByStringList" field="orderByString"/> >>>> @@ -182,6 +97,7 @@ under the License. >>>> </iterate --> >>>> <field-to-result result-name="categories" field="categories"/> >>>> </simple-method> >>>> + >>>> <simple-method method-name="checkImageUrlForAllCategories" >>>> short-description="Check for image url exists or not for All >>>> categories" login-required="false"> >>>> <!-- Get all the categories from top category --> >>>> <set-service-fields to-map="categoryFindContext" >>>> service-name="getAllCategories" map="parameters"/> >>>> @@ -401,6 +317,7 @@ under the License. >>>> <field-to-result field="filesImageMap" >>>> result-name="filesImageMap"/> >>>> </if-not-empty> >>>> </simple-method> >>>> + >>>> <simple-method method-name="checkImageUrlForProduct" >>>> short-description="Check for image url exists or not for product" >>>> login-required="false"> >>>> <if-not-empty field="parameters.productId"> >>>> <set field="productFindContext.productId" >>>> from-field="parameters.productId"/> >>>> @@ -466,8 +383,8 @@ under the License. >>>> <!-- set-service-fields service-name="updateProduct" >>>> map-name="product" to-map-name="updateProductContext"/> >>>> <call-service service-name="updateProduct" >>>> in-map-name="updateProductContext" / --> >>>> </if-not-empty> >>>> - >>>> </simple-method> >>>> + >>>> <!-- get file image url and return Y or N --> >>>> <simple-method method-name="checkImageUrl" >>>> short-description="Check for image url exists or not" >>>> login-required="false"> >>>> <set field="imageUrl" from-field="parameters.imageUrl"/> >>>> @@ -530,7 +447,7 @@ under the License. >>>> <entity-and list="prodCatalogCategoryList" >>>> entity-name="ProdCatalogCategory" filter-by-date="false"> >>>> <field-map field-name="prodCatalogId" >>>> from-field="parameters.prodCatalogId"/> >>>> </entity-and> >>>> - >>>> + >>>> <!-- Get all categories --> >>>> <call-class-method method-name="newInstance" >>>> class-name="javolution.util.FastList" >>>> ret-field="parameters.productCategories"/> >>>> <iterate entry="prodCatalogCategory" >>>> list="prodCatalogCategoryList"> >>>> @@ -541,9 +458,8 @@ under the License. >>>> <set field="parameters.parentProductCategoryId" >>>> from-field="rootProductCategoryId"/> >>>> <call-simple-method >>>> method-name="createMissingCategoryAltUrlInline"/> >>>> </iterate> >>>> - >>>> + >>>> <iterate entry="productCategoryList" >>>> list="parameters.productCategories"> >>>> - >>>> <!-- Create Product Category Alternative URLs --> >>>> <if-empty field="category"> >>>> <entity-condition >>>> list="productCategoryContentAndInfoList" >>>> entity-name="ProductCategoryContentAndInfo" filter-by-date="true" >>>> use-cache="true"> >>>> @@ -598,7 +514,7 @@ under the License. >>>> </else> >>>> </if-empty> >>>> </if-empty> >>>> - >>>> + >>>> <!-- Create Product Alternative URLs --> >>>> <if-empty field="product"> >>>> <entity-condition list="productCategoryMemberList" >>>> entity-name="ProductCategoryMember" filter-by-date="true" >>>> use-cache="true"> >>>> @@ -659,6 +575,7 @@ under the License. >>>> <field-to-result field="categoriesUpdated" >>>> result-name="categoriesUpdated"/> >>>> <field-to-result field="productsUpdated" >>>> result-name="productsUpdated"/> >>>> </simple-method> >>>> + >>>> <simple-method method-name="createMissingCategoryAltUrlInline" >>>> short-description="create missing category alternative inline"> >>>> <entity-and list="productCategoryRollups" >>>> entity-name="ProductCategoryRollup" filter-by-date="true"> >>>> <field-map field-name="parentProductCategoryId" >>>> from-field="parameters.parentProductCategoryId"/> >>>> @@ -669,7 +586,6 @@ under the License. >>>> <field-map field-name="productCategoryId" >>>> from-field="productCategoryRollup.productCategoryId"/> >>>> </entity-one> >>>> <field-to-list list="parameters.productCategories" >>>> field="productCategory"/> >>>> - >>>> <!-- find rollup product categories --> >>>> <set field="parameters.parentProductCategoryId" >>>> from-field="productCategoryRollup.productCategoryId"/> >>>> <call-simple-method >>>> method-name="createMissingCategoryAltUrlInline"/> >>>> >>>> Modified: ofbiz/trunk/applications/product/servicedef/services.xml >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>>> >>>> ============================================================================== >>>> >>>> --- ofbiz/trunk/applications/product/servicedef/services.xml (original) >>>> +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Sep >>>> 30 11:59:29 2014 >>>> @@ -624,69 +624,60 @@ under the License. >>>> <!-- ======================================== --> >>>> <!-- Product Catalog Services --> >>>> <!-- ======================================== --> >>>> - <service name="createProdCatalog" >>>> default-entity-name="ProdCatalog" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="createProdCatalog" auth="true"> >>>> + <service name="createProdCatalog" >>>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="create" >>>> auth="true"> >>>> <description>Create a ProdCatalog</description> >>>> <permission-service service-name="catalogPermissionCheck" >>>> main-action="CREATE"/> >>>> <auto-attributes include="pk" mode="INOUT" optional="true"/> >>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>> <override name="catalogName" optional="false"/> >>>> </service> >>>> - <service name="updateProdCatalog" >>>> default-entity-name="ProdCatalog" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="updateProdCatalog" auth="true"> >>>> + <service name="updateProdCatalog" >>>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="update" >>>> auth="true"> >>>> <description>Update an ProdCatalog</description> >>>> <permission-service service-name="catalogPermissionCheck" >>>> main-action="UPDATE"/> >>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>> <override name="catalogName" optional="false"/> >>>> </service> >>>> - <service name="deleteProdCatalog" >>>> default-entity-name="ProdCatalog" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="deleteProdCatalog" auth="true"> >>>> + <service name="deleteProdCatalog" >>>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="delete" >>>> auth="true"> >>>> <description>Delete an ProdCatalog</description> >>>> <permission-service service-name="catalogPermissionCheck" >>>> main-action="DELETE"/> >>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>> </service> >>>> - <service name="addProductCategoryToProdCatalog" >>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="addProductCategoryToProdCatalog" auth="true"> >>>> + <service name="addProductCategoryToProdCatalog" >>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>> invoke="create" auth="true"> >>>> <description>Add ProductCategory To ProdCatalog</description> >>>> <permission-service service-name="catalogPermissionCheck" >>>> main-action="CREATE"/> >>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>> <override name="fromDate" optional="true"/> >>>> </service> >>>> - <service name="updateProductCategoryToProdCatalog" >>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="updateProductCategoryToProdCatalog" auth="true"> >>>> + <service name="updateProductCategoryToProdCatalog" >>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>> invoke="update" auth="true"> >>>> <description>Add ProductCategory To ProdCatalog</description> >>>> <permission-service service-name="catalogPermissionCheck" >>>> main-action="UPDATE"/> >>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>> <override name="prodCatalogCategoryTypeId" optional="false"/> >>>> </service> >>>> - <service name="removeProductCategoryFromProdCatalog" >>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="removeProductCategoryFromProdCatalog" auth="true"> >>>> + <service name="removeProductCategoryFromProdCatalog" >>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>> invoke="delete" auth="true"> >>>> <description>Remove ProductCategory From >>>> ProdCatalog</description> >>>> <permission-service service-name="catalogPermissionCheck" >>>> main-action="DELETE"/> >>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>> </service> >>>> - <service name="addProdCatalogToParty" >>>> default-entity-name="ProdCatalogRole" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="addProdCatalogToParty" auth="true"> >>>> + <service name="addProdCatalogToParty" >>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>> invoke="create" auth="true"> >>>> <description>Add ProdCatalog To Party</description> >>>> <permission-service >>>> service-name="prodCatalogToPartyPermissionCheck" main-action="CREATE"/> >>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>> <override name="fromDate" optional="true"/> >>>> </service> >>>> - <service name="updateProdCatalogToParty" >>>> default-entity-name="ProdCatalogRole" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="updateProdCatalogToParty" auth="true"> >>>> + <service name="updateProdCatalogToParty" >>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>> invoke="update" auth="true"> >>>> <description>Add ProdCatalog To Party</description> >>>> <permission-service >>>> service-name="prodCatalogToPartyPermissionCheck" main-action="UPDATE"/> >>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>> </service> >>>> - <service name="removeProdCatalogFromParty" >>>> default-entity-name="ProdCatalogRole" engine="simple" >>>> - >>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>> invoke="removeProdCatalogFromParty" auth="true"> >>>> + <service name="removeProdCatalogFromParty" >>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>> invoke="delete" auth="true"> >>>> <description>Remove ProdCatalog From Party</description> >>>> <permission-service >>>> service-name="prodCatalogToPartyPermissionCheck" main-action="DELETE"/> >>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>> >>>> >>>> >> > |
Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
|
|
+1, it's not present and it's important that we use the same rule :)
Le 01/10/2014 13:23, Jacques Le Roux a écrit : > If it's not in the > https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Committers+Roles+and+Responsibilities > I will add it as a best practice > > Jacques > > Le 01/10/2014 11:45, Jacques Le Roux a écrit : >> Thanks Adrian, >> >> I would like everyone to do that... >> >> Jacques >> >> Le 01/10/2014 02:01, Adrian Crum a écrit : >>> Also, please put the revision number in the Jira issue. That helps >>> others doing research on changes. >>> >>> Adrian Crum >>> Sandglass Software >>> www.sandglass-software.com >>> >>> On 9/30/2014 5:43 PM, Jacques Le Roux wrote: >>>> Hi Nicolas, >>>> >>>> When possible please put a least the number of the Jira issue in >>>> commit, >>>> it's easier to follow things (links are even easier ;) >>>> >>>> Thanks >>>> >>>> Jacques >>>> >>>> Le 30/09/2014 13:59, [hidden email] a écrit : >>>>> Author: nmalin >>>>> Date: Tue Sep 30 11:59:29 2014 >>>>> New Revision: 1628405 >>>>> >>>>> URL: http://svn.apache.org/r1628405 >>>>> Log: >>>>> Convert the ProdCatalog CRUD simple service to entity-auto >>>>> >>>>> Modified: >>>>> >>>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>>> >>>>> >>>>> ofbiz/trunk/applications/product/servicedef/services.xml >>>>> >>>>> Modified: >>>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>>> >>>>> >>>>> URL: >>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>>>> >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- >>>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>>> >>>>> (original) >>>>> +++ >>>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>>> >>>>> Tue Sep 30 11:59:29 2014 >>>>> @@ -20,92 +20,6 @@ under the License. >>>>> <simple-methods >>>>> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >>>>> >>>>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> >>>>> >>>>> >>>>> - <simple-method method-name="createProdCatalog" >>>>> short-description="Create an ProdCatalog"> >>>>> - <make-value value-field="newEntity" >>>>> entity-name="ProdCatalog"/> >>>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>>> - >>>>> - <if-empty field="parameters.prodCatalogId"> >>>>> - <sequenced-id sequence-name="ProdCatalog" >>>>> field="newEntity.prodCatalogId"/> >>>>> - <else> >>>>> - <set field="newEntity.prodCatalogId" >>>>> from-field="parameters.prodCatalogId"/> >>>>> - <check-id field="newEntity.prodCatalogId"/> >>>>> - <check-errors/> >>>>> - </else> >>>>> - </if-empty> >>>>> - <field-to-result field="newEntity.prodCatalogId" >>>>> result-name="prodCatalogId"/> >>>>> - >>>>> - <create-value value-field="newEntity"/> >>>>> - </simple-method> >>>>> - <simple-method method-name="updateProdCatalog" >>>>> short-description="Update an ProdCatalog"> >>>>> - <entity-one entity-name="ProdCatalog" >>>>> value-field="prodCatalog"/> >>>>> - <set-nonpk-fields map="parameters" >>>>> value-field="prodCatalog"/> >>>>> - <store-value value-field="prodCatalog"/> >>>>> - </simple-method> >>>>> - <simple-method method-name="deleteProdCatalog" >>>>> short-description="Delete an ProdCatalog"> >>>>> - <entity-one entity-name="ProdCatalog" >>>>> value-field="prodCatalog"/> >>>>> - <remove-value value-field="prodCatalog"/> >>>>> - </simple-method> >>>>> - >>>>> - <simple-method method-name="addProductCategoryToProdCatalog" >>>>> short-description="Add Category To ProdCatalog"> >>>>> - <!-- Check that the ProductCategory exists --> >>>>> - <entity-one entity-name="ProductCategory" >>>>> value-field="productCategory"/> >>>>> - <if-empty field="productCategory"> >>>>> - <add-error><fail-property resource="ProductUiLabels" >>>>> property="ProductCategoryNotFoundForCategoryID"/></add-error> >>>>> - </if-empty> >>>>> - <check-errors/> >>>>> - >>>>> - <make-value value-field="newEntity" >>>>> entity-name="ProdCatalogCategory"/> >>>>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>>> - >>>>> - <if-empty field="newEntity.fromDate"> >>>>> - <now-timestamp field="nowTimestamp"/> >>>>> - <set from-field="nowTimestamp" >>>>> field="newEntity.fromDate"/> >>>>> - </if-empty> >>>>> - >>>>> - <create-value value-field="newEntity"/> >>>>> - </simple-method> >>>>> - <simple-method method-name="updateProductCategoryToProdCatalog" >>>>> short-description="Remove ContactMech From ProdCatalog"> >>>>> - >>>>> - <make-value value-field="lookupPKMap" >>>>> entity-name="ProdCatalogCategory"/> >>>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>>> - <find-by-primary-key entity-name="ProdCatalogCategory" >>>>> map="lookupPKMap" value-field="prodCatalogCategory"/> >>>>> - <set-nonpk-fields map="parameters" >>>>> value-field="prodCatalogCategory"/> >>>>> - <store-value value-field="prodCatalogCategory"/> >>>>> - </simple-method> >>>>> - <simple-method >>>>> method-name="removeProductCategoryFromProdCatalog" >>>>> short-description="Remove ContactMech From ProdCatalog"> >>>>> - >>>>> - <make-value value-field="lookupPKMap" >>>>> entity-name="ProdCatalogCategory"/> >>>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>>> - <find-by-primary-key entity-name="ProdCatalogCategory" >>>>> map="lookupPKMap" value-field="prodCatalogCategory"/> >>>>> - <remove-value value-field="prodCatalogCategory"/> >>>>> - </simple-method> >>>>> - >>>>> - <!-- Party and Catalog services --> >>>>> - <simple-method method-name="addProdCatalogToParty" >>>>> short-description="Add ProdCatalog To Party"> >>>>> - <make-value value-field="newEntity" >>>>> entity-name="ProdCatalogRole"/> >>>>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>>> - >>>>> - <if-empty field="newEntity.fromDate"> >>>>> - <now-timestamp field="newEntity.fromDate"/> >>>>> - </if-empty> >>>>> - >>>>> - <create-value value-field="newEntity"/> >>>>> - </simple-method> >>>>> - <simple-method method-name="updateProdCatalogToParty" >>>>> short-description="Update ProdCatalog To Party"> >>>>> - <make-value value-field="lookupPKMap" >>>>> entity-name="ProdCatalogRole"/> >>>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>>> - <find-by-primary-key entity-name="ProdCatalogRole" >>>>> map="lookupPKMap" value-field="lookedUpValue"/> >>>>> - <set-nonpk-fields map="parameters" >>>>> value-field="lookedUpValue"/> >>>>> - <store-value value-field="lookedUpValue"/> >>>>> - </simple-method> >>>>> - <simple-method method-name="removeProdCatalogFromParty" >>>>> short-description="Remove ProdCatalog From Party"> >>>>> - <make-value value-field="lookupPKMap" >>>>> entity-name="ProdCatalogRole"/> >>>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>>> - <find-by-primary-key entity-name="ProdCatalogRole" >>>>> map="lookupPKMap" value-field="lookedUpValue"/> >>>>> - <remove-value value-field="lookedUpValue"/> >>>>> - </simple-method> >>>>> <simple-method method-name="getAllCategories" >>>>> short-description="get All categories" login-required="false"> >>>>> <if-not-empty field="parameters.topCategory"> >>>>> @@ -127,6 +41,7 @@ under the License. >>>>> <log level="info" >>>>> message="=========${category.productCategoryId}"/> >>>>> </iterate --> >>>>> </simple-method> >>>>> + >>>>> <simple-method method-name="getRelatedCategories" >>>>> short-description="get All Related categories" >>>>> login-required="false"> >>>>> <set value="sequenceNum" field="orderByString"/> >>>>> <field-to-list list="orderByStringList" >>>>> field="orderByString"/> >>>>> @@ -182,6 +97,7 @@ under the License. >>>>> </iterate --> >>>>> <field-to-result result-name="categories" >>>>> field="categories"/> >>>>> </simple-method> >>>>> + >>>>> <simple-method method-name="checkImageUrlForAllCategories" >>>>> short-description="Check for image url exists or not for All >>>>> categories" login-required="false"> >>>>> <!-- Get all the categories from top category --> >>>>> <set-service-fields to-map="categoryFindContext" >>>>> service-name="getAllCategories" map="parameters"/> >>>>> @@ -401,6 +317,7 @@ under the License. >>>>> <field-to-result field="filesImageMap" >>>>> result-name="filesImageMap"/> >>>>> </if-not-empty> >>>>> </simple-method> >>>>> + >>>>> <simple-method method-name="checkImageUrlForProduct" >>>>> short-description="Check for image url exists or not for product" >>>>> login-required="false"> >>>>> <if-not-empty field="parameters.productId"> >>>>> <set field="productFindContext.productId" >>>>> from-field="parameters.productId"/> >>>>> @@ -466,8 +383,8 @@ under the License. >>>>> <!-- set-service-fields service-name="updateProduct" >>>>> map-name="product" to-map-name="updateProductContext"/> >>>>> <call-service service-name="updateProduct" >>>>> in-map-name="updateProductContext" / --> >>>>> </if-not-empty> >>>>> - >>>>> </simple-method> >>>>> + >>>>> <!-- get file image url and return Y or N --> >>>>> <simple-method method-name="checkImageUrl" >>>>> short-description="Check for image url exists or not" >>>>> login-required="false"> >>>>> <set field="imageUrl" from-field="parameters.imageUrl"/> >>>>> @@ -530,7 +447,7 @@ under the License. >>>>> <entity-and list="prodCatalogCategoryList" >>>>> entity-name="ProdCatalogCategory" filter-by-date="false"> >>>>> <field-map field-name="prodCatalogId" >>>>> from-field="parameters.prodCatalogId"/> >>>>> </entity-and> >>>>> - >>>>> + >>>>> <!-- Get all categories --> >>>>> <call-class-method method-name="newInstance" >>>>> class-name="javolution.util.FastList" >>>>> ret-field="parameters.productCategories"/> >>>>> <iterate entry="prodCatalogCategory" >>>>> list="prodCatalogCategoryList"> >>>>> @@ -541,9 +458,8 @@ under the License. >>>>> <set field="parameters.parentProductCategoryId" >>>>> from-field="rootProductCategoryId"/> >>>>> <call-simple-method >>>>> method-name="createMissingCategoryAltUrlInline"/> >>>>> </iterate> >>>>> - >>>>> + >>>>> <iterate entry="productCategoryList" >>>>> list="parameters.productCategories"> >>>>> - >>>>> <!-- Create Product Category Alternative URLs --> >>>>> <if-empty field="category"> >>>>> <entity-condition >>>>> list="productCategoryContentAndInfoList" >>>>> entity-name="ProductCategoryContentAndInfo" filter-by-date="true" >>>>> use-cache="true"> >>>>> @@ -598,7 +514,7 @@ under the License. >>>>> </else> >>>>> </if-empty> >>>>> </if-empty> >>>>> - >>>>> + >>>>> <!-- Create Product Alternative URLs --> >>>>> <if-empty field="product"> >>>>> <entity-condition list="productCategoryMemberList" >>>>> entity-name="ProductCategoryMember" filter-by-date="true" >>>>> use-cache="true"> >>>>> @@ -659,6 +575,7 @@ under the License. >>>>> <field-to-result field="categoriesUpdated" >>>>> result-name="categoriesUpdated"/> >>>>> <field-to-result field="productsUpdated" >>>>> result-name="productsUpdated"/> >>>>> </simple-method> >>>>> + >>>>> <simple-method method-name="createMissingCategoryAltUrlInline" >>>>> short-description="create missing category alternative inline"> >>>>> <entity-and list="productCategoryRollups" >>>>> entity-name="ProductCategoryRollup" filter-by-date="true"> >>>>> <field-map field-name="parentProductCategoryId" >>>>> from-field="parameters.parentProductCategoryId"/> >>>>> @@ -669,7 +586,6 @@ under the License. >>>>> <field-map field-name="productCategoryId" >>>>> from-field="productCategoryRollup.productCategoryId"/> >>>>> </entity-one> >>>>> <field-to-list list="parameters.productCategories" >>>>> field="productCategory"/> >>>>> - >>>>> <!-- find rollup product categories --> >>>>> <set field="parameters.parentProductCategoryId" >>>>> from-field="productCategoryRollup.productCategoryId"/> >>>>> <call-simple-method >>>>> method-name="createMissingCategoryAltUrlInline"/> >>>>> >>>>> Modified: ofbiz/trunk/applications/product/servicedef/services.xml >>>>> URL: >>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>>>> >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- ofbiz/trunk/applications/product/servicedef/services.xml >>>>> (original) >>>>> +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Sep >>>>> 30 11:59:29 2014 >>>>> @@ -624,69 +624,60 @@ under the License. >>>>> <!-- ======================================== --> >>>>> <!-- Product Catalog Services --> >>>>> <!-- ======================================== --> >>>>> - <service name="createProdCatalog" >>>>> default-entity-name="ProdCatalog" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="createProdCatalog" auth="true"> >>>>> + <service name="createProdCatalog" >>>>> default-entity-name="ProdCatalog" engine="entity-auto" >>>>> invoke="create" >>>>> auth="true"> >>>>> <description>Create a ProdCatalog</description> >>>>> <permission-service service-name="catalogPermissionCheck" >>>>> main-action="CREATE"/> >>>>> <auto-attributes include="pk" mode="INOUT" >>>>> optional="true"/> >>>>> <auto-attributes include="nonpk" mode="IN" >>>>> optional="true"/> >>>>> <override name="catalogName" optional="false"/> >>>>> </service> >>>>> - <service name="updateProdCatalog" >>>>> default-entity-name="ProdCatalog" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="updateProdCatalog" auth="true"> >>>>> + <service name="updateProdCatalog" >>>>> default-entity-name="ProdCatalog" engine="entity-auto" >>>>> invoke="update" >>>>> auth="true"> >>>>> <description>Update an ProdCatalog</description> >>>>> <permission-service service-name="catalogPermissionCheck" >>>>> main-action="UPDATE"/> >>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>> <auto-attributes include="nonpk" mode="IN" >>>>> optional="true"/> >>>>> <override name="catalogName" optional="false"/> >>>>> </service> >>>>> - <service name="deleteProdCatalog" >>>>> default-entity-name="ProdCatalog" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="deleteProdCatalog" auth="true"> >>>>> + <service name="deleteProdCatalog" >>>>> default-entity-name="ProdCatalog" engine="entity-auto" >>>>> invoke="delete" >>>>> auth="true"> >>>>> <description>Delete an ProdCatalog</description> >>>>> <permission-service service-name="catalogPermissionCheck" >>>>> main-action="DELETE"/> >>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>> </service> >>>>> - <service name="addProductCategoryToProdCatalog" >>>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="addProductCategoryToProdCatalog" auth="true"> >>>>> + <service name="addProductCategoryToProdCatalog" >>>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>>> invoke="create" auth="true"> >>>>> <description>Add ProductCategory To >>>>> ProdCatalog</description> >>>>> <permission-service service-name="catalogPermissionCheck" >>>>> main-action="CREATE"/> >>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>> <auto-attributes include="nonpk" mode="IN" >>>>> optional="true"/> >>>>> <override name="fromDate" optional="true"/> >>>>> </service> >>>>> - <service name="updateProductCategoryToProdCatalog" >>>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="updateProductCategoryToProdCatalog" auth="true"> >>>>> + <service name="updateProductCategoryToProdCatalog" >>>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>>> invoke="update" auth="true"> >>>>> <description>Add ProductCategory To >>>>> ProdCatalog</description> >>>>> <permission-service service-name="catalogPermissionCheck" >>>>> main-action="UPDATE"/> >>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>> <auto-attributes include="nonpk" mode="IN" >>>>> optional="true"/> >>>>> <override name="prodCatalogCategoryTypeId" >>>>> optional="false"/> >>>>> </service> >>>>> - <service name="removeProductCategoryFromProdCatalog" >>>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="removeProductCategoryFromProdCatalog" auth="true"> >>>>> + <service name="removeProductCategoryFromProdCatalog" >>>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>>> invoke="delete" auth="true"> >>>>> <description>Remove ProductCategory From >>>>> ProdCatalog</description> >>>>> <permission-service service-name="catalogPermissionCheck" >>>>> main-action="DELETE"/> >>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>> </service> >>>>> - <service name="addProdCatalogToParty" >>>>> default-entity-name="ProdCatalogRole" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="addProdCatalogToParty" auth="true"> >>>>> + <service name="addProdCatalogToParty" >>>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>>> invoke="create" auth="true"> >>>>> <description>Add ProdCatalog To Party</description> >>>>> <permission-service >>>>> service-name="prodCatalogToPartyPermissionCheck" >>>>> main-action="CREATE"/> >>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>> <auto-attributes include="nonpk" mode="IN" >>>>> optional="true"/> >>>>> <override name="fromDate" optional="true"/> >>>>> </service> >>>>> - <service name="updateProdCatalogToParty" >>>>> default-entity-name="ProdCatalogRole" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="updateProdCatalogToParty" auth="true"> >>>>> + <service name="updateProdCatalogToParty" >>>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>>> invoke="update" auth="true"> >>>>> <description>Add ProdCatalog To Party</description> >>>>> <permission-service >>>>> service-name="prodCatalogToPartyPermissionCheck" >>>>> main-action="UPDATE"/> >>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>> <auto-attributes include="nonpk" mode="IN" >>>>> optional="true"/> >>>>> </service> >>>>> - <service name="removeProdCatalogFromParty" >>>>> default-entity-name="ProdCatalogRole" engine="simple" >>>>> - >>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>> >>>>> invoke="removeProdCatalogFromParty" auth="true"> >>>>> + <service name="removeProdCatalogFromParty" >>>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>>> invoke="delete" auth="true"> >>>>> <description>Remove ProdCatalog From Party</description> >>>>> <permission-service >>>>> service-name="prodCatalogToPartyPermissionCheck" >>>>> main-action="DELETE"/> >>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>> >>>>> >>>>> >>> >> |
Re: svn commit: r1628405 - in /ofbiz/trunk/applications/prod
|
Administrator
|
Thanks for confirmation Nicolas
Jacques Le 01/10/2014 13:50, Nicolas Malin a écrit : > +1, it's not present and it's important that we use the same rule :) > > Le 01/10/2014 13:23, Jacques Le Roux a écrit : >> If it's not in the https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Committers+Roles+and+Responsibilities I will add it as a best practice >> >> Jacques >> >> Le 01/10/2014 11:45, Jacques Le Roux a écrit : >>> Thanks Adrian, >>> >>> I would like everyone to do that... >>> >>> Jacques >>> >>> Le 01/10/2014 02:01, Adrian Crum a écrit : >>>> Also, please put the revision number in the Jira issue. That helps others doing research on changes. >>>> >>>> Adrian Crum >>>> Sandglass Software >>>> www.sandglass-software.com >>>> >>>> On 9/30/2014 5:43 PM, Jacques Le Roux wrote: >>>>> Hi Nicolas, >>>>> >>>>> When possible please put a least the number of the Jira issue in commit, >>>>> it's easier to follow things (links are even easier ;) >>>>> >>>>> Thanks >>>>> >>>>> Jacques >>>>> >>>>> Le 30/09/2014 13:59, [hidden email] a écrit : >>>>>> Author: nmalin >>>>>> Date: Tue Sep 30 11:59:29 2014 >>>>>> New Revision: 1628405 >>>>>> >>>>>> URL: http://svn.apache.org/r1628405 >>>>>> Log: >>>>>> Convert the ProdCatalog CRUD simple service to entity-auto >>>>>> >>>>>> Modified: >>>>>> >>>>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>>>> >>>>>> ofbiz/trunk/applications/product/servicedef/services.xml >>>>>> >>>>>> Modified: >>>>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>>>> >>>>>> URL: >>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>>>>> >>>>>> >>>>>> ============================================================================== >>>>>> >>>>>> --- >>>>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>>>> (original) >>>>>> +++ >>>>>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >>>>>> Tue Sep 30 11:59:29 2014 >>>>>> @@ -20,92 +20,6 @@ under the License. >>>>>> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >>>>>> >>>>>> xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> >>>>>> >>>>>> - <simple-method method-name="createProdCatalog" >>>>>> short-description="Create an ProdCatalog"> >>>>>> - <make-value value-field="newEntity" entity-name="ProdCatalog"/> >>>>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>>>> - >>>>>> - <if-empty field="parameters.prodCatalogId"> >>>>>> - <sequenced-id sequence-name="ProdCatalog" >>>>>> field="newEntity.prodCatalogId"/> >>>>>> - <else> >>>>>> - <set field="newEntity.prodCatalogId" >>>>>> from-field="parameters.prodCatalogId"/> >>>>>> - <check-id field="newEntity.prodCatalogId"/> >>>>>> - <check-errors/> >>>>>> - </else> >>>>>> - </if-empty> >>>>>> - <field-to-result field="newEntity.prodCatalogId" >>>>>> result-name="prodCatalogId"/> >>>>>> - >>>>>> - <create-value value-field="newEntity"/> >>>>>> - </simple-method> >>>>>> - <simple-method method-name="updateProdCatalog" >>>>>> short-description="Update an ProdCatalog"> >>>>>> - <entity-one entity-name="ProdCatalog" >>>>>> value-field="prodCatalog"/> >>>>>> - <set-nonpk-fields map="parameters" value-field="prodCatalog"/> >>>>>> - <store-value value-field="prodCatalog"/> >>>>>> - </simple-method> >>>>>> - <simple-method method-name="deleteProdCatalog" >>>>>> short-description="Delete an ProdCatalog"> >>>>>> - <entity-one entity-name="ProdCatalog" >>>>>> value-field="prodCatalog"/> >>>>>> - <remove-value value-field="prodCatalog"/> >>>>>> - </simple-method> >>>>>> - >>>>>> - <simple-method method-name="addProductCategoryToProdCatalog" >>>>>> short-description="Add Category To ProdCatalog"> >>>>>> - <!-- Check that the ProductCategory exists --> >>>>>> - <entity-one entity-name="ProductCategory" >>>>>> value-field="productCategory"/> >>>>>> - <if-empty field="productCategory"> >>>>>> - <add-error><fail-property resource="ProductUiLabels" >>>>>> property="ProductCategoryNotFoundForCategoryID"/></add-error> >>>>>> - </if-empty> >>>>>> - <check-errors/> >>>>>> - >>>>>> - <make-value value-field="newEntity" >>>>>> entity-name="ProdCatalogCategory"/> >>>>>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>>>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>>>> - >>>>>> - <if-empty field="newEntity.fromDate"> >>>>>> - <now-timestamp field="nowTimestamp"/> >>>>>> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> >>>>>> - </if-empty> >>>>>> - >>>>>> - <create-value value-field="newEntity"/> >>>>>> - </simple-method> >>>>>> - <simple-method method-name="updateProductCategoryToProdCatalog" >>>>>> short-description="Remove ContactMech From ProdCatalog"> >>>>>> - >>>>>> - <make-value value-field="lookupPKMap" >>>>>> entity-name="ProdCatalogCategory"/> >>>>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>>>> - <find-by-primary-key entity-name="ProdCatalogCategory" >>>>>> map="lookupPKMap" value-field="prodCatalogCategory"/> >>>>>> - <set-nonpk-fields map="parameters" >>>>>> value-field="prodCatalogCategory"/> >>>>>> - <store-value value-field="prodCatalogCategory"/> >>>>>> - </simple-method> >>>>>> - <simple-method method-name="removeProductCategoryFromProdCatalog" >>>>>> short-description="Remove ContactMech From ProdCatalog"> >>>>>> - >>>>>> - <make-value value-field="lookupPKMap" >>>>>> entity-name="ProdCatalogCategory"/> >>>>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>>>> - <find-by-primary-key entity-name="ProdCatalogCategory" >>>>>> map="lookupPKMap" value-field="prodCatalogCategory"/> >>>>>> - <remove-value value-field="prodCatalogCategory"/> >>>>>> - </simple-method> >>>>>> - >>>>>> - <!-- Party and Catalog services --> >>>>>> - <simple-method method-name="addProdCatalogToParty" >>>>>> short-description="Add ProdCatalog To Party"> >>>>>> - <make-value value-field="newEntity" >>>>>> entity-name="ProdCatalogRole"/> >>>>>> - <set-pk-fields map="parameters" value-field="newEntity"/> >>>>>> - <set-nonpk-fields map="parameters" value-field="newEntity"/> >>>>>> - >>>>>> - <if-empty field="newEntity.fromDate"> >>>>>> - <now-timestamp field="newEntity.fromDate"/> >>>>>> - </if-empty> >>>>>> - >>>>>> - <create-value value-field="newEntity"/> >>>>>> - </simple-method> >>>>>> - <simple-method method-name="updateProdCatalogToParty" >>>>>> short-description="Update ProdCatalog To Party"> >>>>>> - <make-value value-field="lookupPKMap" >>>>>> entity-name="ProdCatalogRole"/> >>>>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>>>> - <find-by-primary-key entity-name="ProdCatalogRole" >>>>>> map="lookupPKMap" value-field="lookedUpValue"/> >>>>>> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> >>>>>> - <store-value value-field="lookedUpValue"/> >>>>>> - </simple-method> >>>>>> - <simple-method method-name="removeProdCatalogFromParty" >>>>>> short-description="Remove ProdCatalog From Party"> >>>>>> - <make-value value-field="lookupPKMap" >>>>>> entity-name="ProdCatalogRole"/> >>>>>> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> >>>>>> - <find-by-primary-key entity-name="ProdCatalogRole" >>>>>> map="lookupPKMap" value-field="lookedUpValue"/> >>>>>> - <remove-value value-field="lookedUpValue"/> >>>>>> - </simple-method> >>>>>> <simple-method method-name="getAllCategories" >>>>>> short-description="get All categories" login-required="false"> >>>>>> <if-not-empty field="parameters.topCategory"> >>>>>> @@ -127,6 +41,7 @@ under the License. >>>>>> <log level="info" >>>>>> message="=========${category.productCategoryId}"/> >>>>>> </iterate --> >>>>>> </simple-method> >>>>>> + >>>>>> <simple-method method-name="getRelatedCategories" >>>>>> short-description="get All Related categories" login-required="false"> >>>>>> <set value="sequenceNum" field="orderByString"/> >>>>>> <field-to-list list="orderByStringList" field="orderByString"/> >>>>>> @@ -182,6 +97,7 @@ under the License. >>>>>> </iterate --> >>>>>> <field-to-result result-name="categories" field="categories"/> >>>>>> </simple-method> >>>>>> + >>>>>> <simple-method method-name="checkImageUrlForAllCategories" >>>>>> short-description="Check for image url exists or not for All >>>>>> categories" login-required="false"> >>>>>> <!-- Get all the categories from top category --> >>>>>> <set-service-fields to-map="categoryFindContext" >>>>>> service-name="getAllCategories" map="parameters"/> >>>>>> @@ -401,6 +317,7 @@ under the License. >>>>>> <field-to-result field="filesImageMap" >>>>>> result-name="filesImageMap"/> >>>>>> </if-not-empty> >>>>>> </simple-method> >>>>>> + >>>>>> <simple-method method-name="checkImageUrlForProduct" >>>>>> short-description="Check for image url exists or not for product" >>>>>> login-required="false"> >>>>>> <if-not-empty field="parameters.productId"> >>>>>> <set field="productFindContext.productId" >>>>>> from-field="parameters.productId"/> >>>>>> @@ -466,8 +383,8 @@ under the License. >>>>>> <!-- set-service-fields service-name="updateProduct" >>>>>> map-name="product" to-map-name="updateProductContext"/> >>>>>> <call-service service-name="updateProduct" >>>>>> in-map-name="updateProductContext" / --> >>>>>> </if-not-empty> >>>>>> - >>>>>> </simple-method> >>>>>> + >>>>>> <!-- get file image url and return Y or N --> >>>>>> <simple-method method-name="checkImageUrl" >>>>>> short-description="Check for image url exists or not" >>>>>> login-required="false"> >>>>>> <set field="imageUrl" from-field="parameters.imageUrl"/> >>>>>> @@ -530,7 +447,7 @@ under the License. >>>>>> <entity-and list="prodCatalogCategoryList" >>>>>> entity-name="ProdCatalogCategory" filter-by-date="false"> >>>>>> <field-map field-name="prodCatalogId" >>>>>> from-field="parameters.prodCatalogId"/> >>>>>> </entity-and> >>>>>> - >>>>>> + >>>>>> <!-- Get all categories --> >>>>>> <call-class-method method-name="newInstance" >>>>>> class-name="javolution.util.FastList" >>>>>> ret-field="parameters.productCategories"/> >>>>>> <iterate entry="prodCatalogCategory" >>>>>> list="prodCatalogCategoryList"> >>>>>> @@ -541,9 +458,8 @@ under the License. >>>>>> <set field="parameters.parentProductCategoryId" >>>>>> from-field="rootProductCategoryId"/> >>>>>> <call-simple-method >>>>>> method-name="createMissingCategoryAltUrlInline"/> >>>>>> </iterate> >>>>>> - >>>>>> + >>>>>> <iterate entry="productCategoryList" >>>>>> list="parameters.productCategories"> >>>>>> - >>>>>> <!-- Create Product Category Alternative URLs --> >>>>>> <if-empty field="category"> >>>>>> <entity-condition >>>>>> list="productCategoryContentAndInfoList" >>>>>> entity-name="ProductCategoryContentAndInfo" filter-by-date="true" >>>>>> use-cache="true"> >>>>>> @@ -598,7 +514,7 @@ under the License. >>>>>> </else> >>>>>> </if-empty> >>>>>> </if-empty> >>>>>> - >>>>>> + >>>>>> <!-- Create Product Alternative URLs --> >>>>>> <if-empty field="product"> >>>>>> <entity-condition list="productCategoryMemberList" >>>>>> entity-name="ProductCategoryMember" filter-by-date="true" >>>>>> use-cache="true"> >>>>>> @@ -659,6 +575,7 @@ under the License. >>>>>> <field-to-result field="categoriesUpdated" >>>>>> result-name="categoriesUpdated"/> >>>>>> <field-to-result field="productsUpdated" >>>>>> result-name="productsUpdated"/> >>>>>> </simple-method> >>>>>> + >>>>>> <simple-method method-name="createMissingCategoryAltUrlInline" >>>>>> short-description="create missing category alternative inline"> >>>>>> <entity-and list="productCategoryRollups" >>>>>> entity-name="ProductCategoryRollup" filter-by-date="true"> >>>>>> <field-map field-name="parentProductCategoryId" >>>>>> from-field="parameters.parentProductCategoryId"/> >>>>>> @@ -669,7 +586,6 @@ under the License. >>>>>> <field-map field-name="productCategoryId" >>>>>> from-field="productCategoryRollup.productCategoryId"/> >>>>>> </entity-one> >>>>>> <field-to-list list="parameters.productCategories" >>>>>> field="productCategory"/> >>>>>> - >>>>>> <!-- find rollup product categories --> >>>>>> <set field="parameters.parentProductCategoryId" >>>>>> from-field="productCategoryRollup.productCategoryId"/> >>>>>> <call-simple-method >>>>>> method-name="createMissingCategoryAltUrlInline"/> >>>>>> >>>>>> Modified: ofbiz/trunk/applications/product/servicedef/services.xml >>>>>> URL: >>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1628405&r1=1628404&r2=1628405&view=diff >>>>>> >>>>>> ============================================================================== >>>>>> >>>>>> --- ofbiz/trunk/applications/product/servicedef/services.xml (original) >>>>>> +++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Sep >>>>>> 30 11:59:29 2014 >>>>>> @@ -624,69 +624,60 @@ under the License. >>>>>> <!-- ======================================== --> >>>>>> <!-- Product Catalog Services --> >>>>>> <!-- ======================================== --> >>>>>> - <service name="createProdCatalog" >>>>>> default-entity-name="ProdCatalog" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="createProdCatalog" auth="true"> >>>>>> + <service name="createProdCatalog" >>>>>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="create" >>>>>> auth="true"> >>>>>> <description>Create a ProdCatalog</description> >>>>>> <permission-service service-name="catalogPermissionCheck" >>>>>> main-action="CREATE"/> >>>>>> <auto-attributes include="pk" mode="INOUT" optional="true"/> >>>>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>>>> <override name="catalogName" optional="false"/> >>>>>> </service> >>>>>> - <service name="updateProdCatalog" >>>>>> default-entity-name="ProdCatalog" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="updateProdCatalog" auth="true"> >>>>>> + <service name="updateProdCatalog" >>>>>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="update" >>>>>> auth="true"> >>>>>> <description>Update an ProdCatalog</description> >>>>>> <permission-service service-name="catalogPermissionCheck" >>>>>> main-action="UPDATE"/> >>>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>>>> <override name="catalogName" optional="false"/> >>>>>> </service> >>>>>> - <service name="deleteProdCatalog" >>>>>> default-entity-name="ProdCatalog" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="deleteProdCatalog" auth="true"> >>>>>> + <service name="deleteProdCatalog" >>>>>> default-entity-name="ProdCatalog" engine="entity-auto" invoke="delete" >>>>>> auth="true"> >>>>>> <description>Delete an ProdCatalog</description> >>>>>> <permission-service service-name="catalogPermissionCheck" >>>>>> main-action="DELETE"/> >>>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>>> </service> >>>>>> - <service name="addProductCategoryToProdCatalog" >>>>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="addProductCategoryToProdCatalog" auth="true"> >>>>>> + <service name="addProductCategoryToProdCatalog" >>>>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>>>> invoke="create" auth="true"> >>>>>> <description>Add ProductCategory To ProdCatalog</description> >>>>>> <permission-service service-name="catalogPermissionCheck" >>>>>> main-action="CREATE"/> >>>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>>>> <override name="fromDate" optional="true"/> >>>>>> </service> >>>>>> - <service name="updateProductCategoryToProdCatalog" >>>>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="updateProductCategoryToProdCatalog" auth="true"> >>>>>> + <service name="updateProductCategoryToProdCatalog" >>>>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>>>> invoke="update" auth="true"> >>>>>> <description>Add ProductCategory To ProdCatalog</description> >>>>>> <permission-service service-name="catalogPermissionCheck" >>>>>> main-action="UPDATE"/> >>>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>>>> <override name="prodCatalogCategoryTypeId" optional="false"/> >>>>>> </service> >>>>>> - <service name="removeProductCategoryFromProdCatalog" >>>>>> default-entity-name="ProdCatalogCategory" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="removeProductCategoryFromProdCatalog" auth="true"> >>>>>> + <service name="removeProductCategoryFromProdCatalog" >>>>>> default-entity-name="ProdCatalogCategory" engine="entity-auto" >>>>>> invoke="delete" auth="true"> >>>>>> <description>Remove ProductCategory From >>>>>> ProdCatalog</description> >>>>>> <permission-service service-name="catalogPermissionCheck" >>>>>> main-action="DELETE"/> >>>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>>> </service> >>>>>> - <service name="addProdCatalogToParty" >>>>>> default-entity-name="ProdCatalogRole" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="addProdCatalogToParty" auth="true"> >>>>>> + <service name="addProdCatalogToParty" >>>>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>>>> invoke="create" auth="true"> >>>>>> <description>Add ProdCatalog To Party</description> >>>>>> <permission-service >>>>>> service-name="prodCatalogToPartyPermissionCheck" main-action="CREATE"/> >>>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>>>> <override name="fromDate" optional="true"/> >>>>>> </service> >>>>>> - <service name="updateProdCatalogToParty" >>>>>> default-entity-name="ProdCatalogRole" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="updateProdCatalogToParty" auth="true"> >>>>>> + <service name="updateProdCatalogToParty" >>>>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>>>> invoke="update" auth="true"> >>>>>> <description>Add ProdCatalog To Party</description> >>>>>> <permission-service >>>>>> service-name="prodCatalogToPartyPermissionCheck" main-action="UPDATE"/> >>>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>>> <auto-attributes include="nonpk" mode="IN" optional="true"/> >>>>>> </service> >>>>>> - <service name="removeProdCatalogFromParty" >>>>>> default-entity-name="ProdCatalogRole" engine="simple" >>>>>> - >>>>>> location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" >>>>>> invoke="removeProdCatalogFromParty" auth="true"> >>>>>> + <service name="removeProdCatalogFromParty" >>>>>> default-entity-name="ProdCatalogRole" engine="entity-auto" >>>>>> invoke="delete" auth="true"> >>>>>> <description>Remove ProdCatalog From Party</description> >>>>>> <permission-service >>>>>> service-name="prodCatalogToPartyPermissionCheck" main-action="DELETE"/> >>>>>> <auto-attributes include="pk" mode="IN" optional="false"/> >>>>>> >>>>>> >>>>>> >>>> >>> > > > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |