You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/11/05 17:15:00 UTC
svn commit: r1768252 - in /ofbiz/trunk/applications/workeffort:
minilang/workeffort/WorkEffortSimpleServices.xml servicedef/services.xml
Author: deepak
Date: Sat Nov 5 17:15:00 2016
New Revision: 1768252
URL: http://svn.apache.org/viewvc?rev=1768252&view=rev
Log:
Fixed: Incorrect required parameters set on following services, mark required parameters as option false as service in parameter.
- createWorkEffortKeywords
- createWorkEffortQuote
- createWorkEffortRequest
- createWorkEffortRequestItem
- createWorkEffortRequestItemAndRequestItem
- createWorkEffortReview
- createWorkRequirementFulfillment
(OFBIZ-8602)(OFBIZ-8603)(OFBIZ-8604)(OFBIZ-8605)(OFBIZ-8620)(OFBIZ-8621)(OFBIZ-8622)
Thanks Pawan Verma for your contribution.
Modified:
ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/applications/workeffort/servicedef/services.xml
Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1768252&r1=1768251&r2=1768252&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sat Nov 5 17:15:00 2016
@@ -864,6 +864,9 @@ under the License.
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
+ <if-empty field="newEntity.userLoginId">
+ <set field="newEntity.userLoginId" from-field="parameters.userLogin.userLoginId"/>
+ </if-empty>
<if-empty field="newEntity.reviewDate">
<now-timestamp field="nowTimestamp"/>
<set field="newEntity.reviewDate" from-field="nowTimestamp"/>
Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1768252&r1=1768251&r2=1768252&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Sat Nov 5 17:15:00 2016
@@ -427,7 +427,11 @@ under the License.
<description>Creates a CustRequestWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequest"/>
- <override name="custRequestId" optional="true" mode="INOUT"/>
+ <override name="custRequestId" optional="false" mode="INOUT">
+ <type-validate>
+ <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingCustRequestId"/>
+ </type-validate>
+ </override>
<override name="description" allow-html="any"/>
</service>
<service name="deleteWorkEffortRequest" engine="entity-auto" default-entity-name="CustRequestWorkEffort" invoke="delete" auth="true">
@@ -437,13 +441,15 @@ under the License.
<service name="createWorkEffortRequestItemAndRequestItem" engine="group" location="createWorkEffortRequestItemAndRequestItem" invoke="" auth="true">
<description>Creates a CustRequestItem entity and CustRequestItemWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItemWorkEffort"/>
- <auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequestItem"/>
+ <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItem"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true" entity-name="CustRequestItem"/>
<attribute name="custRequestItemExists" type="java.lang.String" mode="OUT" optional="true"/>
</service>
<service name="createWorkEffortRequestItem" engine="entity-auto" invoke="create" auth="true">
<description>Creates a CustRequestItemWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItemWorkEffort"/>
- <auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequestItem"/>
+ <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItem"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true" entity-name="CustRequestItem"/>
<attribute name="custRequestItemExists" type="java.lang.String" mode="IN" optional="true"/>
</service>
<service name="deleteWorkEffortRequestItem" engine="entity-auto" invoke="delete" auth="true">
@@ -460,7 +466,11 @@ under the License.
<description>Creates a QuoteWorkEffort</description>
<auto-attributes include="pk" mode="IN" optional="false" entity-name="QuoteWorkEffort"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="Quote"/>
- <override name="quoteId" optional="true" mode="INOUT"/>
+ <override name="quoteId" optional="false" mode="INOUT">
+ <type-validate>
+ <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingQuoteId"/>
+ </type-validate>
+ </override>
</service>
<service name="deleteWorkEffortQuote" default-entity-name="QuoteWorkEffort" engine="entity-auto" auth="true" invoke="delete">
<description>Deletes a QuoteWorkEffort</description>
@@ -472,6 +482,16 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="true" entity-name="WorkRequirementFulfillment"/>
<auto-attributes include="nonpk" mode="IN" optional="true" entity-name="WorkRequirementFulfillment"/>
<auto-attributes include="all" mode="IN" optional="true" entity-name="Requirement"/>
+ <override name="workEffortId" optional="false">
+ <type-validate>
+ <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingWorkEffortId"/>
+ </type-validate>
+ </override>
+ <override name="requirementTypeId" optional="false">
+ <type-validate>
+ <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingRequirementTypeId"/>
+ </type-validate>
+ </override>
</service>
<service name="deleteWorkRequirementFulfillment" engine="entity-auto" default-entity-name="WorkRequirementFulfillment" auth="true" invoke="delete">
<description>Deletes a WorkRequirementFulfillment</description>
@@ -613,6 +633,11 @@ under the License.
<permission-service service-name="workEffortManagerPermission" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="workEffortId" optional="false">
+ <type-validate>
+ <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingWorkEffortId"/>
+ </type-validate>
+ </override>
</service>
<service name="updateWorkEffortReview" default-entity-name="WorkEffortReview" engine="entity-auto" invoke="update" auth="true">
<description>Update a Work Effort Review</description>
@@ -650,7 +675,7 @@ under the License.
location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortKeywords" auth="true">
<description>Create a Work Effort Keyword</description>
<permission-service service-name="workEffortManagerPermission" main-action="CREATE"/>
- <auto-attributes include="pk" mode="IN" optional="true"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
<service name="deleteWorkEffortKeywords" engine="simple"