Author: jleroux
Date: Fri Sep 1 12:53:15 2017 New Revision: 1806956 URL: http://svn.apache.org/viewvc?rev=1806956&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/release14.12/ (props changed) ofbiz/branches/release14.12/applications/content/widget/cms/CMSForms.xml ofbiz/branches/release14.12/applications/content/widget/compdoc/CompDocForms.xml ofbiz/branches/release14.12/applications/content/widget/content/ContentForms.xml ofbiz/branches/release14.12/applications/content/widget/content/DataResourceForms.xml ofbiz/branches/release14.12/applications/content/widget/datasetup/DataSetupForms.xml ofbiz/branches/release14.12/applications/content/widget/layout/LayoutForms.xml ofbiz/branches/release14.12/applications/marketing/widget/ContactListForms.xml ofbiz/branches/release14.12/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyForms.xml Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 1 12:53:15 2017 @@ -9,5 +9,5 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 /ofbiz/branches/release15.12:1745714,1746426,1757966,1758998,1759028,1791477 -/ofbiz/ofbiz-framework/trunk:1786214,1786525,1787176,1789665,1789863,1789874,1791342,1791634,1796262,1798803,1798808,1799327,1800250 +/ofbiz/ofbiz-framework/trunk:1786214,1786525,1787176,1789665,1789863,1789874,1791342,1791634,1796262,1798803,1798808,1799327,1800250,1806951 /ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569-1686570,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,17065 69,1706577,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,17 44396,1744662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759005,1759014,1759024,1759678,1759941,1760406,1761127,1761170,1761179,1761492,1761618,1761678,1761978,1762331,1762738,1765017,1765038,1765104,1766074,1770481,1772346,1775441,1779724 Modified: ofbiz/branches/release14.12/applications/content/widget/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/cms/CMSForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/content/widget/cms/CMSForms.xml (original) +++ ofbiz/branches/release14.12/applications/content/widget/cms/CMSForms.xml Fri Sep 1 12:53:15 2017 @@ -466,7 +466,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"/> @@ -526,7 +526,7 @@ under the License. <entity-options description="${description}" 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/release14.12/applications/content/widget/compdoc/CompDocForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/compdoc/CompDocForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/content/widget/compdoc/CompDocForms.xml (original) +++ ofbiz/branches/release14.12/applications/content/widget/compdoc/CompDocForms.xml Fri Sep 1 12:53:15 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" description="${description}"/> </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" description="${description}"/> </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" description="${description}"/> </field> <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}" use-when="dataResource!=null&&"SURVEY".equals(dataResource.getString("dataResourceTypeId"))"> Modified: ofbiz/branches/release14.12/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/content/ContentForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/release14.12/applications/content/widget/content/ContentForms.xml Fri Sep 1 12:53:15 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 description="${description}" 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/release14.12/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/content/DataResourceForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/branches/release14.12/applications/content/widget/content/DataResourceForms.xml Fri Sep 1 12:53:15 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/release14.12/applications/content/widget/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/datasetup/DataSetupForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/content/widget/datasetup/DataSetupForms.xml (original) +++ ofbiz/branches/release14.12/applications/content/widget/datasetup/DataSetupForms.xml Fri Sep 1 12:53:15 2017 @@ -244,7 +244,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" description="${description}" key-field-name="mimeTypeId"/> </drop-down> Modified: ofbiz/branches/release14.12/applications/content/widget/layout/LayoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/layout/LayoutForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/content/widget/layout/LayoutForms.xml (original) +++ ofbiz/branches/release14.12/applications/content/widget/layout/LayoutForms.xml Fri Sep 1 12:53:15 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}"/> @@ -431,7 +417,7 @@ under the License. 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/release14.12/applications/marketing/widget/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/marketing/widget/ContactListForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/marketing/widget/ContactListForms.xml (original) +++ ofbiz/branches/release14.12/applications/marketing/widget/ContactListForms.xml Fri Sep 1 12:53:15 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/release14.12/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/branches/release14.12/applications/party/widget/partymgr/CommunicationEventForms.xml Fri Sep 1 12:53:15 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/release14.12/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyForms.xml?rev=1806956&r1=1806955&r2=1806956&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/release14.12/applications/party/widget/partymgr/PartyForms.xml Fri Sep 1 12:53:15 2017 @@ -662,7 +662,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}"/> |
Free forum by Nabble | Edit this page |