[ofbiz-framework] branch trunk updated: Improved: multi-block attribute for html-template tag (OFBIZ-11686)

[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 17e2ded  Improved: multi-block attribute for html-template tag (OFBIZ-11686)
17e2ded is described below

commit 17e2ded1cc2daf96d88c0b995d2a64023de6d2bf
Author: James Yong <[hidden email]>
AuthorDate: Sat Sep 19 10:04:18 2020 +0800

    Improved: multi-block attribute for html-template tag (OFBIZ-11686)
   
    Move getJs and js request mapping out of "AJAX events" comments block
---
 .../common/webcommon/WEB-INF/common-controller.xml | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/framework/common/webcommon/WEB-INF/common-controller.xml b/framework/common/webcommon/WEB-INF/common-controller.xml
index 1142a2d..a2dd12a 100644
--- a/framework/common/webcommon/WEB-INF/common-controller.xml
+++ b/framework/common/webcommon/WEB-INF/common-controller.xml
@@ -233,7 +233,19 @@ under the License.
     <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
     <request-map uri="LookupGeoName"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeoName"/></request-map>
     <request-map uri="LookupLocale"><security https="true" auth="true"/><response name="success" type="view" value="LookupLocale"/></request-map>
-    
+
+    <!-- Get Js derived from HTML Template -->
+    <request-map uri="getJs" method="get" track-serverhit="false">
+        <security https="false" auth="false"/>
+        <response name="success" type="request" value="js"/>
+        <response name="error" type="request" value="js"/>
+    </request-map>
+    <request-map uri="js">
+        <security direct-request="false"/>
+        <event type="java" path="org.apache.ofbiz.common.CommonEvents" invoke="jsResponseFromRequest"/>
+        <response name="success" type="none"/>
+    </request-map>
+
     <!--========================== AJAX events =====================-->
     <!-- Get states related to a country -->
     <request-map uri="getAssociatedStateList">
@@ -324,17 +336,6 @@ under the License.
         <response name="error" type="request" value="json"/>
     </request-map>
 
-    <request-map uri="getJs" method="get" track-serverhit="false">
-        <security https="false" auth="false"/>
-        <response name="success" type="request" value="js"/>
-        <response name="error" type="request" value="js"/>
-    </request-map>
-    <request-map uri="js">
-        <security direct-request="false"/>
-        <event type="java" path="org.apache.ofbiz.common.CommonEvents" invoke="jsResponseFromRequest"/>
-        <response name="success" type="none"/>
-    </request-map>
-
     <!--========================== AJAX events =====================-->
 
     <!-- View Mappings -->