svn commit: r763529 - in /ofbiz/trunk/applications/party/webapp/partymgr: WEB-INF/controller.xml communication/CommForms.xml communication/attachFileList.ftl

[hansbak-2]

Author: hansbak
Date: Thu Apr  9 06:39:52 2009
New Revision: 763529

URL: http://svn.apache.org/viewvc?rev=763529&view=rev
Log:
securitylink, same headers in same portlet, corrected wrong return view

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/attachFileList.ftl

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=763529&r1=763528&r2=763529&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Thu Apr  9 06:39:52 2009
@@ -806,8 +806,8 @@
     <request-map uri="allocateMsgToParty">
         <security https="true" auth="true"/>
         <event type="simple" path="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="allocateMsgToParty"/>
-        <response name="success" type="view-last" save-last-view="true"/>
-        <response name="error" type="view-last" save-last-view="true"/>
+        <response name="success" type="view-home"/>
+        <response name="error" type="view" value="ViewCommunicationEvent"/>
     </request-map>
 
     <request-map uri="createCommContentDataResource">

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=763529&r1=763528&r2=763529&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Thu Apr  9 06:39:52 2009
@@ -352,7 +352,8 @@
         <field name="createdStamp" title="${uiLabelMap.CommonCreated}"><display type="date"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonSend}"><display type="date"/></field>
     </form>
-    <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" type="list" target="RemoveCommunicationEventRole">
+    <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
+        type="list" target="RemoveCommunicationEventRole" header-row-style="header-row-2">
         <row-actions>
             <set field="toComplete" value="${bsh:&quot;COM_ROLE_READ&quot;.equals(roleStatusId)?&quot;PartyToComplete&quot;:&quot;&quot;}"/>
         </row-actions>
@@ -399,7 +400,8 @@
     </form>
 
     <form name="ListUnknownPartyEmails" extends="ListCommEvents" type="multi" use-row-submit="true" separate-columns="true"
-           target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&amp;delContentDataResource=Y">
+           target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&amp;delContentDataResource=Y"
+           header-row-style="header-row-2">
         <actions>
             <entity-and  list="commEvents" entity-name="CommunicationEventAndRole">
                 <field-map field-name="statusId" value="COM_UNKNOWN_PARTY"/>
@@ -778,7 +780,7 @@
     </form>
 
     <form name="ListDraftEmails" type="list" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" target="deleteCommunicationEvent"
-        use-row-submit="true">
+        use-row-submit="true" header-row-style="header-row-2">
         <actions>
             <entity-condition entity-name="CommunicationEvent" list="commEvents">
                 <condition-list combine="and">

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/attachFileList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/attachFileList.ftl?rev=763529&r1=763528&r2=763529&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/attachFileList.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/attachFileList.ftl Thu Apr  9 06:39:52 2009
@@ -19,7 +19,13 @@
                </#if>
                </td>
               <td class="button-col" width="20%">
-                <a href="<@ofbizUrl>removeAttachFile/EditCommunicationEvent?partyId=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&communicationEventId=${commContent.communicationEventId}&contentId=${commContent.contentId}&fromDate=${fromDate}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
+              <form name="contentRemoveAttachFile" method="post" action="<@ofbizUrl>removeAttachFile/EditCommunicationEvent</@ofbizUrl>">
+                <input type="hidden" name="contentId" value="${commContent.contentId}">
+                <input type="hidden" name="communicationEventId" value="${commContent.communicationEventId}">
+                <input type="hidden" name="fromDate" value="${commContent.fromDate}">
+                <input type="hidden" name="partyId" value="${partyId}">
+                <input type="submit" value='${uiLabelMap.CommonDelete}'>
+              </form>
               </td>
               <td  width="20%">${commContent.fromDate?if_exists}</td>
               <td  width="30%">&nbsp;</td>