[ofbiz-framework] branch trunk updated: Improved: Apply multi-block attr to each application (OFBIZ-11706)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] branch trunk updated: Improved: Apply multi-block attr to each application (OFBIZ-11706)

James Yong-2
This is an automated email from the ASF dual-hosted git repository.

jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ac54134  Improved: Apply multi-block attr to each application (OFBIZ-11706)
ac54134 is described below

commit ac541342aeddda3845e46b9310993dc14224d145
Author: James Yong <[hidden email]>
AuthorDate: Thu May 21 00:07:36 2020 +0800

    Improved: Apply multi-block attr to each application (OFBIZ-11706)
   
    Revert regression for showHelp.
---
 themes/common-theme/template/includes/LookupFooter.ftl | 1 +
 themes/common-theme/widget/CommonScreens.xml           | 2 +-
 themes/common-theme/widget/HelpScreens.xml             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/common-theme/template/includes/LookupFooter.ftl b/themes/common-theme/template/includes/LookupFooter.ftl
index 638bbdf..1c9f388 100644
--- a/themes/common-theme/template/includes/LookupFooter.ftl
+++ b/themes/common-theme/template/includes/LookupFooter.ftl
@@ -17,4 +17,5 @@ specific language governing permissions and limitations
 under the License.
 -->
   </body>
+  <@scriptTemplateList/>
 </html>
diff --git a/themes/common-theme/widget/CommonScreens.xml b/themes/common-theme/widget/CommonScreens.xml
index b02d774..a7655d4 100644
--- a/themes/common-theme/widget/CommonScreens.xml
+++ b/themes/common-theme/widget/CommonScreens.xml
@@ -368,7 +368,7 @@ under the License.
                                 <if-compare value="layer" operator="not-equals" field="parameters.presentation"/>
                         </condition>
                             <widgets>
-                                <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Lookup.ftl" /></html></platform-specific>
+                                <platform-specific><html><html-template location="component://common-theme/template/includes/Lookup.ftl" /></html></platform-specific>
                             </widgets>
                         </section>
                         <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific>
diff --git a/themes/common-theme/widget/HelpScreens.xml b/themes/common-theme/widget/HelpScreens.xml
index 0c9563c..7385377 100644
--- a/themes/common-theme/widget/HelpScreens.xml
+++ b/themes/common-theme/widget/HelpScreens.xml
@@ -30,7 +30,7 @@ under the License.
                 <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC" default-value="component://common-theme/template/includes/Messages.ftl"/>
             </actions>
             <widgets>
-                <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/Lookup.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://common-theme/template/includes/Lookup.ftl"/></html></platform-specific>
                 <platform-specific><html><html-template multi-block="true" location="${messagesTemplateLocation}"/></html></platform-specific>
                 <container style="contentarea">
                     <container id="column-container">