Applied patch from jira issue OFBIZ-3159 - Move geoAutoCompleter.js from ecommerce to ordermgr.
geoAutoCompleter.js currently resides in specialpurpose/ecommerce component. But now it is also used in OrderViewScreen.xml#OrderHeaderView screen. First of all we can't have dependency of ordermgr on ecommerce component. Secondly, if I am developing a custom ecommerce application with mount point /ecommerce, thus overriding specialpurpose/ecommerce webapp, and copying the geoAutoCompleter.js to my custom application (to customize) in a directory structure other than that of specialpurpose/ecommerce, then the JS file is not loaded in OrderHeaderView screen due to change of location. The only reason is the dependency stated above. Hence this change is vital. While doing this change, all the references to geoAutoCompleter.js will need to be updated too. Thanks Arpit for the contribution. Special thanks to Mridul for providing notes for the implementation. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833026 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -74,7 +74,7 @@ under the License.
|
||||
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/validation.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/order.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/OrderShippingInfo.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/geoAutoCompleter.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
|
||||
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/>
|
||||
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy"/>
|
||||
</actions>
|
||||
|
||||
@@ -522,7 +522,7 @@ under the License.
|
||||
<property-map resource="SecurityextUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
<set field="titleProperty" value="PageTitleNewCustomer"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/profile.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/geoAutoCompleter.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
@@ -587,7 +587,7 @@ under the License.
|
||||
|
||||
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/controls.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/profile.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/geoAutoCompleter.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
|
||||
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/>
|
||||
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/>
|
||||
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy"/>
|
||||
|
||||
@@ -618,7 +618,7 @@ under the License.
|
||||
<set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/effects.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/images/prototypejs/controls.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/checkoutProcess.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/geoAutoCompleter.js" global="true"/>
|
||||
<set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
|
||||
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy"/>
|
||||
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/>
|
||||
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/>
|
||||
|
||||
Reference in New Issue
Block a user