svn commit: r1715788 - in /ofbiz/trunk/applications/cont
Locked
 
|
Author: nmalin
Date: Mon Nov 23 12:32:47 2015 New Revision: 1715788 URL: http://svn.apache.org/viewvc?rev=1715788&view=rev Log: Convert Survey entites CRUD service from simple to entity-auto, related to issue OFBIZ-6744. Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml ofbiz/trunk/applications/content/servicedef/services_survey.xml ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl 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=1715788&r1=1715787&r2=1715788&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 Mon Nov 23 12:32:47 2015 @@ -20,156 +20,6 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> - <!-- Methods for Survey --> - <simple-method method-name="createSurvey" short-description="Create Survey"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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="deleteSurvey" short-description="Delete Survey"> - <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="Survey" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyMultiResp --> - <simple-method method-name="createSurveyMultiResp" short-description="Create Survey Multi-Response"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyMultiResp" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyMultiRespColumn --> - <simple-method method-name="createSurveyMultiRespColumn" short-description="Create Survey Multi-Response Column/Category"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyMultiRespColumn" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyPage --> - <simple-method method-name="createSurveyPage" short-description="Create Survey Page"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyPage" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyApplType --> - <simple-method method-name="createSurveyApplType" short-description="Create SurveyApplType"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyApplType" value-field="lookupKeyValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> <!-- Methods for SurveyQuestion --> <simple-method method-name="createSurveyQuestion" short-description="Create Survey Question"> @@ -178,7 +28,6 @@ </check-permission> <if> <condition> - <and> <if-compare field="surveyQuestionTypeId" value="ENUMERATION" operator="equals"/> <if-empty field="enumTypeId"/> @@ -254,165 +103,6 @@ <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyQuestion" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyQuestionOption --> - <simple-method method-name="createSurveyQuestionOption" short-description="Create Survey Question Option"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityDeleteCreatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyQuestionOption" value-field="lookedUpValue"/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyQuestionOption" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyQuestionAppl --> - <simple-method method-name="createSurveyQuestionAppl" short-description="Create Survey Question Application"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <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 field="newEntity.fromDate"/> - </if-empty> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyQuestionAppl" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyQuestionCategory --> - <simple-method method-name="createSurveyQuestionCategory" short-description="Create Survey QuestionCategory"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyQuestionCategory" value-field="lookupKeyValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyQuestionType --> - <simple-method method-name="createSurveyQuestionType" short-description="Create SurveyQuestionType"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SurveyQuestionType" value-field="lookupKeyValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Methods for SurveyTrigger --> - <simple-method method-name="createSurveyTrigger" short-description="Create SurveyTrigger"> - <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> - </check-permission> - <check-errors/> - <make-value entity-name="SurveyTrigger" 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-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> - </check-permission> - <check-errors/> - <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-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> - </check-permission> - <check-errors/> - <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"> @@ -772,32 +462,32 @@ <set value="DOCUMENT" field="partyContent.contentTypeId"/> <set value="PERSONAL" field="partyContent.dataCategoryId"/> <set value="CTNT_PUBLISHED" field="partyContent.statusId"/--> - + <!-- First create the Content record --> <make-value entity-name="Content" value-field="content"/> <sequenced-id field="content.contentId" sequence-name="Content"/> <set field="content.contentTypeId" value="DOCUMENT"/> <set field="content.statusId" value="CTNT_PUBLISHED" /> <create-value value-field="content"/> - + <!-- Create the DataResource record --> <set field="dataResource.dataResourceTypeId" value="IMAGE_OBJECT"/> <set field="dataResource.mimeTypeId" from-field="answers._${surveyQuestionAndAppl.surveyQuestionId}_contentType"/> <set field="dataResource.objectInfo" from-field="answers._${surveyQuestionAndAppl.surveyQuestionId}_fileName"/> - + <call-service service-name="createDataResource" in-map-name="dataResource"> <result-to-field result-name="dataResourceId"/> </call-service> - + <!-- Create the ImageDataResource record --> <set field="imageDataResource.dataResourceId" from-field="dataResourceId"/> <set field="imageDataResource.imageData" from-field="answers["${currentFieldName}"]"/> <call-service service-name="createImageDataResource" in-map-name="imageDataResource"/> - + <!-- Associate the DataResource with the Content record --> <set field="content.dataResourceId" from-field="dataResourceId"/> <store-value value-field="content"/> - + <set field="partyContent.partyId" from-field="parameters.partyId"/> <set field="partyContent.contentId" from-field="content.contentId"/> <set field="partyContent.partyContentTypeId" value="INTERNAL"/> Modified: ofbiz/trunk/applications/content/servicedef/services_survey.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_survey.xml?rev=1715788&r1=1715787&r2=1715788&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_survey.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_survey.xml Mon Nov 23 12:32:47 2015 @@ -24,22 +24,19 @@ under the License. <vendor>OFBiz</vendor> <!-- Survey Services --> - <service name="createSurvey" default-entity-name="Survey" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurvey"> + <service name="createSurvey" default-entity-name="Survey" auth="true" engine="entity-auto" invoke="create"> <description>Create a Survey</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateSurvey" default-entity-name="Survey" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurvey"> + <service name="updateSurvey" default-entity-name="Survey" auth="true" engine="entity-auto" invoke="update"> <description>Update a Survey</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurvey" default-entity-name="Survey" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurvey"> + <service name="deleteSurvey" default-entity-name="Survey" auth="true" engine="entity-auto" invoke="delete"> <description>Delete Survey</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -56,94 +53,80 @@ under the License. --> <!-- SurveyMultiResp Services --> - <service name="createSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyMultiResp"> + <service name="createSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyMultiResp; surveyMultiRespId will be auto-sequenced</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> - <auto-attributes include="pk" mode="IN" optional="false"> - <exclude field-name="surveyMultiRespId"/> - </auto-attributes> <auto-attributes include="nonpk" mode="IN" optional="true"/> + <attribute name="surveyId" mode="IN" type="String"/> + <attribute name="surveyMultiRespId" mode="OUT" type="String"/> </service> - <service name="updateSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyMultiResp"> + <service name="updateSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyMultiResp</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyMultiResp"> + <service name="deleteSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyMultiResp</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyMultiRespColumn Services --> - <service name="createSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyMultiRespColumn"> + <service name="createSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyMultiRespColumn; surveyMultiRespColId will be auto-sequenced</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> - <auto-attributes include="pk" mode="IN" optional="false"> - <exclude field-name="surveyMultiRespColId"/> - </auto-attributes> <auto-attributes include="nonpk" mode="IN" optional="true"/> + <attribute name="surveyId" mode="IN" type="String"/> + <attribute name="surveyMultiRespId" mode="IN" type="String"/> + <attribute name="surveyMultiRespColId" mode="OUT" type="String"/> </service> - <service name="updateSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyMultiRespColumn"> + <service name="updateSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyMultiRespColumn</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyMultiRespColumn"> + <service name="deleteSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyMultiRespColumn</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyPage Services --> - <service name="createSurveyPage" default-entity-name="SurveyPage" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyPage"> + <service name="createSurveyPage" default-entity-name="SurveyPage" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyPage; the surveyPageSeqId will be auto-generated</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> - <auto-attributes include="pk" mode="IN" optional="false"> - <exclude field-name="surveyPageSeqId"/> - </auto-attributes> <auto-attributes include="nonpk" mode="IN" optional="true"/> + <attribute name="surveyId" mode="IN" type="String"/> + <attribute name="surveyPageSeqId" mode="OUT" type="String"/> </service> - <service name="updateSurveyPage" default-entity-name="SurveyPage" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyPage"> + <service name="updateSurveyPage" default-entity-name="SurveyPage" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyPage</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyPage" default-entity-name="SurveyPage" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyPage"> + <service name="deleteSurveyPage" default-entity-name="SurveyPage" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyPage</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyApplType Services --> - <service name="createSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyApplType"> + <service name="createSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyApplType</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyApplType"> + <service name="updateSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyApplType</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyApplType"> + <service name="deleteSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyApplType</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -165,122 +148,104 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyQuestion" default-entity-name="SurveyQuestion" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestion"> + <service name="deleteSurveyQuestion" default-entity-name="SurveyQuestion" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyQuestion</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestionOption Services --> - <service name="createSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionOption"> + <service name="createSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyQuestionOption</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> - <auto-attributes include="all" mode="IN" optional="true"> - <exclude field-name="surveyOptionSeqId"/> - </auto-attributes> - <attribute name="surveyOptionSeqId" type="String" mode="OUT" optional="false"/> - <override name="surveyQuestionId" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + <attribute name="surveyQuestionId" type="String" mode="IN"/> + <attribute name="surveyOptionSeqId" type="String" mode="OUT"/> </service> - <service name="updateSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionOption"> + <service name="updateSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyQuestionOption</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionOption"> + <service name="deleteSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyQuestionOption</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestionAppl Services --> - <service name="createSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionAppl"> + <service name="createSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyQuestionAppl</description> <permission-service service-name="contentManagerPermission" 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="updateSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionAppl"> + <service name="updateSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyQuestionAppl</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionAppl"> + <service name="deleteSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyQuestionAppl</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestionCategory Services --> - <service name="createSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionCategory"> + <service name="createSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyQuestionCategory</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionCategory"> + <service name="updateSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyQuestionCategory</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionCategory"> + <service name="deleteSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyQuestionCategory</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestionType Services --> - <service name="createSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionType"> + <service name="createSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyQuestionType</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionType"> + <service name="updateSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyQuestionType</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionType"> + <service name="deleteSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyQuestionType</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyTrigger Services --> - <service name="createSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyTrigger"> + <service name="createSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="entity-auto" invoke="create"> <description>Create a SurveyTrigger</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionType"> + <service name="updateSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="entity-auto" invoke="update"> <description>Update a SurveyTrigger</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="simple" - location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyTrigger"> + <service name="deleteSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="entity-auto" invoke="delete"> <description>Delete SurveyTrigger</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=1715788&r1=1715787&r2=1715788&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Mon Nov 23 12:32:47 2015 @@ -65,7 +65,7 @@ under the License. <td>${surveyQuestionAndAppl.description!}</td> <td><input type="text" name="question" size="30" value="${surveyQuestionAndAppl.question!?html}" /> <td> - <select name="surveyPageId"> + <select name="surveyPageSeqId"> <#if surveyQuestionAndAppl.surveyPageSeqId?has_content> <option value="${surveyQuestionAndAppl.surveyPageSeqId}">${(currentSurveyPage.pageName)!} [${surveyQuestionAndAppl.surveyPageSeqId}]</option> <option value="${surveyQuestionAndAppl.surveyPageSeqId}">----</option> @@ -171,7 +171,7 @@ under the License. <td>${questionType.get("description",locale)}</td> <td>${question.question!}</td> <td> - <select name="surveyPageId"> + <select name="surveyPageSeqId"> <option value=""></option> <#list surveyPageList as surveyPage> <option value="${surveyPage.surveyPageSeqId}">${surveyPage.pageName} [${surveyPage.surveyPageSeqId}]</option> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |