svn commit: r1789876 - in /ofbiz/branches/release15.12: ./ applications/content/widget/content/ContentForms.xml

Author: jleroux
Date: Sun Apr  2 12:12:37 2017
New Revision: 1789876

URL: http://svn.apache.org/viewvc?rev=1789876&view=rev
Log:
"Applied fix from trunk framework for revision: 1789874  "
------------------------------------------------------------------------
r1789874 | jleroux | 2017-04-02 14:11:44 +0200 (dim. 02 avr. 2017) | 29 lignes

Fixed: Sort Links in Lookup for Owner Content Id causes unwanted behaviour on
Find Content page
(OFBIZ-9279)

How to reproduce :
1. Log in the Content component
2. Go to the Content tab. https://localhost:8443/content/control/findContent
3. In the search form, open the lookup of the field ' Owner Content Id '
4. Click on any of the table header links to sort the table. Results will be
displayed on a new unstyled window closing the Lookup dialog.

Problem:
1. Lookup dialog for ownerContentId uses "ListLookupContent" form to list
   Content records.
2. "ListLookupContent" form extends "ListContent" form for all the fields.
3. Sort-field is set to true in "ListContent" form for all the fields.
4. Sort-field adds <a> hyperlink to "LookupContent" .
5. When clicked <a> link it moves to a new page and doesn't renders the response
   in the Lookup dialog.

Solution:
First of all it is a lookup to select ownerContentId so as the pattern followed
 in other lookups in OFBiz it should not have any sort-fields.
To set it false, it should be overridden. If all fields needs to be overridden
it is better not to extend "ListContent" form and add these fields right away.
Apart from that added 'header-row-style="header-row-2"' to form.


Thanks: Aditya Sharma
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/content/widget/content/ContentForms.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr  2 12:12:37 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
+/ofbiz/ofbiz-framework/trunk:1786214,1786525,1787176,1789665,1789863,1789874
 /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/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/content/ContentForms.xml?rev=1789876&r1=1789875&r2=1789876&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/release15.12/applications/content/widget/content/ContentForms.xml Sun Apr  2 12:12:37 2017
@@ -117,25 +117,35 @@ under the License.
 
     <form name="LookupContent" target="LookupContent" title="" type="single" extends="FindContent" header-row-style="header-row" default-table-style="basic-table"/>
 
-    <form name="ListLookupContent" extends="ListContent" type="list" list-name="listIt" paginate-target="LookupContent"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+    <form name="ListLookupContent" type="list" list-name="listIt" paginate-target="LookupContent"
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <set field="parameters.sortField" from-field="parameters.sortField" default-value="contentId"/>
-            <call-parent-actions/>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" value="Content"/>
+                <field-map field-name="orderBy" from-field="parameters.sortField"/>
+                <field-map field-name="viewIndex" from-field="viewIndex"/>
+                <field-map field-name="viewSize" from-field="viewSize"/>
+            </service>
         </actions>
         <field name="contentId" widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
         </field>
         <field name="contentName"><display/></field>
-        <field name="mimeTypeId"><display/></field>
-        <field name="dataResourceId" use-when="dataResourceId!=null" title="${uiLabelMap.ContentDataResourceId}" sort-field="true">
+        <field name="description"><display/></field>
+        <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="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}"/>
          </field>
-        <field name="ownerContentId" use-when="ownerContentId!=null" title="${uiLabelMap.FormFieldTitle_ownerContentId}" sort-field="true">
+        <field name="ownerContentId" use-when="ownerContentId==null" title="${uiLabelMap.FormFieldTitle_ownerContentId}"><display/></field>
+        <field name="ownerContentId" use-when="ownerContentId!=null" title="${uiLabelMap.FormFieldTitle_ownerContentId}">
             <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}"/>
         </field>
-        <field name="createdByUserLogin"><ignored/></field>
-        <on-event-update-area event-type="paginate" area-id="search-results" area-target=""/>
     </form>
 
     <form name="EditContent" target="updateContent" title="" type="single" default-map-name="currentValue"