You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/04/12 13:02:39 UTC

svn commit: r1791119 - in /ofbiz/branches/release16.11/specialpurpose: ./ bi/widget/BiScreens.xml birt/widget/birt/BirtScreens.xml example/widget/example/CommonScreens.xml

Author: jleroux
Date: Wed Apr 12 13:02:38 2017
New Revision: 1791119

URL: http://svn.apache.org/viewvc?rev=1791119&view=rev
Log:
"Applied fix from trunk plugins for revision: 1791116  " 
------------------------------------------------------------------------
r1791116 | jleroux | 2017-04-12 14:58:38 +0200 (mer. 12 avr. 2017) | 10 lignes

Fixed: The help button or link does not show for the Birt, BI and example 
components
(OFBIZ-9311)

Pricat was also concerned. Unlike hhfacility, I see no reasons why these 
components would use the GlobalDecorator instead of the ApplicationDecorator
(the ApplicationDecorator embeds the GlobalDecorator)

OFBIZ-9312 is a duplicate of this

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


Modified:
    ofbiz/branches/release16.11/specialpurpose/   (props changed)
    ofbiz/branches/release16.11/specialpurpose/bi/widget/BiScreens.xml
    ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml
    ofbiz/branches/release16.11/specialpurpose/example/widget/example/CommonScreens.xml

Propchange: ofbiz/branches/release16.11/specialpurpose/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 12 13:02:38 2017
@@ -11,5 +11,5 @@
 /ofbiz/branches/multitenant20100310/specialpurpose:921280-927264
 /ofbiz/branches/release13.07/specialpurpose:1547657
 /ofbiz/ofbiz-framework/trunk/specialpurpose:1783202,1783388
-/ofbiz/ofbiz-plugins/trunk:1784144
+/ofbiz/ofbiz-plugins/trunk:1784144,1791116
 /ofbiz/trunk/specialpurpose:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/specialpurpose/bi/widget/BiScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/bi/widget/BiScreens.xml?rev=1791119&r1=1791118&r2=1791119&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/bi/widget/BiScreens.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/bi/widget/BiScreens.xml Wed Apr 12 13:02:38 2017
@@ -35,7 +35,7 @@ under the License.
                 <set field="applicationTitle" value="${uiLabelMap.BusinessIntelligenceApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml?rev=1791119&r1=1791118&r2=1791119&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml Wed Apr 12 13:02:38 2017
@@ -45,7 +45,7 @@ under the License.
                 <set field="applicationTitle" value="${uiLabelMap.BirtExampleApplication}" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/branches/release16.11/specialpurpose/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/example/widget/example/CommonScreens.xml?rev=1791119&r1=1791118&r2=1791119&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/example/widget/example/CommonScreens.xml Wed Apr 12 13:02:38 2017
@@ -53,7 +53,7 @@ under the License.
                         <set field="layoutSettings.javaScripts[]" value="/example/js/ExamplePushNotifications.js" global="true"/>
                     </actions>
                 </section>
-                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>