Author: arunpatidar
Date: Sat Jun 23 06:28:48 2018
New Revision: 1834182
URL: http://svn.apache.org/viewvc?rev=1834182&view=rev
Log:
Applied fix from trunk for revision: 1834181
===
FIXED:Incorrect succes mesage after creating customer.
(OFBIZ-9898)
Thanks Anushi Gupta for your contribution.
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/party/config/PartyUiLabels.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/user/UserEvents.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 23 06:28:48 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/party/config/PartyUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/config/PartyUiLabels.xml?rev=1834182&r1=1834181&r2=1834182&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/applications/party/config/PartyUiLabels.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/party/config/PartyUiLabels.xml
Sat Jun 23 06:28:48 2018
@@ -2010,6 +2010,9 @@
<value
xml:lang="th">à¹à¸à¸à¸²à¸ªà¹à¸«à¸¡à¹à¸à¸µà¹à¸ªà¸£à¹à¸²à¸à¹à¸ªà¸£à¹à¸à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸¢à¹à¸¥à¹à¸§</value>
<value xml:lang="vi">Triá»n vá»ng Má»i ÄÆ°á»£c tạo thà nh
công.</value>
</property>
+ <property key="CustomerCreatedSuccessfully">
+ <value xml:lang="en">Customer created successfully.</value>
+ </property>
<property key="PageTitleAddPartyContent">
<value xml:lang="ar">Ø¥Ø¶Ø§ÙØ© Ù
ØØªÙÙ ÙÙØ·Ø±Ù</value>
<value xml:lang="de">Akteur Inhalt hinzufügen</value>
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/user/UserEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/user/UserEvents.xml?rev=1834182&r1=1834181&r2=1834182&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/user/UserEvents.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/party/minilang/user/UserEvents.xml
Sat Jun 23 06:28:48 2018
@@ -28,6 +28,8 @@ under the License.
<set field="create_allow_password" value="true"/>
<set field="parameters.roleTypeId" value="CUSTOMER"/>
<call-simple-method method-name="createUser"/>
+ <property-to-field field="successMessage" resource="PartyUiLabels"
property="CustomerCreatedSuccessfully"/>
+ <set field="_event_message_" value="${successMessage}" />
</simple-method>
<simple-method method-name="createProspect" short-description="Create
Prospect" login-required="false">
<set field="require_email" value="true"/>
@@ -41,6 +43,8 @@ under the License.
<now-timestamp field="nowStamp"/>
<set field="parameters.roleTypeId" value="PROSPECT"/>
<call-simple-method method-name="createUser"/>
+ <property-to-field field="newProspectMessage" resource="PartyUiLabels"
property="NewProspect"/>
+ <set field="_event_message_" value="${newProspectMessage}" />
</simple-method>
<simple-method method-name="createEmployee" short-description="Create
Employee" login-required="false">
@@ -434,8 +438,6 @@ under the License.
<set field="emailContext.productStoreId"
from-field="parameters.PRODUCT_STORE_ID"/>
<set-service-fields service-name="sendCreatePartyEmailNotification"
map="emailContext" to-map="serviceInMap"/>
<call-service-asynch service-name="sendCreatePartyEmailNotification"
in-map-name="serviceInMap"/>
- <property-to-field field="newProspectMessage" resource="PartyUiLabels"
property="NewProspect"/>
- <set field="_event_message_" value="${newProspectMessage}" />
</simple-method>
</simple-methods>