You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2026/04/01 09:07:22 UTC
(ofbiz-framework) branch trunk updated (b7a984a012 -> bb9ec639ba)
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from b7a984a012 Improved: introduce and use a new label for product receipts with zero accepted and rejected units (OFBIZ-13376) (#1043)
new b50f0ee605 Fixed: Remove unnecessary string expansion for email subject and body in EmailServices
new bb9ec639ba Fixed: Simplify permission checks for email and comment note communication events in PartyPermissionServices
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/ofbiz/party/party/PartyPermissionServices.groovy | 4 ++--
.../src/main/java/org/apache/ofbiz/common/email/EmailServices.java | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
(ofbiz-framework) 01/02: Fixed: Remove unnecessary string expansion for email subject and body in EmailServices
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit b50f0ee605ab1dd1bb812d27a6a46cc5416cde56
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Wed Apr 1 09:15:30 2026 +0200
Fixed: Remove unnecessary string expansion for email subject and body in EmailServices
---
.../src/main/java/org/apache/ofbiz/common/email/EmailServices.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
index 659bedc280..3f01063faa 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
@@ -110,7 +110,6 @@ public class EmailServices {
}
Map<String, Object> results = ServiceUtil.returnSuccess();
String subject = (String) context.get("subject");
- subject = FlexibleStringExpander.expandString(subject, context);
String partyId = (String) context.get("partyId");
String body = (String) context.get("body");
@@ -128,7 +127,6 @@ public class EmailServices {
results.put("returnId", returnId);
}
if (UtilValidate.isNotEmpty(body)) {
- body = FlexibleStringExpander.expandString(body, context);
results.put("body", body);
}
if (UtilValidate.isNotEmpty(bodyParts)) {
(ofbiz-framework) 02/02: Fixed: Simplify permission checks for email and comment note communication events in PartyPermissionServices
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit bb9ec639ba5f34d85ec53fe4a967f2628a98a719
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Wed Apr 1 09:18:30 2026 +0200
Fixed: Simplify permission checks for email and comment note communication events in PartyPermissionServices
---
.../org/apache/ofbiz/party/party/PartyPermissionServices.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyPermissionServices.groovy b/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyPermissionServices.groovy
index 4262673b3f..e8d29dea5b 100644
--- a/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyPermissionServices.groovy
+++ b/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyPermissionServices.groovy
@@ -259,9 +259,9 @@ Map cancelPartyInvitationPermissionCheck() {
*/
Map partyCommunicationEventPermissionCheck() {
Map result = success()
- if (parameters.communicationEventTypeId == 'EMAIL_COMMUNICATION' && parameters.mainAction == 'CREATE') {
+ if (parameters.communicationEventTypeId == 'EMAIL_COMMUNICATION') {
parameters.altPermission = 'PARTYMGR_CME-EMAIL'
- } else if (parameters.communicationEventTypeId == 'COMMENT_NOTE' && parameters.mainAction == 'CREATE') {
+ } else if (parameters.communicationEventTypeId == 'COMMENT_NOTE') {
parameters.altPermission = 'PARTYMGR_CME-NOTE'
} else if (parameters.partyIdFrom != userLogin.partyId
&& parameters.partyIdTo != userLogin.partyId