Author: jleroux
Date: Fri Sep 1 12:49:04 2017
New Revision: 1806951
URL: http://svn.apache.org/viewvc?rev=1806951&view=rev
Log:
Fixed: Fix references where Mime type is displayed in HTML encoded pattern
(OFBIZ-9644)
I found various instances where the mimeTypeId is displayed in HTML
encoded pattern over UI.
jleroux: this also removes 2 duplicated fields in AddLayout form
Thanks: Ankit Joshi
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocForms.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentForms.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceForms.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataSetupForms.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/ProjectForms.xml
ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/TaskForms.xml
ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumForms.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml
Fri Sep 1 12:49:04 2017
@@ -462,7 +462,7 @@ under the License.
<field name="description" position="2">
<text size="60"/>
</field>
- <field name="mimeTypeId" position="1">
+ <field name="mimeTypeId" position="1" encode-output="false">
<drop-down allow-empty="true">
<entity-options description="${mimeTypeId} - ${description}"
entity-name="MimeType" key-field-name="mimeTypeId">
<entity-order-by field-name="mimeTypeId"/>
@@ -522,7 +522,7 @@ under the License.
<entity-options entity-name="DataTemplateType"
key-field-name="dataTemplateTypeId"/>
</drop-down>
</field>
- <field name="drMimeTypeId" position="1">
+ <field name="drMimeTypeId" position="1" encode-output="false">
<drop-down allow-empty="true">
<entity-options description="${mimeTypeId} - ${description}"
entity-name="MimeType" key-field-name="mimeTypeId">
<entity-order-by field-name="mimeTypeId"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/widget/compdoc/CompDocForms.xml
Fri Sep 1 12:49:04 2017
@@ -395,7 +395,7 @@ under the License.
<field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}"
use-when=""DOCUMENT".equals(contentTypeId) &&
!"SURVEY".equals(templateDataResourceTypeId)">
<display-entity entity-name="MimeType"/>
</field>
- <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}"
use-when=""TEMPLATE".equals(contentTypeId)"
widget-style="smallSelect">
+ <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}"
use-when=""TEMPLATE".equals(contentTypeId)"
widget-style="smallSelect" encode-output="false">
<drop-down allow-empty="false">
<option key="application/msword"
description="${uiLabelMap.ContentMSWord}"/>
<option key="application/pdf"
description="${uiLabelMap.ContentPDFFile}"/>
@@ -427,7 +427,7 @@ under the License.
<field name="sequenceNum"><text/></field>
<field name="mimeTypeId" map-name="dataResource"
- use-when=""TEMPLATE".equals(contentTypeId)">
+ use-when=""TEMPLATE".equals(contentTypeId)"
encode-output="false">
<drop-down allow-empty="false">
<option key="application/msword"
description="${uiLabelMap.ContentMSWord}"/>
<option key="application/pdf"
description="${uiLabelMap.ContentPDFFile}"/>
@@ -442,7 +442,7 @@ under the License.
</drop-down>
</field>
<field name="mimeTypeId" map-name="dataResource"
- use-when=""DOCUMENT".equals(contentTypeId) &&
mimeTypeId!=null &&
!"application/vnd.ofbiz.survey".equals(mimeTypeId)">
+ use-when=""DOCUMENT".equals(contentTypeId) &&
mimeTypeId!=null &&
!"application/vnd.ofbiz.survey".equals(mimeTypeId)"
encode-output="false">
<display-entity entity-name="MimeType"
key-field-name="mimeTypeId"/>
</field>
<field name="mimeTypeId" map-name="dataResource"
@@ -506,7 +506,7 @@ under the License.
<field name="thruDate"
title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="sequenceNum"
title="${uiLabelMap.CommonSequenceNum}"><display/></field>
- <field name="mimeTypeId" map-name="dataResource"
title="${uiLabelMap.ContentDocumentType}" >
+ <field name="mimeTypeId" map-name="dataResource"
title="${uiLabelMap.ContentDocumentType}" encode-output="false">
<display-entity entity-name="MimeType"
key-field-name="mimeTypeId"/>
</field>
<field name="relatedDetailId" map-name="dataResource"
title="${uiLabelMap.ContentSurvey}"
use-when="dataResource!=null&&"SURVEY".equals(dataResource.getString("dataResourceTypeId"))">
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentForms.xml
Fri Sep 1 12:49:04 2017
@@ -35,7 +35,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="mimeTypeId" position="2">
+ <field name="mimeTypeId" position="2" encode-output="false">
<drop-down allow-empty="true">
<entity-options entity-name="MimeType"
key-field-name="mimeTypeId">
<entity-order-by field-name="description"/>
@@ -94,7 +94,7 @@ under the License.
<field name="statusId" sort-field="true"><display-entity
entity-name="StatusItem"></display-entity></field>
<field name="localeString" sort-field="true"><display-entity
entity-name="CountryCode" key-field-name="countryCode"
description="${countryName}[${countryCode}]"></display-entity></field>
<field name="contentTypeId" sort-field="true"><display-entity
entity-name="ContentType"></display-entity></field>
- <field name="mimeTypeId" sort-field="true"><display-entity
entity-name="MimeType"></display-entity></field>
+ <field name="mimeTypeId" sort-field="true"
encode-output="false"><display-entity
entity-name="MimeType"></display-entity></field>
<field name="dataResourceId"
title="${uiLabelMap.ContentDataResourceId}" use-when="dataResourceId==null"
sort-field="true"><display/></field>
<field name="dataResourceId"
title="${uiLabelMap.ContentDataResourceId}" use-when="dataResourceId!=null"
sort-field="true">
<display-entity entity-name="DataResource"
description="${dataResourceName}">
@@ -137,7 +137,7 @@ under the License.
<field name="statusId"
title="${uiLabelMap.CommonStatus}"><display-entity
entity-name="StatusItem"></display-entity></field>
<field name="localeString"><display-entity entity-name="CountryCode"
key-field-name="countryCode"
description="${countryName}[${countryCode}]"></display-entity></field>
<field name="contentTypeId"
title="${uiLabelMap.ContentType}"><display-entity
entity-name="ContentType"></display-entity></field>
- <field name="mimeTypeId"
title="${uiLabelMap.ContentMimeType}"><display-entity
entity-name="MimeType"></display-entity></field>
+ <field name="mimeTypeId" title="${uiLabelMap.ContentMimeType}"
encode-output="false"><display-entity
entity-name="MimeType"></display-entity></field>
<field name="dataResourceId"
title="${uiLabelMap.FormFieldTitle_dataResourceTitle}"
use-when="dataResourceId==null"><display/></field>
<field name="dataResourceId"
title="${uiLabelMap.FormFieldTitle_dataResourceTitle}"
use-when="dataResourceId!=null">
<display-entity entity-name="DataResource"
key-field-name="dataResourceId" description="${dataResourceName}"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceForms.xml
Fri Sep 1 12:49:04 2017
@@ -145,7 +145,7 @@ under the License.
</field>
<field name="dataResourceName"><display/></field>
<field name="dataResourceTypeId"><display-entity
entity-name="DataResourceType"></display-entity></field>
- <field name="mimeTypeId"><display-entity
entity-name="MimeType"></display-entity></field>
+ <field name="mimeTypeId" encode-output="false"><display-entity
entity-name="MimeType"></display-entity></field>
<field name="statusId"><display-entity
entity-name="StatusItem"></display-entity></field>
<field name="localeString"><display-entity entity-name="CountryCode"
description="${countryName}[${countryCode}]"
key-field-name="countryCode"></display-entity></field>
<field name="createdByUserLogin"><display-entity also-hidden="false"
entity-name="PartyNameView" key-field-name="partyId"
description="${groupName}${firstName} ${lastName}"/></field>
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataSetupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataSetupForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataSetupForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataSetupForms.xml
Fri Sep 1 12:49:04 2017
@@ -243,7 +243,7 @@ under the License.
<form name="CreateMimeTypeHtmlTemplate"
target="createMimeTypeHtmlTemplate" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createMimeTypeHtmlTemplate"/>
- <field name="mimeTypeId">
+ <field name="mimeTypeId" encode-output="false">
<drop-down allow-empty="false">
<entity-options entity-name="MimeType"
key-field-name="mimeTypeId"/>
</drop-down>
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutForms.xml
Fri Sep 1 12:49:04 2017
@@ -111,21 +111,7 @@ under the License.
<option key="ELECTRONIC_TEXT"
description="${uiLabelMap.ContentDataBaseText}"/>
</drop-down>
</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}"/>
- </drop-down>
- </field>
- <field name="drDataResourceTypeId" >
- <drop-down no-current-selected-key="LOCAL_FILE">
- <option key="LOCAL_FILE"
description="${uiLabelMap.ContentAbsoluteFile}"/>
- <option key="OFBIZ_FILE"
description="${uiLabelMap.ContentFileRelToOFBizHome}"/>
- <option key="CONTEXT_FILE"
description="${uiLabelMap.ContentFileRelToWebappRoot}"/>
- <option key="ELECTRONIC_TEXT"
description="${uiLabelMap.ContentDataBaseText}"/>
- </drop-down>
- </field>
- <field name="drMimeTypeId" >
+ <field name="drMimeTypeId" encode-output="false">
<drop-down no-current-selected-key="text/html">
<option key="text/html"
description="${uiLabelMap.ContentHtmlText}"/>
<option key="text/plain"
description="${uiLabelMap.ContentPlainText}"/>
@@ -300,7 +286,7 @@ under the License.
<field name="drDataResourceTypeId" >
<display description="IMAGE_OBJECT"/>
</field>
- <field name="drMimeTypeId" >
+ <field name="drMimeTypeId" encode-output="false">
<drop-down>
<option key="image/gif"
description="${uiLabelMap.ContentGIF}"/>
<option key="image/jpeg"
description="${uiLabelMap.ContentJPEG}"/>
@@ -338,7 +324,7 @@ under the License.
<field name="drDataResourceTypeIdDisplay"
title="${uiLabelMap.FormFieldTitle_drDataResourceTypeId}">
<display description="IMAGE_OBJECT"/>
</field>
- <field name="drMimeTypeId" >
+ <field name="drMimeTypeId" encode-output="false">
<drop-down>
<option key="image/gif"
description="${uiLabelMap.ContentGIF}"/>
<option key="image/jpeg"
description="${uiLabelMap.ContentJPEG}"/>
@@ -430,7 +416,7 @@ under the License.
<entity-options entity-name="DataTemplateType"
key-field-name="dataTemplateTypeId"/>
</drop-down>
</field>
- <field name="drMimeTypeId">
+ <field name="drMimeTypeId" encode-output="false">
<drop-down no-current-selected-key="text/html">
<option key="text/html"
description="${uiLabelMap.ContentHtmlText}"/>
<option key="text/plain"
description="${uiLabelMap.ContentPlainText}"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml
Fri Sep 1 12:49:04 2017
@@ -399,7 +399,7 @@ under the License.
<field name="datetimeStarted"
title="${uiLabelMap.CommonStartDate}"><date-time/></field>
<field name="datetimeEnded"
title="${uiLabelMap.CommonFinishDate}"><date-time/></field>
<field name="subject" title="${uiLabelMap.PartySubject}"><text
size="50"/></field>
- <field name="contentMimeTypeId" position="2">
+ <field name="contentMimeTypeId" position="2" encode-output="false">
<drop-down no-current-selected-key="text/html" allow-empty="false">
<entity-options description="${mimeTypeId}"
entity-name="MimeType" key-field-name="mimeTypeId">
<entity-order-by field-name="mimeTypeId"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
Fri Sep 1 12:49:04 2017
@@ -108,7 +108,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="contentMimeTypeId">
+ <field name="contentMimeTypeId" encode-output="false">
<drop-down no-current-selected-key="text/plain"
allow-empty="false">
<entity-options description="${mimeTypeId}"
entity-name="MimeType" key-field-name="mimeTypeId">
<entity-order-by field-name="mimeTypeId"/>
@@ -753,7 +753,7 @@ under the License.
<field name="fromDate"><date-time
default-value="${nowTimestamp}"/></field>
<field name="thruDate"><date-time/></field>
<field name="sequenceNum"><text/></field>
- <field name="drMimeTypeId" widget-style="smallSelect">
+ <field name="drMimeTypeId" widget-style="smallSelect"
encode-output="false">
<drop-down allow-empty="false">
<option key="application/msword"
description="${uiLabelMap.ContentMSWord}"/>
<option key="application/pdf"
description="${uiLabelMap.ContentPDFFile}"/>
@@ -786,7 +786,7 @@ under the License.
<field name="fromDate"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="sequenceNum"><text/></field>
- <field name="drMimeTypeId">
+ <field name="drMimeTypeId" encode-output="false">
<drop-down allow-empty="false">
<option key="application/msword"
description="${uiLabelMap.ContentMSWord}"/>
<option key="application/pdf"
description="${uiLabelMap.ContentPDFFile}"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
Fri Sep 1 12:49:04 2017
@@ -837,7 +837,7 @@ under the License.
<field name="statusId"><display-entity
entity-name="StatusItem"></display-entity></field>
<field name="localeString"><display-entity entity-name="CountryCode"
key-field-name="countryCode"
description="${countryName}${countryCode}"></display-entity></field>
<field name="contentTypeId"><display-entity
entity-name="ContentType"></display-entity></field>
- <field name="mimeTypeId"><display-entity
entity-name="MimeType"></display-entity></field>
+ <field name="mimeTypeId" encode-output="false"><display-entity
entity-name="MimeType"></display-entity></field>
<field name="dataResourceId"
title="${uiLabelMap.FormFieldTitle_dataResourceName}"
use-when="dataResourceId==null"><display/> </field>
<field name="dataResourceId"
title="${uiLabelMap.FormFieldTitle_dataResourceName}"
use-when="dataResourceId!=null">
<display-entity entity-name="DataResource"
description="${dataResourceName}"/>
Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/ProjectForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/ProjectForms.xml
(original)
+++ ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/ProjectForms.xml Fri Sep
1 12:49:04 2017
@@ -957,7 +957,7 @@
</entity-options>
</drop-down>
</field-->
- <field name="mimeTypeId" >
+ <field name="mimeTypeId" encode-output="false">
<drop-down allow-empty="false">
<entity-options entity-name="MimeType"
key-field-name="mimeTypeId"/>
</drop-down>
Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/TaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/TaskForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/projectmgr/widget/forms/TaskForms.xml Fri Sep 1
12:49:04 2017
@@ -625,7 +625,7 @@
<field name="contentTypeId"><display-entity
entity-name="ContentType"/></field>
<field name="workEffortContentTypeId"><display-entity
entity-name="WorkEffortContentType"/></field>
<field name="fromDate"><display/></field>
- <field name="drMimeTypeId"><display-entity entity-name="MimeType"
key-field-name="mimeTypeId"/></field>
+ <field name="drMimeTypeId" encode-output="false"><display-entity
entity-name="MimeType" key-field-name="mimeTypeId"/></field>
</form>
<form name="ListWorkEffortRequests" type="list"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumForms.xml?rev=1806951&r1=1806950&r2=1806951&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumForms.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumForms.xml Fri Sep 1 12:49:04
2017
@@ -2541,7 +2541,7 @@ under the License.
<entity-options entity-name="ContentType"/>
</drop-down>
</field>
- <field name="mimeTypeId" >
+ <field name="mimeTypeId" encode-output="false">
<drop-down allow-empty="false">
<entity-options entity-name="MimeType"
key-field-name="mimeTypeId"/>
</drop-down>
@@ -2665,7 +2665,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="mimeTypeId" >
+ <field name="mimeTypeId" encode-output="false">
<drop-down allow-empty="false">
<entity-options entity-name="MimeType"
key-field-name="mimeTypeId"/>
</drop-down>