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 2012/05/20 22:24:50 UTC
svn commit: r1340824 - in /ofbiz/branches/release10.04: ./
applications/commonext/widget/ofbizsetup/ProfileScreens.xml
applications/commonext/widget/ofbizsetup/SetupScreens.xml
applications/party/widget/partymgr/PartyScreens.xml
Author: jleroux
Date: Sun May 20 20:24:49 2012
New Revision: 1340824
URL: http://svn.apache.org/viewvc?rev=1340824&view=rev
Log:
"Applied fix from trunk for revision: 1340821 " (conflict handled by hand)
------------------------------------------------------------------------
r1340821 | jleroux | 2012-05-20 22:21:06 +0200 (dim., 20 mai 2012) | 12 lines
A patch from Daniel Riquelme "sessionAttributes doesn't work from screen widget" https://issues.apache.org/jira/browse/OFBIZ-4669
Reported by Kiran:
In the screen widget, add a set action that refers to sessionAttributes, it doesn't work.
e.g: Following doesn't work:
<set field="titleProperty" value="${sessionAttributes.autoName}"/>
Following works:
<set field="titleProperty" from-field="autoName" from-scope="user"/>
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/SetupScreens.xml
ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyScreens.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1340821
Modified: ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=1340824&r1=1340823&r2=1340824&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Sun May 20 20:24:49 2012
@@ -42,7 +42,7 @@
<set field="customerPartyId" from-field="customerRel.partyIdFrom"/>
<set field="organizationPartyId" from-field="parameters.partyId"/>
- <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+ <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
<property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
</actions>
<widgets>
Modified: ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/SetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/SetupScreens.xml?rev=1340824&r1=1340823&r2=1340824&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/SetupScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/commonext/widget/ofbizsetup/SetupScreens.xml Sun May 20 20:24:49 2012
@@ -26,7 +26,7 @@
<actions>
<set field="titleProperty" value="SetupCreateNewOrganization"/>
<set field="target" value="createOrganization"/>
- <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+ <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
<entity-condition entity-name="PartyRole" list="parties">
<condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
</entity-condition>
Modified: ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyScreens.xml?rev=1340824&r1=1340823&r2=1340824&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyScreens.xml Sun May 20 20:24:49 2012
@@ -655,7 +655,7 @@ under the License.
<set field="titleProperty" value="PartyCreateNewCustomer"/>
<set field="headerItem" value="find"/>
<set field="target" value="createCustomer"/>
- <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+ <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
<property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
</actions>
<widgets>
@@ -688,7 +688,7 @@ under the License.
<set field="headerItem" value="find"/>
<set field="displayPassword" value="Y"/>
<set field="target" value="createProspect"/>
- <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+ <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -720,7 +720,7 @@ under the License.
<set field="headerItem" value="find"/>
<set field="displayPassword" value="Y"/>
<set field="target" value="createEmployee"/>
- <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+ <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">