svn commit: r762648 [3/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entity
Locked
svn commit: r762648 [3/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entity
 
|
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Apr 7 08:27:15 2009 @@ -76,7 +76,7 @@ <set-nonpk-fields value-field="assoc" map="parameters"/> <set-pk-fields value-field="assoc" map="parameters"/> - <set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" /> + <set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}"/> <now-timestamp field="nowTimestamp"/> <if-empty field="assoc.fromDate"> @@ -93,7 +93,7 @@ <field-to-result field="assoc.fromDate" result-name="fromDate"/> </simple-method> <simple-method method-name="updateContentAssoc" short-description="Update a ContentAssoc Record"> - <set field="contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" /> + <set field="contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}"/> <entity-one entity-name="ContentAssoc" value-field="assoc" auto-field-map="true"/> <set-nonpk-fields value-field="assoc" map="parameters"/> @@ -199,8 +199,8 @@ <set from-field="currentContent" field="context.currentContent"/> <set from-field="parameters.contentIdFrom" field="pk.contentId"/> <set from-field="parameters.userLogin" field="context.userLogin"/> - <find-by-primary-key value-field="currentContent" entity-name="Content" map="pk" /> - <find-by-primary-key value-field="fromContent" entity-name="Content" map="pk" /> + <find-by-primary-key value-field="currentContent" entity-name="Content" map="pk"/> + <find-by-primary-key value-field="fromContent" entity-name="Content" map="pk"/> <if-compare field="permissionStatus" operator="equals" type="String" value="granted"> <make-value entity-name="ContentAssoc" value-field="newContentAssoc"/> @@ -219,7 +219,7 @@ <if-not-empty field="parameters.thruDate"> <set from-field="parameters.thruDate" field="newContentAssoc.thruDate"/> </if-not-empty> - <create-value value-field="newContentAssoc" /> + <create-value value-field="newContentAssoc"/> </if-compare> <check-errors/> </simple-method> @@ -301,7 +301,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result result-name="contentTypeId" field="newEntity.contentTypeId" /> + <field-to-result result-name="contentTypeId" field="newEntity.contentTypeId"/> </simple-method> <simple-method method-name="updateContentType" short-description="Update Content Type"> <make-value entity-name="ContentType" value-field="lookupKeyValue"/> @@ -337,7 +337,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result result-name="contentAssocTypeId" field="newEntity.contentAssocTypeId" /> + <field-to-result result-name="contentAssocTypeId" field="newEntity.contentAssocTypeId"/> </simple-method> <simple-method method-name="updateContentAssocType" short-description="Update Content AssocType"> <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/> @@ -362,7 +362,7 @@ <make-next-seq-id seq-field-name="contentPurposeTypeId" value-field="newEntity"/> </if-empty> <create-value value-field="newEntity"/> - <field-to-result field="newEntity.contentPurposeTypeId" result-name="contentPurposeTypeId" /> + <field-to-result field="newEntity.contentPurposeTypeId" result-name="contentPurposeTypeId"/> </simple-method> <simple-method method-name="updateContentPurposeType" short-description="Update Content PurposeType"> <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/> @@ -557,7 +557,7 @@ <!-- Util --> <simple-method method-name="findAssocContent" short-description="Find associated content"> <set from-field="parameters.contentId" field="queryMap.contentId"/> - <set field="mapKeys" from-field="parameters.mapKeys" /> + <set field="mapKeys" from-field="parameters.mapKeys"/> <field-to-list field="mapKey" list="mapKeys"/> <iterate entry="mapKey" list="mapKeys"> <set from-field="mapKey" field="queryMap.mapKey"/> @@ -714,11 +714,11 @@ </if-not-empty> </simple-method> <simple-method method-name="createTopic" short-description="Create TOPIC type Content"> - <make-value value-field="content" entity-name="Content" /> - <set from-field="parameters.newTopicId" field="content.contentId" /> - <set from-field="parameters.newTopicId" field="content.contentName" /> - <set from-field="parameters.newTopicDescription" field="content.description" /> - <set value="TOPIC" field="content.contentTypeId" /> + <make-value value-field="content" entity-name="Content"/> + <set from-field="parameters.newTopicId" field="content.contentId"/> + <set from-field="parameters.newTopicId" field="content.contentName"/> + <set from-field="parameters.newTopicDescription" field="content.description"/> + <set value="TOPIC" field="content.contentTypeId"/> <now-timestamp field="content.lastModifiedDate"/> <now-timestamp field="content.createdDate"/> @@ -760,7 +760,7 @@ <result-to-field result-name="contentId" field="contentId"/> </call-service> - <field-to-result field="contentId" /> + <field-to-result field="contentId"/> </simple-method> <!-- This method first creates Content, DataResource and ElectronicText, ImageDataResource, etc. entities (if needed) @@ -780,7 +780,7 @@ <set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/> <!-- let's take a guess at what the dataResourceTypeId should be if it is empty --> <if-empty field="persistIn.dataResourceTypeId"> - <log level="info" message="persistIn.drMimeTypeId: ${persistIn.drMimeTypeId}" /> + <log level="info" message="persistIn.drMimeTypeId: ${persistIn.drMimeTypeId}"/> <if-regexp expr="text.*" field="persistIn.drMimeTypeId"> <set field="persistIn.dataResourceTypeId" value="ELECTRONIC_TEXT"/> <else> @@ -788,7 +788,7 @@ </else> </if-regexp> </if-empty> - <log level="info" message="persistIn.dataResourceTypeId: ${persistIn.dataResourceTypeId}" /> + <log level="info" message="persistIn.dataResourceTypeId: ${persistIn.dataResourceTypeId}"/> <call-service service-name="persistContentAndAssoc" in-map-name="persistIn"> <results-to-map map-name="persistOut"/> @@ -839,20 +839,20 @@ <!-- This service ties CommunicationEvent and Content entities together along with the standard from/thruDate fields. --> <simple-method method-name="createCommEventContentAssoc" short-description="Create CommEventContentAssoc"> - <make-value entity-name="CommEventContentAssoc" value-field="commEventContentAssoc" /> + <make-value entity-name="CommEventContentAssoc" value-field="commEventContentAssoc"/> <set-pk-fields value-field="commEventContentAssoc" map="parameters"/> <set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/> <if-empty field="commEventContentAssoc.fromDate"> <now-timestamp field="commEventContentAssoc.fromDate"/> </if-empty> - <create-value value-field="commEventContentAssoc" /> + <create-value value-field="commEventContentAssoc"/> <field-to-result field="commEventContentAssoc.fromDate" result-name="fromDate"/> </simple-method> <!-- This service would primarily be used to update the thruDate field. --> <simple-method method-name="updateCommEventContentAssoc" short-description="Create CommEventContentAssoc"> - <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc" /> + <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc"/> <set-pk-fields value-field="pkCommEventContentAssoc" map="parameters"/> <find-by-primary-key value-field="commEventContentAssoc" map="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> <if-empty field="commEventContentAssoc"> @@ -861,11 +861,11 @@ </add-error> </if-empty> <set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/> - <store-value value-field="commEventContentAssoc" /> + <store-value value-field="commEventContentAssoc"/> </simple-method> <simple-method method-name="removeCommEventContentAssoc" short-description="Delete CommEventContentAssoc"> - <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc" /> + <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc"/> <set-pk-fields value-field="pkCommEventContentAssoc" map="parameters"/> <find-by-primary-key value-field="commEventContentAssoc" map="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> <if-empty field="commEventContentAssoc"> @@ -873,7 +873,7 @@ <fail-message message="CommEventContentAssoc entity not found for removal, communicationEventId: ${parameters.communicationEventId} and contentId: ${parameters.contentId}"/> </add-error> </if-empty> - <remove-value value-field="commEventContentAssoc" /> + <remove-value value-field="commEventContentAssoc"/> </simple-method> <!-- simply use createContent and the accoc will be created too" the service below +aca will create 2 contentAssocs--> @@ -978,7 +978,7 @@ <set field="pubPtContentId" from-field="parameters.pubPtContentId"/> <call-object-method method-name="length" obj-field="parameters.textData" ret-field="textDataLen"/> <log level="info" message="textDataLen:${textDataLen}"/> - <property-to-field resource="forum" property="descriptLen" field="descriptLen" /> + <property-to-field resource="forum" property="descriptLen" field="descriptLen"/> <log level="info" message="descriptLen:${descriptLen}"/> <call-class-method method-name="min" class-name="java.lang.Math" ret-field="subStringLen"> <field field="textDataLen" type="int"/> @@ -1146,8 +1146,8 @@ <simple-method method-name="getSubContentWithPermCheck" short-description="Get sub content and perform permission check on each record"> - <set field="filterByDate" from-field="parameters.filterByDate" default-value="true" type="Boolean" /> - <set field="useCache" from-field="parameters.useCache" default-value="true" type="Boolean" /> + <set field="filterByDate" from-field="parameters.filterByDate" default-value="true" type="Boolean"/> + <set field="useCache" from-field="parameters.useCache" default-value="true" type="Boolean"/> <entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="${filterByDate}" use-cache="${useCache}"> <condition-list combine="and"> <condition-expr field-name="contentIdStart" from-field="parameters.contentId"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Apr 7 08:27:15 2009 @@ -494,8 +494,8 @@ --> <simple-method method-name="getElectronicText" short-description="Get Electronic Text" login-required="false"> - <set field="userLogin" from-field="parameters.userLogin" /> - <set field="currentContent" from-field="parameters.content" /> + <set field="userLogin" from-field="parameters.userLogin"/> + <set field="currentContent" from-field="parameters.content"/> <log level="always" message="GETELECTRONICTEXT, currentContent:${currentContent}"/> <if-empty field="currentContent"> @@ -504,14 +504,14 @@ </if-not-empty> <if-empty field="currentContent"> <add-error> - <fail-message message="Neither content nor contentId supplied." /> + <fail-message message="Neither content nor contentId supplied."/> </add-error> </if-empty> </if-empty> <check-errors/> <if-empty field="currentContent.dataResourceId"> <add-error> - <fail-message message="No dataResourceId found" /> + <fail-message message="No dataResourceId found"/> </add-error> </if-empty> <check-errors/> @@ -521,7 +521,7 @@ </entity-one> <if-empty field="eText"> <add-error> - <fail-message message="Electronic Text not found." /> + <fail-message message="Electronic Text not found."/> </add-error> </if-empty> <check-errors/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Tue Apr 7 08:27:15 2009 @@ -135,7 +135,7 @@ <!-- add to most recently used list --><!-- <make-value entity-name="SubContentDataResourceView" value-field="subContent"/> - <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId" /> + <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId"/> <field-to-field field-name="dataResourceId" to-map-name="subContent" to-field-name="drDataResourceId"/> <log level="always" message="subContent: ${subContent}"/> <log level="always" message="contentId: ${contentId}"/> @@ -231,7 +231,7 @@ <!-- add to most recently used list --><!-- <make-value entity-name="SubContentDataResourceView" value-field="subContent"/> - <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId" /> + <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId"/> <field-to-field field-name="dataResourceId" to-map-name="subContent" to-field-name="drDataResourceId"/> <log level="always" message="subContent: ${subContent}"/> <log level="always" message="contentId: ${contentId}"/> @@ -289,7 +289,7 @@ <!-- add to most recently used list --><!-- <make-value entity-name="SubContentDataResourceView" value-field="subContent"/> - <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId" /> + <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId"/> <field-to-field field-name="dataResourceId" to-map-name="subContent" to-field-name="drDataResourceId"/> <log level="always" message="subContent: ${subContent}"/> <log level="always" message="contentId: ${contentId}"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Apr 7 08:27:15 2009 @@ -127,7 +127,7 @@ <if-empty field="newEntity.fromDate"> <now-timestamp field="nowTimestamp"/> - <set field="newEntity.fromDate" from-field="nowTimestamp" /> + <set field="newEntity.fromDate" from-field="nowTimestamp"/> </if-empty> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/content/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services.xml Tue Apr 7 08:27:15 2009 @@ -27,7 +27,7 @@ <service name="uploadFileInterface" engine="interface"> <description>Contains necessary paramters for all file upload requests via service event handler</description> <attribute name="uploadedFile" type="java.nio.ByteBuffer" mode="IN" optional="true"/> - <attribute name="_uploadedFile_fileName" type="String" mode="IN" optional="true" /> + <attribute name="_uploadedFile_fileName" type="String" mode="IN" optional="true"/> <attribute name="_uploadedFile_contentType" type="String" mode="IN" optional="true"/> </service> @@ -768,7 +768,7 @@ <description>Creates or updates ContentRole</description> <attribute name="partyId" type="String" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="orderCreatedDate" type="Timestamp" mode="IN" optional="true" /> + <attribute name="orderCreatedDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="quantity" type="Integer" mode="IN" optional="false"/> </service> <service name="updateContentSubscriptionByOrder" engine="java" transaction-timeout="7200" auth="true" Modified: ofbiz/trunk/applications/content/servicedef/services_data.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_data.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_data.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_data.xml Tue Apr 7 08:27:15 2009 @@ -30,7 +30,7 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> <attribute name="dataResourceId" type="String" mode="INOUT" optional="true"/> <attribute name="targetOperationList" type="List" mode="IN" optional="true"/> - <attribute name="contentPurposeList" type="List" mode="IN" optional="true" /> + <attribute name="contentPurposeList" type="List" mode="IN" optional="true"/> <attribute name="skipPermissionCheck" type="String" mode="IN" optional="true"/> <attribute name="roleTypeId" type="String" mode="IN" optional="true"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> Modified: ofbiz/trunk/applications/content/servicedef/services_survey.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_survey.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_survey.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_survey.xml Tue Apr 7 08:27:15 2009 @@ -306,19 +306,19 @@ <service name="buildSurveyFromPdf" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="buildSurveyFromPdf" auth="false"> <description>Create a Survey and related entities from AcroForm</description> - <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> - <attribute name="contentId" type="String" mode="IN" optional="true" /> - <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true" /> - <attribute name="surveyName" type="String" mode="IN" optional="true" /> + <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true"/> + <attribute name="contentId" type="String" mode="IN" optional="true"/> + <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true"/> + <attribute name="surveyName" type="String" mode="IN" optional="true"/> <attribute name="surveyId" type="String" mode="INOUT" optional="true"/> </service> <service name="buildSurveyResponseFromPdf" engine="java" transaction-timeout="7200" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="buildSurveyResponseFromPdf" auth="false"> <description>Create a Survey and related entities from AcroForm</description> - <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> - <attribute name="contentId" type="String" mode="IN" optional="true" /> - <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true" /> + <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true"/> + <attribute name="contentId" type="String" mode="IN" optional="true"/> + <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true"/> <attribute name="surveyId" type="String" mode="IN" optional="true"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> <attribute name="surveyResponseId" type="String" mode="INOUT" optional="true"/> @@ -327,42 +327,42 @@ <service name="getAcroFieldsFromPdf" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="getAcroFieldsFromPdf" auth="false"> <description>Get fields from AcroForm</description> - <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> - <attribute name="contentId" type="String" mode="IN" optional="true" /> - <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true" /> + <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true"/> + <attribute name="contentId" type="String" mode="IN" optional="true"/> + <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true"/> <attribute name="acroFieldMap" type="Map" mode="OUT" optional="false"/> </service> <service name="setAcroFieldsFromSurveyResponse" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="setAcroFieldsFromSurveyResponse" auth="false"> <description>Get fields from AcroForm</description> - <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> - <attribute name="contentId" type="String" mode="IN" optional="true" /> - <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true" /> - <attribute name="surveyResponseId" type="String" mode="IN" optional="false" /> - <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="true" /> + <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true"/> + <attribute name="contentId" type="String" mode="IN" optional="true"/> + <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true"/> + <attribute name="surveyResponseId" type="String" mode="IN" optional="false"/> + <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="true"/> </service> <service name="setAcroFields" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="setAcroFields" auth="false"> <description>Get fields from AcroForm</description> - <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> - <attribute name="contentId" type="String" mode="IN" optional="true" /> - <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true" /> + <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true"/> + <attribute name="contentId" type="String" mode="IN" optional="true"/> + <attribute name="inputByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="true"/> <attribute name="acroFieldMap" type="Map" mode="IN" optional="false"/> - <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="true" /> + <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="true"/> </service> <service name="buildPdfFromSurveyResponse" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="buildPdfFromSurveyResponse" auth="false"> <description>Build Pdf From Survey Response</description> - <attribute name="surveyResponseId" type="String" mode="IN" optional="false" /> - <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="false" /> + <attribute name="surveyResponseId" type="String" mode="IN" optional="false"/> + <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="false"/> </service> <service name="buildSurveyQuestionsAndAnswers" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="buildSurveyQuestionsAndAnswers" auth="false"> <description>Build list of questions and answers From Survey Response</description> - <attribute name="surveyResponseId" type="String" mode="IN" optional="false" /> - <attribute name="questionsAndAnswers" type="List" mode="OUT" optional="false" /> + <attribute name="surveyResponseId" type="String" mode="IN" optional="false"/> + <attribute name="questionsAndAnswers" type="List" mode="OUT" optional="false"/> </service> </services> Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Tue Apr 7 08:27:15 2009 @@ -951,7 +951,7 @@ </request-map> <request-map uri="createDataResource"> <security auth="true" https="true"/> - <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="persistDataResource" /> + <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="persistDataResource"/> <response name="success" type="view" value="EditDataResource"/> <response name="ELECTRONIC_TEXT" type="view" value="EditElectronicText"/> <response name="IMAGE_OBJECT" type="view" value="UploadImage"/> @@ -975,7 +975,7 @@ <request-map uri="uploadImage"> <security auth="true" https="true"/> <!-- - <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="uploadImage" /> + <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="uploadImage"/> --> <event invoke="persistContentAndAssoc" path="" type="service"/> <response name="success" type="request" value="UploadImage"/> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Tue Apr 7 08:27:15 2009 @@ -76,19 +76,19 @@ </field> <field name="dataResourceId" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.ContentTemplateTextOnly}" /> - <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.ContentTemplateImageCentered}" /> - <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.ContentTemplateImageLeft}" /> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.ContentTemplateTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.ContentTemplateImageCentered}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.ContentTemplateImageLeft}"/> </drop-down> </field> <field name="ftlContentId" position="1"> - <display description="${ftlContentId}" /> + <display description="${ftlContentId}"/> </field> <field name="contentIdTo" position="2"> - <display description="${contentIdTo}" /> + <display description="${contentIdTo}"/> </field> <field name="ownerContentId" > - <hidden value="${contentIdTo}" /> + <hidden value="${contentIdTo}"/> </field> <field name="contentName"> <text/> @@ -99,7 +99,7 @@ <field name="summaryData" title="${uiLabelMap.ContentBlogSummary}" use-when=""${summaryDataResourceTypeId}".length()>0" id-name="summaryData"> - <textarea rows="8" cols="80" /> + <textarea rows="8" cols="80"/> </field> <field name="textData" id-name="textData"><textarea rows="20" cols="60"/></field> @@ -607,12 +607,12 @@ <submit button-type="button"/> </field> - <field name="MASTER_contentId" ><hidden value="${MASTER_contentId}" /></field> - <field name="MASTER_caContentId" ><hidden value="${MASTER_caContentId}" /></field> - <field name="MASTER_caContentIdTo" ><hidden value="${MASTER_caContentIdTo}" /></field> - <field name="MASTER_caContentAssocTypeId" ><hidden value="${MASTER_caContentAssocTypeId}" /></field> - <field name="MASTER_caFromDate" ><hidden value="${MASTER_caFromDate}" /></field> - <field name="MASTER_drDataResource" ><hidden value="${MASTER_drDataResource}" /></field> + <field name="MASTER_contentId" ><hidden value="${MASTER_contentId}"/></field> + <field name="MASTER_caContentId" ><hidden value="${MASTER_caContentId}"/></field> + <field name="MASTER_caContentIdTo" ><hidden value="${MASTER_caContentIdTo}"/></field> + <field name="MASTER_caContentAssocTypeId" ><hidden value="${MASTER_caContentAssocTypeId}"/></field> + <field name="MASTER_caFromDate" ><hidden value="${MASTER_caFromDate}"/></field> + <field name="MASTER_drDataResource" ><hidden value="${MASTER_drDataResource}"/></field> </form> <form name="EditAddSubContentStuff" target="persistSubContentStuff" title="" type="upload" default-map-name="currentValue" extends="EditAddContentStuff" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml Tue Apr 7 08:27:15 2009 @@ -25,35 +25,35 @@ menu-container-style="button-bar tab-bar" default-selected-style="selected"> <menu-item name="contentPurposeOp" title="${uiLabelMap.PageTitleEditContentPurposeOperation}" > - <link target="EditContentPurposeOperation" target-window="_top" style="tabButton" /> + <link target="EditContentPurposeOperation" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="contentOp" title="${uiLabelMap.PageTitleEditContentOperation}" > - <link target="EditContentOperation" target-window="_top" style="tabButton" /> + <link target="EditContentOperation" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="assocPred" title="${uiLabelMap.PageTitleEditContentAssocPredicate}" > - <link target="EditContentAssocPredicate" target-window="_top" style="tabButton" /> + <link target="EditContentAssocPredicate" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="typeAttr" title="${uiLabelMap.PageTitleEditContentTypeAttribute}" > - <link target="EditContentTypeAttr" target-window="_top" style="tabButton" /> + <link target="EditContentTypeAttr" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="purposeType" title="${uiLabelMap.PageTitleEditContentPurposeType}" > - <link target="EditContentPurposeType" target-window="_top" style="tabButton" /> + <link target="EditContentPurposeType" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="assocType" title="${uiLabelMap.PageTitleEditContentAssocType}" > - <link target="EditContentAssocType" target-window="_top" style="tabButton" /> + <link target="EditContentAssocType" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="type" title="${uiLabelMap.PageTitleEditContentType}" > - <link target="EditContentType" target-window="_top" style="tabButton" /> + <link target="EditContentType" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="userpermissions" title="${uiLabelMap.PageTitleEditContentUserPermissions}" > - <link name="UserPermissions" target="UserPermissions" target-window="_top" style="tabButton" /> + <link name="UserPermissions" target="UserPermissions" target-window="_top" style="tabButton"/> </menu-item> </menu> Modified: ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml Tue Apr 7 08:27:15 2009 @@ -23,28 +23,28 @@ <menu name="dataresourcesetup" default-menu-item-name="content" default-associated-content-id="${userLogin.userLoginId}" title="" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditDataResourceType" title="${uiLabelMap.CommonType}" > - <link target="EditDataResourceType" target-window="_top" style="tabButton" /> + <link target="EditDataResourceType" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="EditCharacterSet" title="${uiLabelMap.ContentCharacterSet}" > - <link target="EditCharacterSet" target-window="_top" style="tabButton" /> + <link target="EditCharacterSet" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="EditDataCategory" title="${uiLabelMap.ContentCategory}" > - <link target="EditDataCategory" target-window="_top" style="tabButton" /> + <link target="EditDataCategory" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="EditDataResourceTypeAttr" title="${uiLabelMap.ContentTypeAttr}" > - <link target="EditDataResourceTypeAttr" target-window="_top" style="tabButton" /> + <link target="EditDataResourceTypeAttr" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="EditFileExtension" title="${uiLabelMap.ContentFileExt}" > - <link target="EditFileExtension" target-window="_top" style="tabButton" /> + <link target="EditFileExtension" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="EditMetaDataPredicate" title="${uiLabelMap.ContentMetaDataPred}" > - <link target="EditMetaDataPredicate" target-window="_top" style="tabButton" /> + <link target="EditMetaDataPredicate" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="EditMimeType" title="${uiLabelMap.ContentMimeType}" > - <link target="EditMimeType" target-window="_top" style="tabButton" /> + <link target="EditMimeType" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="EditMimeTypeHtmlTemplate" title="${uiLabelMap.ContentMimeTypeHtmlTemplate}" > - <link target="EditMimeTypeHtmlTemplate" target-window="_top" style="tabButton" /> + <link target="EditMimeTypeHtmlTemplate" target-window="_top" style="tabButton"/> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Tue Apr 7 08:27:15 2009 @@ -23,7 +23,7 @@ <!-- LayoutFind forms --> <form name="findLayout" default-entity-name="Content" target="FindLayout" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <!--<auto-fields-entity entity-name="Content" default-field-type="find" />--> + <!--<auto-fields-entity entity-name="Content" default-field-type="find"/>--> <field name="contentTypeId"> <hidden value="DOCUMENT"/> </field> @@ -37,13 +37,13 @@ <text-find/> </field> <field name="createdByUserLogin"> - <lookup target-form-name="LookupPerson" /> + <lookup target-form-name="LookupPerson"/> </field> <field name="createdDate"> <date-find/> </field> <field name="lastModifiedByUserLogin"> - <lookup target-form-name="LookupParty" /> + <lookup target-form-name="LookupParty"/> </field> <field name="lastModifiedDate"> <date-find/> @@ -118,8 +118,8 @@ </field> <field name="drMimeTypeId" > <drop-down no-current-selected-key="text/html"> - <option key="text/html" description="${uiLabelMap.ContentHtmlText}" /> - <option key="text/plain" description="${uiLabelMap.ContentPlainText}" /> + <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> + <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> </drop-down> </field> <field name="drDataResourceTypeId" > @@ -132,15 +132,15 @@ </field> <field name="drMimeTypeId" > <drop-down no-current-selected-key="text/html"> - <option key="text/html" description="${uiLabelMap.ContentHtmlText}" /> - <option key="text/plain" description="${uiLabelMap.ContentPlainText}" /> + <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> + <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> </drop-down> </field> <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> <text /> </field> <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"> - <textarea rows="24" cols="80" /> + <textarea rows="24" cols="80"/> </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"> <submit button-type="button"/> @@ -250,7 +250,7 @@ <display description="text/plain"/> </field> <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"> - <textarea rows="24" cols="80" /> + <textarea rows="24" cols="80"/> </field> <field name="createdByUserLogin" position="1"> <display/> @@ -279,7 +279,7 @@ <display description="text/plain"/> </field> <field name="textData" title="${uiLabelMap.ContentText}" > - <textarea rows="24" cols="80" /> + <textarea rows="24" cols="80"/> </field> <field name="createdByUserLogin" position="1"> <display/> @@ -312,7 +312,7 @@ </drop-down> </field> <field name="drObjectInfo" title="${uiLabelMap.FormFieldTitle_imageFileName}"> - <display description="${currentValue.drObjectInfo}" /> + <display description="${currentValue.drObjectInfo}"/> </field> <field name="imageData" entity-name="ImageDataResource" map-name="dummy"> <file /> @@ -343,14 +343,14 @@ </field> <field name="drMimeTypeId" > <drop-down> - <option key="image/gif" description="${uiLabelMap.ContentGIF}" /> - <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}" /> - <option key="image/png" description="${uiLabelMap.ContentPNG}" /> - <option key="image/tiff" description="${uiLabelMap.ContentTIFF}" /> + <option key="image/gif" description="${uiLabelMap.ContentGIF}"/> + <option key="image/jpeg" description="${uiLabelMap.ContentJPEG}"/> + <option key="image/png" description="${uiLabelMap.ContentPNG}"/> + <option key="image/tiff" description="${uiLabelMap.ContentTIFF}"/> </drop-down> </field> <field name="drObjectInfo" title="${uiLabelMap.FormFieldTitle_imageFileName}"> - <display description="${currentValue.drObjectInfo}" /> + <display description="${currentValue.drObjectInfo}"/> </field> <field name="imageData" entity-name="ImageDataResource"> <file /> @@ -436,8 +436,8 @@ </field> <field name="drMimeTypeId"> <drop-down no-current-selected-key="text/html"> - <option key="text/html" description="${uiLabelMap.ContentHtmlText}" /> - <option key="text/plain" description="${uiLabelMap.ContentPlainText}" /> + <option key="text/html" description="${uiLabelMap.ContentHtmlText}"/> + <option key="text/plain" description="${uiLabelMap.ContentPlainText}"/> </drop-down> </field> <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}"> Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml Tue Apr 7 08:27:15 2009 @@ -23,10 +23,10 @@ <menu name="layout" default-menu-item-name="content" default-associated-content-id="${userLogin.userLoginId}" title="" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected"> <menu-item name="ListLayout" title="${uiLabelMap.ContentListOwnCreatedTemplates}" > - <link target="ListLayout" target-window="_top" style="tabButton" /> + <link target="ListLayout" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="FindLayout" title="${uiLabelMap.CommonFind}" > - <link target="FindLayout" target-window="_top" style="tabButton" /> + <link target="FindLayout" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="EditLayout" title="${uiLabelMap.CommonEdit}"> <condition> Modified: ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Tue Apr 7 08:27:15 2009 @@ -51,13 +51,13 @@ <text-find/> </field> <field name="createdByUserLogin"> - <lookup target-form-name="LookupPerson" /> + <lookup target-form-name="LookupPerson"/> </field> <field name="createdDate"> <date-find/> </field> <field name="lastModifiedByUserLogin"> - <lookup target-form-name="LookupParty" /> + <lookup target-form-name="LookupParty"/> </field> <field name="lastModifiedDate"> <date-find/> Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Tue Apr 7 08:27:15 2009 @@ -59,7 +59,7 @@ <if-has-permission permission="CONTENTMGR" action="UPDATE"/> </condition> <widgets> - <include-menu name="cms" location="component://content/webapp/content/cms/CMSMenus.xml" /> + <include-menu name="cms" location="component://content/webapp/content/cms/CMSMenus.xml"/> <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -339,16 +339,16 @@ <widgets> <section> <condition> - <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId" /> + <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId"/> </condition> <widgets> <container style="responseSelected"> - <label text="${rsp.contentName} - ${rsp.description} [${rsp.contentId}]" style="responseheader" /> + <label text="${rsp.contentName} - ${rsp.description} [${rsp.contentId}]" style="responseheader"/> <link text="${uiLabelMap.PartyReply}" target="addForumThreadMessage" style="buttontext"> <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> <parameter param-name="forumId" from-field="parameters.forumId"/> <parameter param-name="forumMessageIdTo" from-field="rsp.contentId"/> - <parameter param-name="contentAssocTypeId" value="RESPONSE" /> + <parameter param-name="contentAssocTypeId" value="RESPONSE"/> </link> <container style="responsetext"> <include-form name="EditForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/> @@ -357,12 +357,12 @@ </widgets> <fail-widgets> <container> - <label text="${rsp.contentName} - ${rsp.description} [${rsp.contentId}]" style="responseheader" /> + <label text="${rsp.contentName} - ${rsp.description} [${rsp.contentId}]" style="responseheader"/> <link text="${uiLabelMap.PartyReply}" target="addForumThreadMessage" style="buttontext"> <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> <parameter param-name="forumId" from-field="parameters.forumId"/> <parameter param-name="forumMessageIdTo" from-field="rsp.contentId"/> - <parameter param-name="contentAssocTypeId" value="RESPONSE" /> + <parameter param-name="contentAssocTypeId" value="RESPONSE"/> </link> <container style="responsetext"> <include-form name="EditForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/> Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Tue Apr 7 08:27:15 2009 @@ -71,8 +71,8 @@ <set field="textData" from-field="electronicText.textData"/> <set field="contentId" from-field="currentValue.contentId"/> <set field="dataResourceId" from-field="parameters.drDataResourceId"/> - <set field="rootForumId" value="WebStoreFORUM" /> - <set field="rootForumId2" value="WebStoreCONTENT" /> + <set field="rootForumId" value="WebStoreFORUM"/> + <set field="rootForumId2" value="WebStoreCONTENT"/> <script location="component://content/webapp/content/WEB-INF/actions/cms/FeaturePrep.groovy"/> <set field="menuContext.contentTarget" value="CMSContentEdit?contentId=${contentId}&drDataResourceId=${dataResourceId}"/> </actions> @@ -147,17 +147,17 @@ <set field="MASTER_caContentAssocTypeId" from-field="parameters.MASTER_caContentAssocTypeId" default-value="${parameters.caContentAssocTypeId}"/> <set field="MASTER_caFromDate" from-field="parameters.MASTER_caFromDate" default-value="${parameters.caFromDate}"/> - <set field="contentId" from-field="MASTER_contentId" /> - <set field="drDataResourceId" from-field="MASTER_drDataResourceId" /> - <set field="caContentIdTo" from-field="MASTER_caContentIdTo" /> - <set field="caContentId" from-field="MASTER_caContentId" /> - <set field="caContentAssocTypeId" from-field="MASTER_caContentAssocTypeId" /> - <set field="caFromDate" from-field="MASTER_caFromDate" /> + <set field="contentId" from-field="MASTER_contentId"/> + <set field="drDataResourceId" from-field="MASTER_drDataResourceId"/> + <set field="caContentIdTo" from-field="MASTER_caContentIdTo"/> + <set field="caContentId" from-field="MASTER_caContentId"/> + <set field="caContentAssocTypeId" from-field="MASTER_caContentAssocTypeId"/> + <set field="caFromDate" from-field="MASTER_caFromDate"/> <script location="component://content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy"/> <set field="currentCMSMenuItemName" value="EditAddContent" to-scope="user"/> - <set field="enableEdit" value="true" /> + <set field="enableEdit" value="true"/> </actions> <widgets> <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> @@ -172,7 +172,7 @@ <section> <widgets> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/> - <include-form name="EditAddContentStuff" location="component://content/webapp/content/cms/CMSForms.xml" /> + <include-form name="EditAddContentStuff" location="component://content/webapp/content/cms/CMSForms.xml"/> <content content-id="${contentId}" enable-edit-name="notfound" edit-request="EditAddSubContent?MASTER_contentId=${MASTER_contentId}&MASTER_caContentIdTo=${MASTER_caContentIdTo}&MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&MASTER_caFromDate=${MASTER_caFromDate}&MASTER_drDataResourceId=${MASTER_drDataResourceId}&caContentIdTo=${caContentIdTo}"/> </widgets> </section> @@ -192,12 +192,12 @@ <set field="targetOperation" value="CONTENT_UPDATE|CONTENT_CREATE|CONTENT_CREATE_SUB"/> <set field="requiredRoles" value="OWNER|BLOG_AUTHOR|BLOG_EDITOR|BLOG_ADMIN|BLOG_PUBLISHER"/> <set field="contentPurposeTypeId" value="ARTICLE"/> - <set field="MASTER_contentId" from-field="parameters.MASTER_contentId" /> - <set field="MASTER_drDataResourceId" from-field="parameters.MASTER_drDataResourceId" /> - <set field="MASTER_caContentIdTo" from-field="parameters.MASTER_caContentIdTo" /> - <set field="MASTER_caContentId" from-field="parameters.MASTER_caContentId" /> - <set field="MASTER_caContentAssocTypeId" from-field="parameters.MASTER_caContentAssocTypeId" /> - <set field="MASTER_caFromDate" from-field="parameters.MASTER_caFromDate" /> + <set field="MASTER_contentId" from-field="parameters.MASTER_contentId"/> + <set field="MASTER_drDataResourceId" from-field="parameters.MASTER_drDataResourceId"/> + <set field="MASTER_caContentIdTo" from-field="parameters.MASTER_caContentIdTo"/> + <set field="MASTER_caContentId" from-field="parameters.MASTER_caContentId"/> + <set field="MASTER_caContentAssocTypeId" from-field="parameters.MASTER_caContentAssocTypeId"/> + <set field="MASTER_caFromDate" from-field="parameters.MASTER_caFromDate"/> <set field="caContentIdTo" from-field="parameters.contentId"/> <set field="caMapKey" from-field="parameters.mapKey"/> @@ -218,7 +218,7 @@ <section> <widgets> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/> - <include-form name="EditAddSubContentStuff" location="component://content/webapp/content/cms/CMSForms.xml" /> + <include-form name="EditAddSubContentStuff" location="component://content/webapp/content/cms/CMSForms.xml"/> </widgets> </section> </container> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Tue Apr 7 08:27:15 2009 @@ -414,7 +414,7 @@ <set field="title" value="List CompDoc"/> <set field="entityName" value="ContentAssocViewFrom"/> <set field="queryString" from-field="result.queryString"/> - <set field="currentContentMenuItemName" value="" /> + <set field="currentContentMenuItemName" value=""/> <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/> </actions> @@ -702,8 +702,8 @@ <!-- <entity-condition entity-name="MaxRevisionItemView" list="rootRevList" use-cache="false" > <condition-list combine="and"> - <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootInstanceContentId" /> - <condition-expr field-name="contentId" operator="equals" env-name="contentId" /> + <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootInstanceContentId"/> + <condition-expr field-name="contentId" operator="equals" env-name="contentId"/> </condition-list> <select-field field-name="rootRevisionContentId"/> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Tue Apr 7 08:27:15 2009 @@ -127,7 +127,7 @@ </entity-one> </actions> <alt-target use-when="currentValue==null" target="createContent"/> - <auto-fields-entity entity-name="Content" /> + <auto-fields-entity entity-name="Content"/> <field use-when="currentValue!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> <field use-when="currentValue==null&&contentId==null" name="contentId"><text/></field> <field use-when="currentValue==null&&contentId!=null" name="contentId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${contentId}]" also-hidden="false"/></field> @@ -180,7 +180,7 @@ <!-- form name="AddContent" target="createContent" title="" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> - <auto-fields-entity entity-name="Content" /> + <auto-fields-entity entity-name="Content"/> <field name="contentId"><text/></field> <field name="dataResourceId" map-name="currentValue"><lookup target-form-name="LookupDataResource"/></field> <field name="contentPurposeTypeId" entity-name="ContentPurposeType" map-name="dummy"> @@ -228,10 +228,10 @@ header-row-style="header-row" default-table-style="basic-table"> <actions> <entity-one entity-name="ContentAssoc" use-cache="true"> - <field-map from-field="contentId" field-name="contentId" /> - <field-map from-field="contentIdTo" field-name="contentIdTo" /> - <field-map from-field="contentAssocTypeId" field-name="contentAssocTypeId" /> - <field-map from-field="fromDate" field-name="fromDate" /> + <field-map from-field="contentId" field-name="contentId"/> + <field-map from-field="contentIdTo" field-name="contentIdTo"/> + <field-map from-field="contentAssocTypeId" field-name="contentAssocTypeId"/> + <field-map from-field="fromDate" field-name="fromDate"/> </entity-one> </actions> <auto-fields-entity entity-name="ContentAssoc"/> @@ -272,7 +272,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ContentAssoc" use-cache="true"> - <field-map from-field="contentId" field-name="contentId" /> + <field-map from-field="contentId" field-name="contentId"/> </entity-and> </actions> <!--auto-fields-entity entity-name="ContentAssoc" default-field-type="display"/--> @@ -304,7 +304,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ContentAssoc" use-cache="true"> - <field-map from-field="contentId" field-name="contentIdTo" /> + <field-map from-field="contentId" field-name="contentIdTo"/> </entity-and> </actions> <field name="contentId"> @@ -337,7 +337,7 @@ header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentRole"/> <field name="contentId" widget-style="buttontext" > - <lookup target-form-name="LookupContent" /> + <lookup target-form-name="LookupContent"/> </field> <field name="partyId" widget-style="buttontext"><lookup target-form-name="LookupPerson"/></field> <field name="roleTypeId"> @@ -360,10 +360,10 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ContentRole" use-cache="true"> - <field-map from-field="contentId" field-name="contentId" /> + <field-map from-field="contentId" field-name="contentId"/> </entity-and> </actions> - <auto-fields-service service-name="updateContentRole" default-field-type="display" /> + <auto-fields-service service-name="updateContentRole" default-field-type="display"/> <field name="thruDate" widget-style="buttontext"><date-time/></field> <field name="thruDate" widget-style="buttontext"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -397,10 +397,10 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ContentPurpose" use-cache="true"> - <field-map from-field="contentId" field-name="contentId" /> + <field-map from-field="contentId" field-name="contentId"/> </entity-and> </actions> - <auto-fields-service service-name="updateContentPurpose" default-field-type="display" /> + <auto-fields-service service-name="updateContentPurpose" default-field-type="display"/> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurpose"> @@ -415,7 +415,7 @@ header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentAttribute"/> <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > - <lookup target-form-name="LookupContent" /> + <lookup target-form-name="LookupContent"/> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -423,10 +423,10 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ContentAttribute" use-cache="true"> - <field-map from-field="contentId" field-name="contentId" /> + <field-map from-field="contentId" field-name="contentId"/> </entity-and> </actions> - <auto-fields-service service-name="updateContentAttribute" default-field-type="display" /> + <auto-fields-service service-name="updateContentAttribute" default-field-type="display"/> <field name="attrValue" widget-style="buttontext"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> @@ -442,7 +442,7 @@ header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createContentMetaData"/> <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > - <lookup target-form-name="LookupContent" /> + <lookup target-form-name="LookupContent"/> </field> <field name="metaDataPredicateId"> <drop-down allow-empty="true"> @@ -460,10 +460,10 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ContentMetaData" use-cache="true"> - <field-map from-field="contentId" field-name="contentId" /> + <field-map from-field="contentId" field-name="contentId"/> </entity-and> </actions> - <auto-fields-service service-name="updateContentMetaData" default-field-type="edit" /> + <auto-fields-service service-name="updateContentMetaData" default-field-type="edit"/> <field name="contentId" widget-style="buttontext"><display/></field> <field name="metaDataPredicateId" widget-style="buttontext"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -514,10 +514,10 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="WorkEffortContent" use-cache="true" list="workEffortContents"> - <field-map from-field="contentId" field-name="contentId" /> + <field-map from-field="contentId" field-name="contentId"/> </entity-and> </actions> - <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit" /> + <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit"/> <field name="workEffortId" widget-style="tabletext"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true"> <sub-hyperlink target="/workeffort/control/EditWorkEffort" description="${workEffortId}" link-style="buttontext" target-type="inter-app"> Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Tue Apr 7 08:27:15 2009 @@ -67,7 +67,7 @@ <menu-item name="purpose" title="${uiLabelMap.FormFieldTitle_purposes}" > <condition> <not> - <if-empty field="currentValue.contentId" /> + <if-empty field="currentValue.contentId"/> </not> </condition> <link target="EditContentPurpose"> Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Tue Apr 7 08:27:15 2009 @@ -204,11 +204,11 @@ <set field="currentContentMenuItemName" value="contentassoc" to-scope="user"/> <set field="extraFunctionName" value="'${uiLabelMap.CommonFrom}'"/> <set field="tabButtonItem" value="association"/> - <set field="contentId" from-field="parameters.contentId" /> - <set field="contentIdTo" from-field="parameters.contentIdTo" /> + <set field="contentId" from-field="parameters.contentId"/> + <set field="contentIdTo" from-field="parameters.contentIdTo"/> <set field="contentAssocTypeId" from-field="parameters.contentAssocTypeId" default-value="${defaultContentAssocTypeId}"/> <set field="contentAssocTypeId" from-field="contentAssocTypeId" to-scope="user"/> - <set field="fromDate" from-field="parameters.fromDate" /> + <set field="fromDate" from-field="parameters.fromDate"/> <entity-one entity-name="Content" value-field="currentValue"/> </actions> <widgets> @@ -307,7 +307,7 @@ <set field="titleProperty" value="PageTitleEditContentRole"/> <set field="tabButtonItem" value="role"/> - <set field="contentId" from-field="parameters.contentId" /> + <set field="contentId" from-field="parameters.contentId"/> <set field="contentRoleTarget" value=""/> <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" from-field="parameters.contentId"/> @@ -332,7 +332,7 @@ <script location="component://content/widget/GetMenuContext.groovy"/> <set field="titleProperty" value="PageTitleEditContentPurpose"/> <set field="tabButtonItem" value="purpose"/> - <set field="contentId" from-field="parameters.contentId" /> + <set field="contentId" from-field="parameters.contentId"/> <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-one> @@ -356,7 +356,7 @@ <script location="component://content/widget/GetMenuContext.groovy"/> <set field="titleProperty" value="PageTitleEditContentAttribute"/> <set field="tabButtonItem" value="attribute"/> - <set field="contentId" from-field="parameters.contentId" /> + <set field="contentId" from-field="parameters.contentId"/> <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-one> @@ -416,7 +416,7 @@ <script location="component://content/widget/GetMenuContext.groovy"/> <set field="titleProperty" value="PageTitleEditContentMetadata"/> <set field="tabButtonItem" value="metaData"/> - <set field="contentId" from-field="parameters.contentId" /> + <set field="contentId" from-field="parameters.contentId"/> <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-one> @@ -440,7 +440,7 @@ <script location="component://content/widget/GetMenuContext.groovy"/> <set field="titleProperty" value="PageTitleEditContentWorkEffort"/> <set field="tabButtonItem" value="workEffort"/> - <set field="contentId" from-field="parameters.contentId" /> + <set field="contentId" from-field="parameters.contentId"/> <entity-one entity-name="Content" value-field="currentValue"> <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-one> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Tue Apr 7 08:27:15 2009 @@ -23,55 +23,55 @@ <menu name="contentsetup" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="adddataresource" title="${uiLabelMap.CommonAdd}" > - <link target="AddDataResource" name="AddDataResource" target-window="_top" style="tabButton" /> + <link target="AddDataResource" name="AddDataResource" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="finddataresource" title="${uiLabelMap.CommonFind}" > - <link target="FindDataResource" name="FindDataResource" target-window="_top" style="tabButton" /> + <link target="FindDataResource" name="FindDataResource" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="browsedataresource" title="${uiLabelMap.ContentBrowse}" > - <link target="BrowseDataResource" name="BrowseDataResource" target-window="_top" style="tabButton" /> + <link target="BrowseDataResource" name="BrowseDataResource" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="editdataresource" title="${uiLabelMap.ContentDataResource}"> <condition disabled-style="buttontextdisabled"> - <not><if-empty field="dataResourceId" /></not> + <not><if-empty field="dataResourceId"/></not> </condition> - <link target="EditDataResource" name="EditDataResource" target-window="_top" style="tabButton" /> + <link target="EditDataResource" name="EditDataResource" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="editelectronictext" title="${uiLabelMap.ContentDataResourceText}" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field="dataResourceId" /></not> + <not><if-empty field="dataResourceId"/></not> </condition> - <link target="EditElectronicText" name="EditElectronicText" target-window="_top" style="tabButton" /> + <link target="EditElectronicText" name="EditElectronicText" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="edithtmltext" title="${uiLabelMap.ContentHtml}" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field="dataResourceId" /></not> + <not><if-empty field="dataResourceId"/></not> </condition> - <link target="EditHtmlText" name="EditHtmlText" target-window="_top" style="tabButton" /> + <link target="EditHtmlText" name="EditHtmlText" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="uploadimage" title="${uiLabelMap.ContentImage}" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field="dataResourceId" /></not> + <not><if-empty field="dataResourceId"/></not> </condition> - <link target="UploadImage" name="UploadImage" target-window="_top" style="tabButton" /> + <link target="UploadImage" name="UploadImage" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="editdataresourceattribute" title="${uiLabelMap.ContentAttribute}" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field="dataResourceId" /></not> + <not><if-empty field="dataResourceId"/></not> </condition> - <link target="EditDataResourceAttribute" name="EditDataResourceAttribute" target-window="_top" style="tabButton" /> + <link target="EditDataResourceAttribute" name="EditDataResourceAttribute" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="editdataresourcerole" title="${uiLabelMap.ContentDataResourceRole}" > <condition disabled-style="buttontextdisabled"> <not><if-empty field="dataResourceId"/></not> </condition> - <link target="EditDataResourceRole" name="EditDataResourceRole" target-window="_top" style="tabButton" /> + <link target="EditDataResourceRole" name="EditDataResourceRole" target-window="_top" style="tabButton"/> </menu-item> <menu-item name="editdataresourceproductfeatures" title="${uiLabelMap.ContentDataResourceProductFeatures}" > <condition disabled-style="buttontextdisabled"> - <not><if-empty field="dataResourceId" /></not> + <not><if-empty field="dataResourceId"/></not> </condition> - <link target="EditDataResourceProductFeatures" name="EditDataResourceProductFeatures" target-window="_top" style="tabButton" /> + <link target="EditDataResourceProductFeatures" name="EditDataResourceProductFeatures" target-window="_top" style="tabButton"/> </menu-item> </menu> <menu name="dataresourceTopMenu" menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem"> Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Tue Apr 7 08:27:15 2009 @@ -189,7 +189,7 @@ <field-map field-name="contentIdTo" from-field="message.contentIdTo"/> <field-map field-name="contentAssocTypeId" value="RESPONSE"/> </entity-and> - <set field="contentAssoc" from-field="contentAssocList[0]" /> + <set field="contentAssoc" from-field="contentAssocList[0]"/> </actions> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> <field name="forumId"><hidden value="${parameters.forumId}"/></field> Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Tue Apr 7 08:27:15 2009 @@ -211,18 +211,18 @@ <screen name="FindForumThreads"> <section> <actions> - <set field="contentId" from-field="parameters.forumId" /> - <set field="responseContentId" from-field="parameters.forumId" /> - <set field="threadContentId" from-field="parameters.threadContentId" default-value="${contentId}" /> - <set field="forumId" from-field="parameters.forumId" /> + <set field="contentId" from-field="parameters.forumId"/> + <set field="responseContentId" from-field="parameters.forumId"/> + <set field="threadContentId" from-field="parameters.threadContentId" default-value="${contentId}"/> + <set field="forumId" from-field="parameters.forumId"/> <entity-one entity-name="Content" value-field="content" use-cache="true"> <field-map field-name="contentId" from-field="contentId"/> </entity-one> - <set field="ownerContentId" from-field="content.ownerContentId" default-value="${forumId}" /> - <set field="trail" from-field="threadContentId" /> + <set field="ownerContentId" from-field="content.ownerContentId" default-value="${forumId}"/> + <set field="trail" from-field="threadContentId"/> <set field="enableEdit" value="false"/> <set field="webPutPt" from-field="parameters.forumGroupId"/> - <set field="rsp.contentName" value="${content.contentName}" /> + <set field="rsp.contentName" value="${content.contentName}"/> <set field="titleProperty" value="PageTitleFindForumMessages"/> <set field="headerItem" value="ForumMessages"/> <set field="tabBar" value="ForumMessagesTabBar"/> @@ -249,7 +249,7 @@ <widgets> <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}"> <decorator-section name="body"> - <include-tree name="MessageTree" location="component://content/widget/forum/ForumTrees.xml" /> + <include-tree name="MessageTree" location="component://content/widget/forum/ForumTrees.xml"/> <section> <condition> <not><if-empty field="parameters.forumThreadId"/></not> Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original) +++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Tue Apr 7 08:27:15 2009 @@ -81,6 +81,6 @@ <EmplLeaveType description="Medical" hasTable="N" parentTypeId="" leaveTypeId="MEDICAL"/> <EmplLeaveType description="Casual" hasTable="N" parentTypeId="" leaveTypeId="CASUAL"/> - <WebSite webSiteId="HR" siteName="Human Resource Manager" visualThemeSetId="BACKOFFICE" /> + <WebSite webSiteId="HR" siteName="Human Resource Manager" visualThemeSetId="BACKOFFICE"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml Tue Apr 7 08:27:15 2009 @@ -47,7 +47,7 @@ <include-form name="FindEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml" /> + <include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml"/> </decorator-section> </decorator-screen> </decorator-section> Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Tue Apr 7 08:27:15 2009 @@ -75,7 +75,7 @@ <set field="titleProperty" value="PageTitleEditEmplPosition"/> <set field="tabButtonItem" value="EditEmplPosition"/> <set field="emplPositionId" from-field="parameters.emplPositionId"/> - <entity-one entity-name="EmplPosition" value-field="emplPosition" /> + <entity-one entity-name="EmplPosition" value-field="emplPosition"/> </actions> <widgets> <decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |