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 4e563a6 Fixed: showHelp not working (OFBIZ-11803)
4e563a6 is described below
commit 4e563a67ff49f8fbb866ba6fd48e8ac3f4ee7c5b
Author: James Yong <jamesy...@apache.org>
AuthorDate: Sat Jun 6 19:49:26 2020 +0800
Fixed: showHelp not working (OFBIZ-11803)
Fixed Navigation tree is not displayed in showHelp page.
---
applications/content/template/content/DisplayContentNav.ftl | 4 ++--
framework/common/widget/HelpScreens.xml | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/applications/content/template/content/DisplayContentNav.ftl
b/applications/content/template/content/DisplayContentNav.ftl
index 0f1f2ac..e7ed363 100644
--- a/applications/content/template/content/DisplayContentNav.ftl
+++ b/applications/content/template/content/DisplayContentNav.ftl
@@ -16,8 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-
-<script type="application/javascript"
src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script>
+<script data-import="head" type="application/javascript"
src="/common/js/util/OfbizUtil.js"></script>
+<script data-import="head" type="application/javascript"
src="/common/js/jquery/plugins/jsTree/jquery.jstree.js"></script>
<script type="application/javascript">
<#-- some labels are not unescaped in the JSON object so we have to do this
manuely -->
diff --git a/framework/common/widget/HelpScreens.xml
b/framework/common/widget/HelpScreens.xml
index 0eaf2d3..53785b2 100644
--- a/framework/common/widget/HelpScreens.xml
+++ b/framework/common/widget/HelpScreens.xml
@@ -37,6 +37,12 @@ under the License.
<screen name="ShowHelp">
<section>
+ <actions>
+ <set field="layoutSettings.javaScripts[]"
value="/common/js/jquery/jquery-3.4.1.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/common/js/jquery/jquery-migrate-3.0.0.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/common/js/jquery/plugins/browser-plugin/jquery.browser-0.1.0.min.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/common/js/jquery/ui/jquery-ui-1.12.1.min.js" global="true"/>
+ </actions>
<widgets>
<include-screen name="MinimalActions"
location="component://common/widget/CommonScreens.xml"/>
<include-screen name="ShowHelp"
location="${groovy:commonScreenLocations.ShowHelp?commonScreenLocations.ShowHelp:commonDecoratorLocation}"/>
