You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2011/11/27 10:27:32 UTC
svn commit: r1206691 - in /ofbiz/branches/release11.04: ./
specialpurpose/ecommerce/widget/CustomerScreens.xml
Author: jleroux
Date: Sun Nov 27 09:27:32 2011
New Revision: 1206691
URL: http://svn.apache.org/viewvc?rev=1206691&view=rev
Log:
"Applied fix from trunk for revision: 1206690"
------------------------------------------------------------------------
r1206690 | jleroux | 2011-11-27 10:25:17 +0100 (dim., 27 nov. 2011) | 3 lines
Closes OFBIZ-4577 and its subtasks OFBIZ-4575 OFBIZ-4578, reported by Kiran Gawde "viewprofile has lost lot of functionality during refactoring"
jleroux: I simply restored the old screens, and make them default as we decided in the http://markmail.org/message/l2kxjxzdsqtcmedn thread.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CustomerScreens.xml
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 27 09:27:32 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4:951708-952957
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690
Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1206691&r1=1206690&r2=1206691&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CustomerScreens.xml Sun Nov 27 09:27:32 2011
@@ -476,9 +476,45 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="newcustomer">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleNewCustomer"/>
+ <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newcustomer.ftl"/></html></platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="viewprofile">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewProfile"/>
+
+ <set field="partyId" from-field="userLogin.partyId"/>
+ <entity-one entity-name="Party" value-field="party"/>
+ <entity-one entity-name="Person" value-field="person"/>
+ <entity-one entity-name="PartyGroup" value-field="partyGroup"/>
+
+ <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/viewprofile.ftl"/></html></platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<!-- To use new pages uncomment following screens i.e. newcustomer and viewprofile and comment existing newcustomer and viewprofile screens above -->
- <screen name="newcustomer">
+ <!--screen name="newcustomer">
<section>
<actions>
<property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -519,7 +555,7 @@ under the License.
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen-->
<screen name="EditProfile">