svn commit: r678612 - in /ofbiz/trunk: applications/party/entitydef/entitymodel.xml specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml specialpurpose/mypage/widget/MyPageForms.xml

[hansbak-2]

Author: hansbak
Date: Mon Jul 21 18:32:01 2008
New Revision: 678612

URL: http://svn.apache.org/viewvc?rev=678612&view=rev
Log:
corrected errors from prev commit

Modified:
    ofbiz/trunk/applications/party/entitydef/entitymodel.xml
    ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml

Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=678612&r1=678611&r2=678612&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Mon Jul 21 18:32:01 2008
@@ -704,7 +704,9 @@
       <member-entity entity-alias="CR" entity-name="CommunicationEventRole"/>
       <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
       <alias-all entity-alias="CE"/>
-      <alias entity-alias="CR" name="statusId" field="statusId" col-alias="roleStatusId" />
+      <alias entity-alias="CR" name="partyId"/>
+      <alias entity-alias="CR" name="roleTypeId"/>
+      <alias entity-alias="CR" name="roleStatusId" field="statusId"/>
       <alias entity-alias="CR" name="contactMechId"/>
       <view-link entity-alias="CR" rel-entity-alias="CE">
         <key-map field-name="communicationEventId"/>

Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml?rev=678612&r1=678611&r2=678612&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Mon Jul 21 18:32:01 2008
@@ -131,7 +131,7 @@
     </request-map>
     <request-map uri="deletePartyCommunicationEventRole">
         <security https="true" auth="true"/>
-        <event type="service" invoke="deleteCommunicationEventRole"/>
+        <event type="service" invoke="removeCommunicationEventRole"/>
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
@@ -143,7 +143,7 @@
     </request-map>
     <request-map uri="deletePartyCommunicationEventMyRole">
         <security https="true" auth="true"/>
-        <event type="service" invoke="deleteCommunicationEventRole"/>
+        <event type="service" invoke="removeCommunicationEventRole"/>
         <response name="success" type="view" value="myCommunications"/>
         <response name="error" type="view" value="myCommunications"/>
     </request-map>
@@ -240,7 +240,7 @@
     </request-map>
     <request-map uri="deleteOtherCommunicationEventRole">
         <security https="true" auth="true"/>
-        <event type="service" invoke="deleteCommunicationEventRole"/>
+        <event type="service" invoke="removeCommunicationEventRole"/>
         <response name="success" type="view" value="otherCommunications"/>
         <response name="error" type="view" value="ViewCommunicationEvent"/>
     </request-map>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=678612&r1=678611&r2=678612&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Mon Jul 21 18:32:01 2008
@@ -94,13 +94,13 @@
     <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" type="list">
         <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
         <field use-when="headerItem.equals(&quot;main&quot;)" name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}&amp;roleTypeId=${roleTypeId}"/>
         </field>
         <field use-when="headerItem.equals(&quot;myCommunications&quot;)" name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventMyRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventMyRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}&amp;roleTypeId=${roleTypeId}"/>
         </field>
         <field use-when="headerItem.equals(&quot;otherCommunications&quot;)" name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventOthersRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventOthersRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}&amp;roleTypeId=${roleTypeId}"/>
         </field>
         <field use-when="headerItem.equals(&quot;main&quot;)" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
             <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;type=main"/>