svn commit: r1806037 - in /ofbiz/branches/release16.11: ./ applications/content/widget/content/DataResourceForms.xml applications/content/widget/datasetup/DataSetupForms.xml

Author: jleroux
Date: Thu Aug 24 12:58:13 2017
New Revision: 1806037

URL: http://svn.apache.org/viewvc?rev=1806037&view=rev
Log:
"Applied fix from trunk framework for revision: 1806036"
------------------------------------------------------------------------
r1806036 | jleroux | 2017-08-24 14:57:40 +0200 (jeu., 24 août 2017) | 22 lines

Fixed: MimeType displayed in HTML encoded pattern
(OFBIZ-9621)

Steps to Regenerate –
1) Go to Content/DataResourceSetup and select File Ext tab.
2) Create or Update File ext with Mime Types available in the drop-down.
Result: File Ext created or updated with selected Mime Type but Mime Type
displayed in HTML Encoded pattern.

This issue also exists on Create DataResource page.

jleroux: checking with trunk demo I did not find it on "Create DataResource page"
(content/control/EditDataResource) nor in the Search options) of
"Find Data Resource" (content/control/findDataResource)
But in the list of this find page and also in Navigate for template
(content/control/navigateDataResource)
Anyway the patch fixed all the cases I found.

I think there are more cases like that but I can't remember where.

Thanks: Ankit Joshi

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml
    ofbiz/branches/release16.11/applications/content/widget/datasetup/DataSetupForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 24 12:58:13 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
+/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
 /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/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml?rev=1806037&r1=1806036&r2=1806037&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/content/DataResourceForms.xml Thu Aug 24 12:58:13 2017
@@ -33,7 +33,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 description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId">
                     <entity-order-by field-name="mimeTypeId"/>
@@ -89,7 +89,7 @@ under the License.
             </display-entity>
         </field>
         <field name="dataResourceTypeId" sort-field="true"><display-entity entity-name="DataResourceType"></display-entity></field>
-        <field name="mimeTypeId" sort-field="true"><display-entity entity-name="MimeType"></display-entity></field>
+        <field name="mimeTypeId" encode-output="false" sort-field="true"><display-entity entity-name="MimeType"></display-entity></field>
         <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" description="${countryName}[${countryCode}]" key-field-name="countryCode"></display-entity></field>
         <field name="createdByUserLogin" sort-field="true"><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=1806037&r1=1806036&r2=1806037&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/datasetup/DataSetupForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/datasetup/DataSetupForms.xml Thu Aug 24 12:58:13 2017
@@ -150,7 +150,7 @@ under the License.
     <form name="AddFileExtension" target="addFileExtension" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createFileExtension"/>
-        <field name="mimeTypeId" title=" ">
+        <field name="mimeTypeId" title=" " encode-output="false">
             <drop-down allow-empty="false">
                 <entity-options
                     entity-name="MimeType" key-field-name="mimeTypeId"/>
@@ -169,7 +169,7 @@ under the License.
         <field name="fileExtensionId">
             <display/>
         </field>
-        <field name="mimeTypeId" title=" ">
+        <field name="mimeTypeId" title=" " encode-output="false">
             <drop-down allow-empty="false">
                 <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>