svn commit: r730995 - /ofbiz/trunk/applications/cont
Locked
 
|
Author: hansbak
Date: Sat Jan 3 06:50:30 2009 New Revision: 730995 URL: http://svn.apache.org/viewvc?rev=730995&view=rev Log: minilanguage keyword changes Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml?rev=730995&r1=730994&r2=730995&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml Sat Jan 3 06:50:30 2009 @@ -26,32 +26,28 @@ <fail-message message="Security Error: to run createSurvey you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="Survey" value-name="newEntity"/> - <sequenced-id-to-env sequence-name="Survey" env-name="newEntity.surveyId"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> - <field-to-result field-name="surveyId" map-name="newEntity"/> + <make-value entity-name="Survey" value-field="newEntity"/> + <sequenced-id sequence-name="Survey" field="newEntity.surveyId"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> + <field-to-result result-name="surveyId" field="newEntity.surveyId"/> </simple-method> <simple-method method-name="updateSurvey" short-description="Update Survey"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurvey you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="Survey" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="Survey" value-field="lookupKeyValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurvey" short-description="Delete Survey"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyt you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="Survey" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="Survey" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyMultiResp --> @@ -60,31 +56,30 @@ <fail-message message="Security Error: to run createSurveyMultiResp you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - - <make-value entity-name="SurveyMultiResp" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <make-next-seq-id value-name="newEntity" seq-field-name="surveyMultiRespId" numeric-padding="2"/> - - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <make-value entity-name="SurveyMultiResp" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <if-empty field="newEntity.surveyMultiRespId"> + <make-next-seq-id value-field="newEntity" seq-field-name="surveyMultiRespId" numeric-padding="2"/> + </if-empty> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSurveyMultiResp" short-description="Update Survey Multi-Response"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyMultiResp you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - - <entity-one entity-name="SurveyMultiResp" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyMultiResp" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyMultiResp" short-description="Delete Survey Multi-Response"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyMultiResp you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <entity-one entity-name="SurveyMultiResp" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyMultiResp" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyMultiRespColumn --> @@ -93,31 +88,28 @@ <fail-message message="Security Error: to run createSurveyMultiRespColumn you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - - <make-value entity-name="SurveyMultiRespColumn" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <make-next-seq-id value-name="newEntity" seq-field-name="surveyMultiRespColId" numeric-padding="2"/> - - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <make-value entity-name="SurveyMultiRespColumn" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <make-next-seq-id value-field="newEntity" seq-field-name="surveyMultiRespColId" numeric-padding="2"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSurveyMultiRespColumn" short-description="Update Survey Multi-Response Column/Category"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyMultiRespColumn you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - - <entity-one entity-name="SurveyMultiRespColumn" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyMultiRespColumn" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyMultiRespColumn" short-description="Delete Survey Multi-Response Column/Category"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyMultiRespColumn you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <entity-one entity-name="SurveyMultiRespColumn" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyMultiRespColumn" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyPage --> @@ -126,31 +118,28 @@ <fail-message message="Security Error: to run createSurveyPage you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - - <make-value entity-name="SurveyPage" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <make-next-seq-id value-name="newEntity" seq-field-name="surveyPageSeqId" numeric-padding="2"/> - - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <make-value entity-name="SurveyPage" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <make-next-seq-id value-field="newEntity" seq-field-name="surveyPageSeqId" numeric-padding="2"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSurveyPage" short-description="Update Survey Page"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyPage you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - - <entity-one entity-name="SurveyPage" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyPage" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyPage" short-description="Delete Survey Page"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyPage you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <entity-one entity-name="SurveyPage" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyPage" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyApplType --> @@ -159,31 +148,27 @@ <fail-message message="Security Error: to run createSurveyApplType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyApplType" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <make-value entity-name="SurveyApplType" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSurveyApplType" short-description="Update SurveyApplType"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyApplType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="Survey" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="Survey" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyApplType" short-description="Delete SurveyApplType"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyApplType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyApplType" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyApplType" value-field="lookupKeyValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyQuestion --> @@ -216,11 +201,11 @@ </if> <check-errors/> - <make-value entity-name="SurveyQuestion" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <sequenced-id-to-env sequence-name="SurveyQuestion" env-name="newEntity.surveyQuestionId"/> - <create-value value-name="newEntity"/> - <field-to-result field-name="surveyQuestionId" map-name="newEntity"/> + <make-value entity-name="SurveyQuestion" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <sequenced-id sequence-name="SurveyQuestion" field="newEntity.surveyQuestionId"/> + <create-value value-field="newEntity"/> + <field-to-result result-name="surveyQuestionId" field="newEntity.surveyQuestionId"/> </simple-method> <simple-method method-name="updateSurveyQuestion" short-description="Update Survey Question"> <check-permission action="_UPDATE" permission="CONTENTMGR"> @@ -249,22 +234,17 @@ </then> </if> <check-errors/> - - <make-value entity-name="SurveyQuestion" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestion" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyQuestion" short-description="Delete Survey Question"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyQuestion you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestion" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestion" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyQuestionOption --> @@ -273,33 +253,30 @@ <fail-message message="Security Error: to run createSurveyQuestionOption you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionOption" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <make-next-seq-id value-name="newEntity" seq-field-name="surveyOptionSeqId"/> - <create-value value-name="newEntity"/> - <field-to-result field-name="surveyOptionSeqId" map-name="newEntity" result-name="surveyOptionSeqId"/> + <make-value entity-name="SurveyQuestionOption" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <make-next-seq-id value-field="newEntity" seq-field-name="surveyOptionSeqId"/> + <create-value value-field="newEntity"/> + <field-to-result field="newEntity.surveyOptionSeqId" result-name="surveyOptionSeqId"/> </simple-method> <simple-method method-name="updateSurveyQuestionOption" short-description="Update Survey Question Option"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyQuestionOption you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionOption" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestionOption" value-field="lookedUpValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyQuestionOption" short-description="Delete Survey Question Option"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyQuestionOption you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionOption" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestionOption" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyQuestionAppl --> @@ -308,34 +285,30 @@ <fail-message message="Security Error: to run createSurveyQuestionAppl you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionAppl" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - + <make-value entity-name="SurveyQuestionAppl" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> - <set field="newEntity.fromDate" from-field="nowTimestamp"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> - - <create-value value-name="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSurveyQuestionAppl" short-description="Update Survey Question Application"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyQuestionAppl you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - - <entity-one entity-name="SurveyQuestionAppl" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestionAppl" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyQuestionAppl" short-description="Delete Survey Question Application"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyQuestionAppl you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <entity-one entity-name="SurveyQuestionAppl" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestionAppl" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyQuestionCategory --> @@ -344,32 +317,28 @@ <fail-message message="Security Error: to run createSurveyQuestionCategory you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionCategory" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <sequenced-id-to-env sequence-name="SurveyQuestionCategory" env-name="newEntity.surveyQuestionCategoryId"/> - <create-value value-name="newEntity"/> - <field-to-result field-name="surveyQuestionCategoryId" map-name="newEntity"/> + <make-value entity-name="SurveyQuestionCategory" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <sequenced-id sequence-name="SurveyQuestionCategory" field="newEntity.surveyQuestionCategoryId"/> + <create-value value-field="newEntity"/> + <field-to-result result-name="surveyQuestionCategoryId" field="newEntity.surveyQuestionCategoryId"/> </simple-method> <simple-method method-name="updateSurveyQuestionCategory" short-description="Update Survey QuestionCategory"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyQuestionCategory you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionCategory" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestionCategory" value-field="lookupKeyValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyQuestionCategory" short-description="Delete Survey QuestionCategory"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyQuestionCategory you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionCategory" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestionCategory" value-field="lookupKeyValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyQuestionType --> @@ -378,31 +347,27 @@ <fail-message message="Security Error: to run createSurveyQuestionType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionType" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <make-value entity-name="SurveyQuestionType" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSurveyQuestionType" short-description="Update SurveyQuestionType"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyQuestionType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionType" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestionType" value-field="lookupKeyValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyQuestionType" short-description="Delete SurveyQuestionType"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyQuestionType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionType" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyQuestionType" value-field="lookupKeyValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Methods for SurveyTrigger --> @@ -411,45 +376,41 @@ <fail-message message="Security Error: to run createSurveyTrigger you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyQuestionType" value-name="newEntity"/> - <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> - <create-value value-name="newEntity"/> + <make-value entity-name="SurveyQuestionType" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSurveyTrigger" short-description="Update SurveyTrigger"> <check-permission action="_UPDATE" permission="CONTENTMGR"> <fail-message message="Security Error: to run updateSurveyTrigger you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyTrigger" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="SurveyTrigger" map-name="lookupKeyValue" value-name="lookedUpValue"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyTrigger" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSurveyTrigger" short-description="Delete SurveyTrigger"> <check-permission action="_DELETE" permission="CONTENTMGR"> <fail-message message="Security Error: to run deleteSurveyTrigger you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> </check-permission> <check-errors/> - <make-value entity-name="SurveyTrigger" value-name="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="SurveyTrigger" map-name="lookupKeyValue" value-name="lookedUpValue"/> - <remove-value value-name="lookedUpValue"/> + <entity-one entity-name="SurveyTrigger" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </simple-method> <!-- Survey Response Methods --> <simple-method method-name="createSurveyResponse" short-description="Create Survey Response" login-required="false"> <!-- lookup the survey --> - <entity-one entity-name="Survey" value-name="survey" use-cache="true"/> + <entity-one entity-name="Survey" value-field="survey" use-cache="true"/> <if-empty field="survey"> <add-error><fail-message message="No survey found for survey ID: ${surveyLookup.surveyId}"/></add-error> <check-errors/> </if-empty> <!-- look up the applied questions --> - <entity-and entity-name="SurveyQuestionAndAppl" list-name="surveyQuestionAndApplList" use-cache="true"> - <field-map field-name="surveyId" env-name="survey.surveyId"/> + <entity-and entity-name="SurveyQuestionAndAppl" list="surveyQuestionAndApplList" use-cache="true"> + <field-map field-name="surveyId" from-field="survey.surveyId"/> </entity-and> <if-empty field="surveyQuestionAndApplList"> <add-error><fail-message message="No questions found for survey ID: ${survey.surveyId}"/></add-error> @@ -467,9 +428,9 @@ <!-- if this is a single use and we have a partyId check for existing responses --> <if-compare field="survey.allowMultiple" operator="not-equals" value="Y"> <if-not-empty field="parameters.partyId"> - <entity-and entity-name="SurveyResponse" list-name="existingResponses"> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="surveyId" env-name="survey.surveyId"/> + <entity-and entity-name="SurveyResponse" list="existingResponses"> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="surveyId" from-field="survey.surveyId"/> </entity-and> <if-not-empty field="existingResponses"> <add-error><fail-message message="You have already responded to this survey; multiple responses are not allowed"/></add-error> @@ -486,14 +447,14 @@ <set field="answers" from-field="parameters.answers"/> <!-- make sure all required fields were responded to --> - <iterate entry-name="surveyQuestionAndAppl" list-name="surveyQuestionAndApplList"> + <iterate entry="surveyQuestionAndAppl" list="surveyQuestionAndApplList"> <!-- for validation get SurveyMultiResp and SurveyMultiRespColumn entries and if exist process for each surveyMultiRespColId --> - <get-related-one value-name="surveyQuestionAndAppl" relation-name="SurveyMultiResp" to-value-name="surveyMultiResp" use-cache="true"/> + <get-related-one value-field="surveyQuestionAndAppl" relation-name="SurveyMultiResp" to-value-field="surveyMultiResp" use-cache="true"/> <if-not-empty field="surveyMultiResp"> <!-- if the surveyQuestionAndAppl has a surveyMultiRespColId, then just look for one answer with that ID --> <if-empty field="surveyQuestionAndAppl.surveyMultiRespColId"> - <get-related value-name="surveyMultiResp" relation-name="SurveyMultiRespColumn" list-name="surveyMultiRespColumnList" use-cache="true"/> - <iterate entry-name="surveyMultiRespColumn" list-name="surveyMultiRespColumnList"> + <get-related value-field="surveyMultiResp" relation-name="SurveyMultiRespColumn" list="surveyMultiRespColumnList" use-cache="true"/> + <iterate entry="surveyMultiRespColumn" list="surveyMultiRespColumnList"> <set field="answerFieldName" value="answers.${surveyQuestionAndAppl.surveyQuestionId}_${surveyMultiRespColumn.surveyMultiRespColId}"/> <call-simple-method method-name="validateSurveyResponseInline"/> </iterate> @@ -510,21 +471,20 @@ </iterate> <check-errors/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <!-- create/update the response --> <if-compare field="survey.allowUpdate" operator="equals" value="Y"> <if-not-empty field="parameters.surveyResponseId"> - <set from-field="parameters.surveyResponseId" field="lookupRespMap.surveyResponseId"/> - <find-by-primary-key entity-name="SurveyResponse" map-name="lookupRespMap" value-name="surveyResponse"/> + <entity-one entity-name="SurveyResponse" value-field="lookupRespMap"/> </if-not-empty> </if-compare> <if-empty field="surveyResponse"> - <make-value value-name="surveyResponse" entity-name="SurveyResponse"/> - <sequenced-id-to-env sequence-name="SurveyResponse" env-name="surveyResponse.surveyResponseId"/> - <set-nonpk-fields value-name="surveyResponse" map-name="parameters"/> - <create-value value-name="surveyResponse"/> + <make-value value-field="surveyResponse" entity-name="SurveyResponse"/> + <sequenced-id sequence-name="SurveyResponse" field="surveyResponse.surveyResponseId"/> + <set-nonpk-fields value-field="surveyResponse" map="parameters"/> + <create-value value-field="surveyResponse"/> </if-empty> <if-empty field="surveyResponse.responseDate"> @@ -532,19 +492,19 @@ </if-empty> <set from-field="nowTimestamp" field="surveyResponse.lastModifiedDate"/> - <store-value value-name="surveyResponse"/> - <field-to-result field-name="surveyResponse.surveyResponseId" result-name="surveyResponseId"/> + <store-value value-field="surveyResponse"/> + <field-to-result field="surveyResponse.surveyResponseId" result-name="surveyResponseId"/> <!-- if a dataResourceId was passed in use it to set DataResource.relatedDetailId to the surveyResponse.surveyResponseId --> <if-not-empty field="parameters.dataResourceId"> - <entity-one entity-name="DataResource" value-name="dataResource"/> + <entity-one entity-name="DataResource" value-field="dataResource"/> <set field="dataResource.relatedDetailId" from-field="surveyResponse.surveyResponseId"/> - <store-value value-name="dataResource"/> + <store-value value-field="dataResource"/> </if-not-empty> <!-- lookup any existing response answers --> - <get-related value-name="surveyResponse" relation-name="SurveyResponseAnswer" list-name="existingAnswers"/> - <iterate entry-name="existingAnswer" list-name="existingAnswers"> + <get-related value-field="surveyResponse" relation-name="SurveyResponseAnswer" list="existingAnswers"/> + <iterate entry="existingAnswer" list="existingAnswers"> <set field="currentAnswersFieldName" from-field="existingAnswer.surveyQuestionId"/> <if> <condition> @@ -563,14 +523,14 @@ </iterate> <!-- create the response answers --> - <iterate entry-name="surveyQuestionAndAppl" list-name="surveyQuestionAndApplList"> + <iterate entry="surveyQuestionAndAppl" list="surveyQuestionAndApplList"> <!-- for process inputs get SurveyMultiResp and SurveyMultiRespColumn entries and if exist process for each surveyMultiRespColId --> - <get-related-one value-name="surveyQuestionAndAppl" relation-name="SurveyMultiResp" to-value-name="surveyMultiResp" use-cache="true"/> + <get-related-one value-field="surveyQuestionAndAppl" relation-name="SurveyMultiResp" to-value-field="surveyMultiResp" use-cache="true"/> <if-not-empty field="surveyMultiResp"> <!-- if the surveyQuestionAndAppl has a surveyMultiRespColId, then just look for one answer with that ID --> <if-empty field="surveyQuestionAndAppl.surveyMultiRespColId"> - <get-related value-name="surveyMultiResp" relation-name="SurveyMultiRespColumn" list-name="surveyMultiRespColumnList" use-cache="true"/> - <iterate entry-name="surveyMultiRespColumn" list-name="surveyMultiRespColumnList"> + <get-related value-field="surveyMultiResp" relation-name="SurveyMultiRespColumn" list="surveyMultiRespColumnList" use-cache="true"/> + <iterate entry="surveyMultiRespColumn" list="surveyMultiRespColumnList"> <set field="currentFieldName" value="${surveyQuestionAndAppl.surveyQuestionId}_${surveyMultiRespColumn.surveyMultiRespColId}"/> <call-simple-method method-name="processSurveyResponseInline"/> </iterate> @@ -592,9 +552,9 @@ <call-service-asynch service-name="${survey.responseService}" in-map-name="respServiceCtx" include-user-login="true"/> </if-not-empty> - <field-to-result field-name="surveyResponse.surveyResponseId" result-name="surveyResponseId"/> - <field-to-result field-name="parameters.productStoreSurveyId" result-name="productStoreSurveyId"/> - <field-to-result field-name="parameters.surveyId" result-name="surveyId"/> + <field-to-result field="surveyResponse.surveyResponseId" result-name="surveyResponseId"/> + <field-to-result field="parameters.productStoreSurveyId" result-name="productStoreSurveyId"/> + <field-to-result field="parameters.surveyId" result-name="surveyId"/> </simple-method> <!-- =============== Inline method used by createSurveyResponse ============== --> @@ -608,7 +568,7 @@ <!-- validate the field --> <if-compare field="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="CREDIT_CARD"> - <if-validate-method field-name="${answerFieldName}" method="isCreditCard"> + <if-validate-method field="${answerFieldName}" method="isCreditCard"> <else> <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid credit-card number."/></add-error> </else> @@ -618,14 +578,14 @@ <set field="finAccountMap.finAccountTypeId" value="GIFTCERT_ACCOUNT"/> <set field="finAccountMap.statusId" value="FNACT_ACTIVE"/> <set field="codeOk" value="false"/> - <find-by-and entity-name="FinAccount" map-name="finAccountMap" list-name="finAccountList"/> - <iterate entry-name="finAccount" list-name="finAccountList"> + <find-by-and entity-name="FinAccount" map="finAccountMap" list="finAccountList"/> + <iterate entry="finAccount" list="finAccountList"> <if-compare field="finAccount.finAccountCode" operator="equals" value="${${answerFieldName}}"> <set field="codeOk" value="true"/> </if-compare> </iterate> <if-compare field="codeOk" value="true" operator="not-equals"> - <if-validate-method field-name="${answerFieldName}" method="isGiftCard"> + <if-validate-method field="${answerFieldName}" method="isGiftCard"> <else> <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid gift-card number."/></add-error> </else> @@ -633,42 +593,42 @@ </if-compare> </if-compare> <if-compare field="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="DATE"> - <if-validate-method field-name="${answerFieldName}" method="isDate"> + <if-validate-method field="${answerFieldName}" method="isDate"> <else> <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid date string (mm/dd/yyyy)."/></add-error> </else> </if-validate-method> </if-compare> <if-compare field="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="EMAIL"> - <if-validate-method field-name="${answerFieldName}" method="isEmail"> + <if-validate-method field="${answerFieldName}" method="isEmail"> <else> <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid email address."/></add-error> </else> </if-validate-method> </if-compare> <if-compare field="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="NUMBER_CURRENCY"> - <if-validate-method field-name="${answerFieldName}" method="isSignedDouble"> + <if-validate-method field="${answerFieldName}" method="isSignedDouble"> <else> <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid currency amount."/></add-error> </else> </if-validate-method> </if-compare> <if-compare field="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="NUMBER_FLOAT"> - <if-validate-method field-name="${answerFieldName}" method="isSignedDouble"> + <if-validate-method field="${answerFieldName}" method="isSignedDouble"> <else> <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid decimal number."/></add-error> </else> </if-validate-method> </if-compare> <if-compare field="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="NUMBER_LONG"> - <if-validate-method field-name="${answerFieldName}" method="isSignedLong"> + <if-validate-method field="${answerFieldName}" method="isSignedLong"> <else> <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid whole number."/></add-error> </else> </if-validate-method> </if-compare> <if-compare field="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="URL"> - <if-validate-method field-name="${answerFieldName}" method="isUrl"> + <if-validate-method field="${answerFieldName}" method="isUrl"> <else> <add-error><fail-message message="The question [${surveyQuestionAndAppl.question}] requires a valid URL."/></add-error> </else> @@ -695,7 +655,7 @@ </or> </condition> <then> - <make-value entity-name="SurveyResponseAnswer" value-name="responseAnswer"/> + <make-value entity-name="SurveyResponseAnswer" value-field="responseAnswer"/> <set from-field="surveyResponse.surveyResponseId" field="responseAnswer.surveyResponseId"/> <set from-field="surveyQuestionAndAppl.surveyQuestionId" field="responseAnswer.surveyQuestionId"/> @@ -708,7 +668,7 @@ </else> </if-not-empty> - <create-value value-name="responseAnswer"/> + <create-value value-field="responseAnswer"/> </then> </if> <if-not-empty field="answers.${currentFieldName}"> @@ -762,7 +722,7 @@ </if-compare> <if-compare field="surveyQuestionAndAppl.surveyQuestionTypeId" operator="equals" value="CONTENT"> <!-- <log level="always" message="Found CONTENT type question"/> --> - <if-instance-of field-name="answers.${currentFieldName}" class="java.nio.ByteBuffer"> + <if-instance-of field="answers.${currentFieldName}" class="java.nio.ByteBuffer"> <set from-field="answers._${surveyQuestionAndAppl.surveyQuestionId}_contentType" field="partyContent._uploadedFile_contentType"/> <set from-field="answers._${surveyQuestionAndAppl.surveyQuestionId}_fileName" field="partyContent._uploadedFile_fileName"/> <set from-field="answers.${currentFieldName}" field="partyContent.uploadedFile"/> @@ -770,7 +730,7 @@ <set value="PERSONAL" field="partyContent.dataCategoryId"/> <set value="CTNT_PUBLISHED" field="partyContent.statusId"/> <call-service service-name="createPartyContent" in-map-name="partyContent"> - <result-to-field result-name="contentId" field-name="responseAnswer.contentId"/> + <result-to-field result-name="contentId" field="responseAnswer.contentId"/> </call-service> <else> <set from-field="answers.${currentFieldName}" field="responseAnswer.contentId"/> @@ -782,7 +742,7 @@ <set from-field="surveyQuestionAndAppl.sequenceNum" field="responseAnswer.sequenceNum"/> </if-empty> <set from-field="nowTimestamp" field="responseAnswer.answeredDate"/> - <store-value value-name="responseAnswer"/> + <store-value value-field="responseAnswer"/> </if-not-empty> </simple-method> </simple-methods> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |