You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/06/03 10:20:27 UTC
svn commit: r781293 - in /ofbiz/trunk/applications/party:
webapp/partymgr/WEB-INF/controller.xml
webapp/partymgr/communication/CommForms.xml
widget/partymgr/CommunicationScreens.xml
Author: hansbak
Date: Wed Jun 3 08:20:27 2009
New Revision: 781293
URL: http://svn.apache.org/viewvc?rev=781293&view=rev
Log:
upgraded the content section of communications
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=781293&r1=781292&r2=781293&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Wed Jun 3 08:20:27 2009
@@ -727,6 +727,18 @@
<response name="success" type="request" value="EditCommunicationEvent"/>
<response name="error" type="view" value="EditCommunicationEvent"/>
</request-map>
+ <request-map uri="uploadAttachFiletoEmail">
+ <security https="true" auth="true"/>
+ <event type="simple" invoke="createCommunicationContent" path="component://party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml"/>
+ <response name="success" type="view" value="EditCommunicationEvent"/>
+ <response name="error" type="view" value="EditCommunicationEvent"/>
+ </request-map>
+ <request-map uri="uploadAttachFile">
+ <security https="true" auth="true"/>
+ <event type="simple" invoke="createCommunicationContent" path="component://party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml"/>
+ <response name="success" type="view" value="ListCommContent"/>
+ <response name="error" type="view" value="ListCommContent"/>
+ </request-map>
<request-map uri="removeAttachFile">
<security https="true" auth="true"/>
<event type="service" invoke="removeCommEventContentAssoc"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=781293&r1=781292&r2=781293&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Wed Jun 3 08:20:27 2009
@@ -776,6 +776,7 @@
<field name="uploadedFile"><file/></field>
<field name="upLoad" title="${uiLabelMap.CommonUpload}"><submit/></field>
</form>
+ <form name="uploadContent1" type="upload" extends="uploadContent" target="uploadAttachFile"/>
<form name="editCommTextContent" type="single" target="uploadCommEventContent" default-map-name="commEventContentDataResource"
header-row-style="header-row" default-table-style="basic-table">
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=781293&r1=781292&r2=781293&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Wed Jun 3 08:20:27 2009
@@ -451,6 +451,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditCommunication"/>
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
+ <set field="my" from-field="parameters.my"/>
</actions>
<widgets>
<decorator-screen name="Common${my}CommunicationEventDecorator"
@@ -612,7 +613,7 @@
<set field="titleProperty" value="PartyCommContent"/>
<set field="headerItem" value="comm"/>
<set field="tabButtonItem" value="CommContent"/>
- <set field="partyId" value="${parameters.partyId}"/>
+ <set field="parameters.partyId" value="${parameters.partyId}" default-value="${userLogin.partyId}"/>
<set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/>
<set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/>
<set field="communicationEventId" value="${parameters.communicationEventId}"/>
@@ -626,15 +627,14 @@
<if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <screenlet title="${uiLabelMap.PartyCommContent}">
- <container style="button-bar">
- <link style="smallSubmit" target="AddCommContent">
- <parameter param-name="communicationEventId"/>
- <parameter param-name="partyId"/>
- </link>
- </container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/>
- </screenlet>
+ <container>
+ <screenlet title="${uiLabelMap.PartyCommContent}">
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PartyAttachContent}">
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="uploadContent1"/>
+ </screenlet>
+ </container>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -656,6 +656,7 @@
<set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/>
<set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/>
<set field="communicationEventId" value="${parameters.communicationEventId}"/>
+ <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
</actions>
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">