Author: ashish
Date: Mon Jun 22 12:40:59 2009
New Revision: 787223
URL: http://svn.apache.org/viewvc?rev=787223&view=rev
Log:
Applied fix from jira issue OFBIZ-2648 (Blank mail generating while Party
Account Creation and Updation.) with minor modification for null check on title.
Thanks Deepak Dixit for your contribution.
Modified:
ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl
ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl
ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml
Modified:
ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl?rev=787223&r1=787222&r2=787223&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
(original)
+++
ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
Mon Jun 22 12:40:59 2009
@@ -1,30 +1,30 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml";>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${title}</title>
- <link rel="stylesheet" href="${baseUrl}/images/maincss.css"
type="text/css"/>
- </head>
- <body>
- <h1>${title}</h1>
- <p>Hello ${(parameters.partyAndPerson.salutation)?if_exists}
${(parameters.partyAndPerson.personalTitle)?if_exists}
${(parameters.partyAndPerson.firstName)?if_exists}
${(parameters.partyAndPerson.middleName)?if_exists}
${(parameters.partyAndPerson.lastName)?if_exists}
${(parameters.partyAndPerson.suffix)?if_exists},</p>
- <p>Your personal information has been updated successfully.</p>
- </body>
-</html>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml";>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>${title?if_exists}</title>
+ <link rel="stylesheet" href="${baseUrl}/images/maincss.css"
type="text/css"/>
+ </head>
+ <body>
+ <h1>${title?if_exists}</h1>
+ <p>Hello ${(parameters.partyAndPerson.salutation)?if_exists}
${(parameters.partyAndPerson.personalTitle)?if_exists}
${(parameters.partyAndPerson.firstName)?if_exists}
${(parameters.partyAndPerson.middleName)?if_exists}
${(parameters.partyAndPerson.lastName)?if_exists}
${(parameters.partyAndPerson.suffix)?if_exists},</p>
+ <p>Your personal information has been updated successfully.</p>
+ </body>
+</html>
Modified:
ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl?rev=787223&r1=787222&r2=787223&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl
(original)
+++ ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl
Mon Jun 22 12:40:59 2009
@@ -19,11 +19,11 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${title}</title>
+ <title>${title?if_exists}</title>
<link rel="stylesheet" href="${baseUrl?if_exists}/images/maincss.css"
type="text/css"/>
</head>
<body>
- <h1>${title}</h1>
+ <h1>${title?if_exists}</h1>
<p>Hello ${person.firstName?if_exists}
${person.lastName?if_exists},</p>
<p>Your account has been created successfully.</p>
</body>
Modified:
ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl?rev=787223&r1=787222&r2=787223&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl
(original)
+++
ofbiz/trunk/applications/party/templates/email/VerifyEmailAddressNotification.ftl
Mon Jun 22 12:40:59 2009
@@ -19,11 +19,11 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${title}</title>
+ <title>${title?if_exists}</title>
<link rel="stylesheet" href="${baseUrl}/images/maincss.css"
type="text/css"/>
</head>
<body>
- <h1>${title}</h1>
+ <h1>${title?if_exists}</h1>
<p>Thank you for registering. Please click the link below to complete
your registration.</p>
<br><br>
<a
href="${baseUrl}/cmssite/cms/verifyEmailAddress?verifyHash=${parameters.verifyHash}">www.cmssite.com/cms/registration.html</a>
Modified: ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml?rev=787223&r1=787222&r2=787223&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml Mon
Jun 22 12:40:59 2009
@@ -1,53 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
- <screen name="CreatePartyNotification">
- <section>
- <actions>
- <set field="titleProperty"
value="PartyNotificationMailCreate"/>
- </actions>
- <widgets>
- <platform-specific><html><html-template
location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific>
- </widgets>
- </section>
- </screen>
- <screen name="ChangePersonalInfoNotification">
- <section>
- <actions>
- <set field="titleProperty"
value="PartyNotificationMailChange"/>
- </actions>
- <widgets>
- <platform-specific><html><html-template
location="component://party/templates/email/ChangePersonalInfoNotification.ftl"/></html></platform-specific>
- </widgets>
- </section>
- </screen>
- <screen name="VerifyEmailAddressNotification">
- <section>
- <actions>
- <set field="titleProperty"
value="PartyNotificationMailVerification"/>
- </actions>
- <widgets>
- <platform-specific><html><html-template
location="component://party/templates/email/VerifyEmailAddressNotification.ftl"/></html></platform-specific>
- </widgets>
- </section>
- </screen>
-</screens>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
+ <screen name="CreatePartyNotification">
+ <section>
+ <actions>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="title"
value="${uiLabelMap.PartyNotificationMailCreate}"/>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template
location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ChangePersonalInfoNotification">
+ <section>
+ <actions>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="title"
value="${uiLabelMap.PartyNotificationMailChange}"/>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template
location="component://party/templates/email/ChangePersonalInfoNotification.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="VerifyEmailAddressNotification">
+ <section>
+ <actions>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="title"
value="${uiLabelMap.PartyNotificationMailVerification}"/>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template
location="component://party/templates/email/VerifyEmailAddressNotification.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
+</screens>
