svn commit: r1806954 - in /ofbiz/branches/release15.12: ./ 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:51:43 2017
New Revision: 1806954

URL: http://svn.apache.org/viewvc?rev=1806954&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/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/content/widget/cms/CMSForms.xml
    ofbiz/branches/release15.12/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/branches/release15.12/applications/content/widget/content/ContentForms.xml
    ofbiz/branches/release15.12/applications/content/widget/content/DataResourceForms.xml
    ofbiz/branches/release15.12/applications/content/widget/datasetup/DataSetupForms.xml
    ofbiz/branches/release15.12/applications/content/widget/layout/LayoutForms.xml
    ofbiz/branches/release15.12/applications/marketing/widget/ContactListForms.xml
    ofbiz/branches/release15.12/applications/party/widget/partymgr/CommunicationEventForms.xml
    ofbiz/branches/release15.12/applications/party/widget/partymgr/PartyForms.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  1 12:51:43 2017
@@ -9,5 +9,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1786214,1786525,1787176,1789665,1789863,1789874,1791342,1791634,1796262,1798803,1798808,1799327,1800250,1804319,1805143,1805558
+/ofbiz/ofbiz-framework/trunk:1786214,1786525,1787176,1789665,1789863,1789874,1791342,1791634,1796262,1798803,1798808,1799327,1800250,1804319,1805143,1805558,1806951
 /ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179,1761492,1761618,1761678,1761978,1762331,1762738,1765017,1765038,1765104,1766074,1770481,1772346,1775441,1779724,1782520

Modified: ofbiz/branches/release15.12/applications/content/widget/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/cms/CMSForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/widget/cms/CMSForms.xml (original)
+++ ofbiz/branches/release15.12/applications/content/widget/cms/CMSForms.xml Fri Sep  1 12:51:43 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/release15.12/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/compdoc/CompDocForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/branches/release15.12/applications/content/widget/compdoc/CompDocForms.xml Fri Sep  1 12:51:43 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/release15.12/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/content/ContentForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/release15.12/applications/content/widget/content/ContentForms.xml Fri Sep  1 12:51:43 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/release15.12/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/content/DataResourceForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/branches/release15.12/applications/content/widget/content/DataResourceForms.xml Fri Sep  1 12:51:43 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/release15.12/applications/content/widget/datasetup/DataSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/datasetup/DataSetupForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/widget/datasetup/DataSetupForms.xml (original)
+++ ofbiz/branches/release15.12/applications/content/widget/datasetup/DataSetupForms.xml Fri Sep  1 12:51:43 2017
@@ -242,7 +242,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/release15.12/applications/content/widget/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/layout/LayoutForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/widget/layout/LayoutForms.xml (original)
+++ ofbiz/branches/release15.12/applications/content/widget/layout/LayoutForms.xml Fri Sep  1 12:51:43 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/release15.12/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/marketing/widget/ContactListForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/branches/release15.12/applications/marketing/widget/ContactListForms.xml Fri Sep  1 12:51:43 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/release15.12/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/branches/release15.12/applications/party/widget/partymgr/CommunicationEventForms.xml Fri Sep  1 12:51:43 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"/>
@@ -761,7 +761,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}"/>
@@ -794,7 +794,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/release15.12/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/party/widget/partymgr/PartyForms.xml?rev=1806954&r1=1806953&r2=1806954&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/release15.12/applications/party/widget/partymgr/PartyForms.xml Fri Sep  1 12:51:43 2017
@@ -835,7 +835,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}"/>