Author: apatel
Date: Sat Oct 18 14:13:57 2014
New Revision: 1632794
URL: http://svn.apache.org/r1632794
Log:
Applied fix from trunk for revision: 1632793
===
[OFBIZ-3329] Removing framework code on resources in commonext.
Thanks Divesh and Mridul for helping with resuluation.
Thanks Adrian for reporting it.
Thanks Chris Snow for reporting the issue
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/json/
(props changed)
ofbiz/branches/release13.07/framework/common/widget/HelpScreens.xml
ofbiz/branches/release13.07/framework/resources/templates/CommonScreens.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1632793
Propchange: ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/json/
------------------------------------------------------------------------------
Merged /ofbiz/trunk/framework/base/src/org/ofbiz/base/json:r1632793
Modified: ofbiz/branches/release13.07/framework/common/widget/HelpScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/common/widget/HelpScreens.xml?rev=1632794&r1=1632793&r2=1632794&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/common/widget/HelpScreens.xml
(original)
+++ ofbiz/branches/release13.07/framework/common/widget/HelpScreens.xml Sat Oct
18 14:13:57 2014
@@ -25,7 +25,6 @@ under the License.
<section>
<actions>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
- <property-map resource="CommonExtUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="ContentUiLabels" map-name="uiLabelMap"
global="true"/>
<service service-name="getUserPreferenceGroup"
result-map="prefResult">
<field-map field-name="userPrefGroupTypeId"
value="GLOBAL_PREFERENCES"/>
Modified:
ofbiz/branches/release13.07/framework/resources/templates/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/resources/templates/CommonScreens.xml?rev=1632794&r1=1632793&r2=1632794&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/resources/templates/CommonScreens.xml
(original)
+++ ofbiz/branches/release13.07/framework/resources/templates/CommonScreens.xml
Sat Oct 18 14:13:57 2014
@@ -17,7 +17,7 @@
<set field="applicationTitle"
value="${uiLabelMap.@component-resource-name@Application}" global="true"/>
</actions>
<widgets>
- <include-screen name="ApplicationDecorator"
location="component://commonext/widget/CommonScreens.xml"/>
+ <include-screen name="GlobalDecorator"
location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>
