svn commit: r781282 - in /ofbiz/trunk/applications/party: webapp/partymgr/WEB-INF/controller.xml widget/partymgr/CommunicationScreens.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r781282 - in /ofbiz/trunk/applications/party: webapp/partymgr/WEB-INF/controller.xml widget/partymgr/CommunicationScreens.xml

hansbak-2
Author: hansbak
Date: Wed Jun  3 07:08:07 2009
New Revision: 781282

URL: http://svn.apache.org/viewvc?rev=781282&view=rev
Log:
removed unused code

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.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=781282&r1=781281&r2=781282&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 07:08:07 2009
@@ -727,16 +727,6 @@
         <response name="success" type="request" value="EditCommunicationEvent"/>
         <response name="error" type="view" value="EditCommunicationEvent"/>
     </request-map>
-    <request-map uri="addAttachmentEmail">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="addAttachmentEmail"/>
-    </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="removeAttachFile">
         <security https="true" auth="true"/>
         <event type="service" invoke="removeCommEventContentAssoc"/>
@@ -1233,7 +1223,6 @@
     <view-map name="ViewCommunicationEvent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ViewCommunicationEvent"/>
     <view-map name="UpdateCommPurposes" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#UpdateCommPurposes"/>
     <view-map name="UpdateCommRoles" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#UpdateCommRoles"/>
-    <view-map name="addAttachmentEmail" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#addAttachmentEmail"/>
 
     <!-- TODO
     <view-map name="ListCommCustRequests" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListCommCustRequests"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=781282&r1=781281&r2=781282&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Wed Jun  3 07:08:07 2009
@@ -331,51 +331,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="addAttachmentEmail">
-        <section>
-            <actions>
-                <entity-condition entity-name="MimeType" list="mimeTypes">
-                    <order-by field-name="description"/>
-                    <order-by field-name="mimeTypeId"/>
-                </entity-condition>
-                <set field="communicationEventId" from-field="parameters.communicationEventId"/>
-                <set field="communicationEventTypeId" from-field="parameters.communicationEventTypeId"/>
-                <set field="partyId" from-field="userLogin.partyId"/>
-            </actions>
-            <widgets>
-                <screenlet title="${uiLabelMap.PartyAttachContent}">
-                    <platform-specific>
-                        <html>
-                            <html-template location="component://party/webapp/partymgr/communication/addAttachFile.ftl"/>
-                        </html>
-                    </platform-specific>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="AttachFileList">
-        <section>
-            <actions>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
-                <entity-and entity-name="CommEventContentAssoc" list="commEventContent">
-                    <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
-                </entity-and>
-                <entity-and entity-name="PartyContent" list="partyContent">
-                    <field-map field-name="partyId" from-field="userLogin.partyId"/>
-                </entity-and>
-            </actions>
-            <widgets>
-                <screenlet title="${uiLabelMap.PartyAttachFile}">
-                    <platform-specific>
-                        <html>
-                            <html-template location="component://party/webapp/partymgr/communication/attachFileList.ftl"/>
-                        </html>
-                    </platform-specific>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
     <screen name="EditCommunicationEvent">
         <section>
             <actions>
@@ -457,8 +412,10 @@
                                                 <include-form name="ListCommRoles" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
                                                 <include-form name="AddEventRole" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
                                             </screenlet>
-                                            <include-screen name="AttachFileList"/>
-                                            <include-screen name="addAttachmentEmail"/>
+                                            <screenlet title="${uiLabelMap.PartyCommContent}">
+                                                <include-form name="listCommContent" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
+                                                <include-form  name="uploadContent" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
+                                            </screenlet>
                                         </container>
                                     </fail-widgets>
                                 </section>