[ofbiz-framework] branch trunk updated: Fixed: Remove CommunicationContent not working as expected (OFBIZ-12172)

[mbrohl]

This is an automated email from the ASF dual-hosted git repository.

mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1047003  Fixed: Remove CommunicationContent not working as expected (OFBIZ-12172)
1047003 is described below

commit 1047003b92f11cb23ec959f90ed5affef7def36a
Author: Sebastian Berg <[hidden email]>
AuthorDate: Mon Feb 8 14:19:58 2021 +0100

    Fixed: Remove CommunicationContent not working as expected (OFBIZ-12172)
---
 applications/party/webapp/partymgr/WEB-INF/controller.xml      | 4 ++--
 applications/party/widget/partymgr/CommunicationEventForms.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/party/webapp/partymgr/WEB-INF/controller.xml b/applications/party/webapp/partymgr/WEB-INF/controller.xml
index f0d7e09..6d0aceb 100644
--- a/applications/party/webapp/partymgr/WEB-INF/controller.xml
+++ b/applications/party/webapp/partymgr/WEB-INF/controller.xml
@@ -721,8 +721,8 @@ under the License.
     <request-map uri="removeAttachFile">
         <security https="true" auth="true"/>
         <event type="service" invoke="expireCommEventContentAssoc"/>
-        <response name="success" type="request" value="EditCommunicationEvent"/>
-        <response name="error" type="view" value="EditCommunicationEvent"/>
+        <response name="success" type="request" value="ViewCommunicationEvent"/>
+        <response name="error" type="view" value="ViewCommunicationEvent"/>
     </request-map>
     <request-map uri="AddCommContent">
         <security https="true" auth="true"/>
diff --git a/applications/party/widget/partymgr/CommunicationEventForms.xml b/applications/party/widget/partymgr/CommunicationEventForms.xml
index 6f2565a..7b9bcb4 100644
--- a/applications/party/widget/partymgr/CommunicationEventForms.xml
+++ b/applications/party/widget/partymgr/CommunicationEventForms.xml
@@ -721,7 +721,7 @@ under the License.
     <form name="ListCommContent" type="list" list-name="contentDataResourceList" paginate-target="/ListCommContent" target="removeAttachFile"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-and entity-name="CommEventContentDataResource" list="contentDataResourceList">
+            <entity-and entity-name="CommEventContentDataResource" list="contentDataResourceList" filter-by-date="true">
                 <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
             </entity-and>
         </actions>