Author: jleroux
Date: Mon Jul 21 07:40:51 2014
New Revision: 1612204
URL: http://svn.apache.org/r1612204
Log:
"Applied fix from trunk for revision: 1612202" (conflict on ordermgr js files
handled by hand)
------------------------------------------------------------------------
r1612202 | jleroux | 2014-07-21 09:32:10 +0200 (lun. 21 juil. 2014) | 7 lignes
Since we removed the specialpurpose components (but ecommerce), there was an
issue with ordermgr js scripts.
The problem was double. It'd have been easy to add the missing "/js:" patch in
allowedPaths in the web.xml of birt component from where the js scripts are now
expected to be loaded in trunk.
But then you would need to also copy the js scripst there (in birt component).
You could not simply move them because for upcoming branches we also need them
in ordermgr component (they were there in images/js) else they would miss again.
This commit rather adds them under a simple ordermgr-js new webapp (simple, ie
like framework/images, only to load resources) under commonext:
applications/commonext/webapp/ordermgr-js to prevent the duplication
maintenance hazards.
------------------------------------------------------------------------
Added:
ofbiz/branches/release13.07/applications/commonext/webapp/ordermgr-js/
- copied from r1612202,
ofbiz/trunk/applications/commonext/webapp/ordermgr-js/
Removed:
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/images/
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml
ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderReturnScreens.xml
ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml
ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CustomerScreens.xml
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/OrderScreens.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1612202
Modified: ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml?rev=1612204&r1=1612203&r2=1612204&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml
(original)
+++ ofbiz/branches/release13.07/applications/commonext/ofbiz-component.xml Mon
Jul 21 07:40:51 2014
@@ -44,4 +44,12 @@ under the License.
location="webapp/ofbizsetup"
base-permission="OFBTOOLS,SETUP"
mount-point="/ofbizsetup"/>
+
+ <webapp name="ordermgr-js"
+ title="ordermgr-js"
+ server="default-server"
+ location="webapp/ordermgr-js"
+ mount-point="/ordermgr-js"
+ app-bar-display="false"/>
+
</ofbiz-component>
Modified:
ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderReturnScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1612204&r1=1612203&r2=1612204&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderReturnScreens.xml
(original)
+++
ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderReturnScreens.xml
Mon Jul 21 07:40:51 2014
@@ -88,7 +88,7 @@ under the License.
<set field="titleProperty" value="PageTitleReturnHeader"/>
<set field="headerItem" value="return"/>
<set field="tabButtonItem" value="OrderReturnHeader"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/ordermgr/images/js/return.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]"
value="/ordermgr-js/return.js" global="true"/>
<property-to-field field="defaultCurrencyUomId"
resource="general" property="currency.uom.id.default" default="USD"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy"/>
</actions>
Modified:
ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1612204&r1=1612203&r2=1612204&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml
(original)
+++
ofbiz/branches/release13.07/applications/order/widget/ordermgr/OrderViewScreens.xml
Mon Jul 21 07:40:51 2014
@@ -52,9 +52,9 @@ under the License.
<actions>
<set field="titleProperty" value="OrderViewOrder"/>
<set field="headerItem" value="findorders"/>
- <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="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/order.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/OrderShippingInfo.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-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>
Modified:
ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml?rev=1612204&r1=1612203&r2=1612204&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml
(original)
+++
ofbiz/branches/release13.07/applications/product/widget/facility/FacilityScreens.xml
Mon Jul 21 07:40:51 2014
@@ -1094,7 +1094,7 @@ under the License.
<entity-one entity-name="Facility" value-field="facility"/>
<property-map resource="ProductUiLabels"
map-name="uiLabelMap"/>
<set field="title"
value="${uiLabelMap.ProductReceiveInventory}"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/ordermgr/images/js/ConvertUom.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]"
value="/ordermgr-js/ConvertUom.js" global="true"/>
</actions>
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.commonFacilityDecoratorLocation}">
Modified:
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CustomerScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1612204&r1=1612203&r2=1612204&view=diff
==============================================================================
---
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CustomerScreens.xml
(original)
+++
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/CustomerScreens.xml
Mon Jul 21 07:40:51 2014
@@ -553,7 +553,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="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -616,7 +616,7 @@ under the License.
<set field="partyId" from-field="userLogin.partyId"/>
<set field="layoutSettings.javaScripts[]"
value="/ecommerce/images/profile.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-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"/>
Modified:
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/OrderScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1612204&r1=1612203&r2=1612204&view=diff
==============================================================================
---
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/OrderScreens.xml
(original)
+++
ofbiz/branches/release13.07/specialpurpose/ecommerce/widget/OrderScreens.xml
Mon Jul 21 07:40:51 2014
@@ -612,7 +612,7 @@ under the License.
<actions>
<set field="titleProperty" value="EcommerceOnePageCheckout"/>
<set field="layoutSettings.javaScripts[]"
value="/ecommerce/images/checkoutProcess.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-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/EditEmailAndTelecomNumber.groovy"/>
