OFBiz › OFBiz - Commits

[ofbiz-plugins] branch release17.12 updated: Fixed: double forward slashes in ecommerce emails (OFBIZ-2618)

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

[ofbiz-plugins] branch release17.12 updated: Fixed: double forward slashes in ecommerce emails (OFBIZ-2618)

jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/release17.12 by this push:
     new ff75d41  Fixed: double forward slashes in ecommerce emails (OFBIZ-2618)
ff75d41 is described below

commit ff75d41c9c271650798825e357d27a5ebe4bfb13
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sat Nov 9 23:07:31 2019 +0100

    Fixed: double forward slashes in ecommerce emails
    (OFBIZ-2618)
   
    I reopened this issue because while working on OFBIZ-9804 I found that
    since maybe r1052457 some baseEcommerceSecureUrl in screens like
    ContactListSubscribeEmail are not working anymore.
    While at it I remove the commented out lines
---
 ecommerce/widget/EmailContactListScreens.xml | 235 +++++++++++++--------------
 1 file changed, 115 insertions(+), 120 deletions(-)

diff --git a/ecommerce/widget/EmailContactListScreens.xml b/ecommerce/widget/EmailContactListScreens.xml
index 8e66bf3..63db78b 100644
--- a/ecommerce/widget/EmailContactListScreens.xml
+++ b/ecommerce/widget/EmailContactListScreens.xml
@@ -1,120 +1,115 @@
-<?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"
-        xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
-
-    <screen name="ContactListVerifyEmail">
-        <section>
-            <actions>
-                <set field="titleProperty" value="EcommerceSubscriptionVerifyEmail"/>
-                <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/>
-                <entity-one entity-name="PartyNameView" value-field="partyName" auto-field-map="false">
-                    <field-map field-name="partyId" from-field="contactListParty.partyId"/>
-                </entity-one>
-            </actions>
-            <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListVerifyEmail.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="signupforcontactlist">
-        <section>
-            <actions>
-                <set field="partyId" from-field="userLogin.partyId"/>
-                <script location="component://ecommerce/groovyScripts/customer/ContactList.groovy"/>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/template/customer/MiniSignUpForContactList.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="ContactUsEmailNotification">
-        <section>
-            <actions>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactUsEmail.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="ContactListSubscribeEmail">
-        <section>
-            <actions>
-                <entity-one entity-name="ContactList" value-field="contactList"/>
-                <entity-one entity-name="PartyNameView" value-field="partyName"/>
-                <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/>
-            </actions>
-            <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListSubscribeEmail.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="ContactListUnsubscribeVerifyEmail">
-        <section>
-            <actions>
-                <entity-one entity-name="ContactList" value-field="contactList"/>
-                <entity-one entity-name="PartyNameView" value-field="partyName"/>
-                <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/>
-            </actions>
-            <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="ContactListUnsubscribeEmail">
-        <section>
-            <actions>
-                <entity-one entity-name="ContactList" value-field="contactList"/>
-                <entity-one entity-name="PartyNameView" value-field="partyName"/>
-                <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/>
-            </actions>
-            <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListUnsubscribeEmail.ftl"/></html></platform-specific>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="ContactListEmailTemplate">
-        <section>
-            <actions>
-                <entity-one entity-name="ContactList" value-field="contactList"/>
-                <entity-one entity-name="PartyNameView" value-field="partyName"/>
-                <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/>
-            </actions>
-            <widgets>
-                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListEmailTemplate.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"
+        xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+    <screen name="ContactListVerifyEmail">
+        <section>
+            <actions>
+                <set field="titleProperty" value="EcommerceSubscriptionVerifyEmail"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control"/>
+                <entity-one entity-name="PartyNameView" value-field="partyName" auto-field-map="false">
+                    <field-map field-name="partyId" from-field="contactListParty.partyId"/>
+                </entity-one>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListVerifyEmail.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="signupforcontactlist">
+        <section>
+            <actions>
+                <set field="partyId" from-field="userLogin.partyId"/>
+                <script location="component://ecommerce/groovyScripts/customer/ContactList.groovy"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/template/customer/MiniSignUpForContactList.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="ContactUsEmailNotification">
+        <section>
+            <actions>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactUsEmail.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="ContactListSubscribeEmail">
+        <section>
+            <actions>
+                <entity-one entity-name="ContactList" value-field="contactList"/>
+                <entity-one entity-name="PartyNameView" value-field="partyName"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListSubscribeEmail.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="ContactListUnsubscribeVerifyEmail">
+        <section>
+            <actions>
+                <entity-one entity-name="ContactList" value-field="contactList"/>
+                <entity-one entity-name="PartyNameView" value-field="partyName"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="ContactListUnsubscribeEmail">
+        <section>
+            <actions>
+                <entity-one entity-name="ContactList" value-field="contactList"/>
+                <entity-one entity-name="PartyNameView" value-field="partyName"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListUnsubscribeEmail.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="ContactListEmailTemplate">
+        <section>
+            <actions>
+                <entity-one entity-name="ContactList" value-field="contactList"/>
+                <entity-one entity-name="PartyNameView" value-field="partyName"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://ecommerce/template/email/ContactListEmailTemplate.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
+</screens>

Free forum by Nabble Edit this page