svn commit: r1789666 - in /ofbiz/branches/release16.11: ./ applications/content/widget/content/ContentForms.xml

[jl...@apache.org]

Author: jleroux
Date: Fri Mar 31 12:11:55 2017
New Revision: 1789666

URL: http://svn.apache.org/viewvc?rev=1789666&view=rev
Log:
"Applied fix from trunk framework for revision: 1789665  " 
------------------------------------------------------------------------
r1789665 | jleroux | 2017-03-31 14:10:40 +0200 (ven. 31 mars 2017) | 31 lignes

Fixed: Link in LookupContent causes unwanted behaviour
(OFBIZ-7759)

How to reproduce :
- Log in the Content component
- Go to the Content tab
- In the search form, open the lookup of the field ' Owner Content Id '
- Click on the search button
- In the result list, click on a button link in the column 'Data Resource Id'
- The form to edit the Content will be displayed (a whole OFBiz seems to be 
  accessible from this new page)
- Close the lookup.
- Try to reopen it, it doesn't show anything anymore.


Problem:
1. Lookup dialog for ownerContentId uses "ListLookupContent" form to list 
  Content records.
2. "ListLookupContent" form extends "ListContent" form for all the fields.
3. As fields dataResourceId and ownerContentId are extended fields they creates 
  a link to Edit pages.
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 links to Edit page. If links 
are removed there will not be the problem as well.
Apart from that added 'widget-style="smallSubmit"' to contentId according to 
the uniform pattern followed.
Link to edit ownerContentId shows contentId in description rather than 
ownerContentId in "ListLookupContent" form , updated that too.

Thanks: Florian Montalbano for report and Aditya Sharma for patch
------------------------------------------------------------------------


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

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 31 12:11:55 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
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665
 /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/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml?rev=1789666&r1=1789665&r2=1789666&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/release16.11/applications/content/widget/content/ContentForms.xml Fri Mar 31 12:11:55 2017
@@ -103,10 +103,11 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="ownerContentId" sort-field="true">
+        <field name="ownerContentId" use-when="ownerContentId==null" sort-field="true"><display/></field>
+        <field name="ownerContentId" use-when="ownerContentId!=null" sort-field="true">
             <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
-                <sub-hyperlink target="editContent" description="[${contentId}]" link-style="buttontext">
-                    <parameter param-name="contentId"/>
+                <sub-hyperlink target="editContent" description="[${ownerContentId}]" link-style="buttontext">
+                    <parameter param-name="contentId" value="${ownerContentId}"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
@@ -122,11 +123,17 @@ under the License.
             <set field="parameters.sortField" from-field="parameters.sortField" default-value="contentId"/>
             <call-parent-actions/>
         </actions>
-        <field name="contentId">
+        <field name="contentId" widget-style="smallSubmit">
             <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentName"><display/></field>
         <field name="mimeTypeId"><display/></field>
+        <field name="dataResourceId" use-when="dataResourceId!=null" title="${uiLabelMap.ContentDataResourceId}" sort-field="true">
+            <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">
+            <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>