From cff199183c19d7624404745bb5ee7c2a9c1966bc Mon Sep 17 00:00:00 2001 From: Arun Patidar Date: Sat, 24 Feb 2018 12:42:30 +0000 Subject: [PATCH] Applied fix from trunk for revision: 1825233 === Fixed: Incorrect Party profile view redirection in SFA due to missing roleType. (OFBIZ-10121) Thanks Ankit Joshi for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825234 13f79535-47bb-0310-9956-ffa450edef68 --- .../webapp/sfa/WEB-INF/controller.xml | 20 ++ .../marketing/widget/sfa/CommonScreens.xml | 298 ++++++++++++++++++ .../widget/sfa/forms/AccountForms.xml | 20 +- .../groovyScripts/party/SetRoleVars.groovy | 2 +- .../party/profileblocks/Attributes.ftl | 2 +- .../template/party/profileblocks/Notes.ftl | 2 +- .../party/profileblocks/UserLogin.ftl | 2 +- .../party/widget/partymgr/PartyMenus.xml | 2 + 8 files changed, 341 insertions(+), 7 deletions(-) diff --git a/applications/marketing/webapp/sfa/WEB-INF/controller.xml b/applications/marketing/webapp/sfa/WEB-INF/controller.xml index 9585626efe..8af21c069f 100644 --- a/applications/marketing/webapp/sfa/WEB-INF/controller.xml +++ b/applications/marketing/webapp/sfa/WEB-INF/controller.xml @@ -64,6 +64,14 @@ under the License. + + + + + + + + @@ -84,6 +92,10 @@ under the License. + + + + @@ -159,6 +171,10 @@ under the License. + + + + @@ -284,6 +300,10 @@ under the License. + + + + diff --git a/applications/marketing/widget/sfa/CommonScreens.xml b/applications/marketing/widget/sfa/CommonScreens.xml index 5c9ae28101..56a67febab 100644 --- a/applications/marketing/widget/sfa/CommonScreens.xml +++ b/applications/marketing/widget/sfa/CommonScreens.xml @@ -347,6 +347,304 @@ under the License. + +
+ + + + + + + + +