svn commit: r1806953 - in /ofbiz/branches/release16.11: ./ applications/content/widget/cms/ applications/content/widget/compdoc/ applications/content/widget/content/ applications/content/widget/datasetup/ applications/content/widget/layout/ application...

Author: jleroux
Date: Fri Sep  1 12:50:26 2017
New Revision: 1806953

URL: http://svn.apache.org/viewvc?rev=1806953&view=rev
Log:
"Applied fix from trunk framework for revision: 1806951"
------------------------------------------------------------------------
r1806951 | jleroux | 2017-09-01 14:49:04 +0200 (ven., 01 sept. 2017) | 9 lines

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/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/content/widget/cms/CMSForms.xml
    ofbiz/branches/release16.11/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml
    ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml
    ofbiz/branches/release16.11/applications/content/widget/datasetup/DataSetupForms.xml
    ofbiz/branches/release16.11/applications/content/widget/layout/LayoutForms.xml
    ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml
    ofbiz/branches/release16.11/applications/party/widget/partymgr/CommunicationEventForms.xml
    ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  1 12:50:26 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/content/widget/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/cms/CMSForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/cms/CMSForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/cms/CMSForms.xml Fri Sep  1 12:50:26 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/branches/release16.11/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/compdoc/CompDocForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/compdoc/CompDocForms.xml Fri Sep  1 12:50:26 2017
@@ -395,7 +395,7 @@ under the License.
         <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; !&quot;SURVEY&quot;.equals(templateDataResourceTypeId)">
             <display-entity entity-name="MimeType"/>
         </field>
-        <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when="&quot;TEMPLATE&quot;.equals(contentTypeId)" widget-style="smallSelect">
+        <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when="&quot;TEMPLATE&quot;.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="&quot;TEMPLATE&quot;.equals(contentTypeId)">
+            use-when="&quot;TEMPLATE&quot;.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="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; mimeTypeId!=null &amp;&amp; !&quot;application/vnd.ofbiz.survey&quot;.equals(mimeTypeId)">
+            use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; mimeTypeId!=null &amp;&amp; !&quot;application/vnd.ofbiz.survey&quot;.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&amp;&amp;&quot;SURVEY&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))">

Modified: ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml Fri Sep  1 12:50:26 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/branches/release16.11/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml Fri Sep  1 12:50:26 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/branches/release16.11/applications/content/widget/datasetup/DataSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/datasetup/DataSetupForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/datasetup/DataSetupForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/datasetup/DataSetupForms.xml Fri Sep  1 12:50:26 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/branches/release16.11/applications/content/widget/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/layout/LayoutForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/layout/LayoutForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/layout/LayoutForms.xml Fri Sep  1 12:50:26 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/branches/release16.11/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml Fri Sep  1 12:50:26 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/branches/release16.11/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/CommunicationEventForms.xml Fri Sep  1 12:50:26 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/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml?rev=1806953&r1=1806952&r2=1806953&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyForms.xml Fri Sep  1 12:50:26 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}"/>