svn commit: r674735 - in /ofbiz/trunk/specialpurpose/mypage: webapp/mypage/WEB-INF/controller.xml widget/MyPageForms.xml widget/MyPageScreens.xml

[hansbak-2]

Author: hansbak
Date: Tue Jul  8 01:23:16 2008
New Revision: 674735

URL: http://svn.apache.org/viewvc?rev=674735&view=rev
Log:
mypage component: make the delete commevent link return to the proper screen

Modified:
    ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml

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=674735&r1=674734&r2=674735&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Tue Jul  8 01:23:16 2008
@@ -129,6 +129,18 @@
         <response name="success" type="view" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
+    <request-map uri="deletePartyCommunicationEventMy">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteCommunicationEvent"/>
+        <response name="success" type="view" value="myCommunications"/>
+        <response name="error" type="view" value="myCommunications"/>
+    </request-map>
+    <request-map uri="deletePartyCommunicationEventOthers">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteCommunicationEvent"/>
+        <response name="success" type="view" value="otherCommunications"/>
+        <response name="error" type="view" value="otherCommunications"/>
+    </request-map>
     
     <!-- PREFERENCES -->
     <request-map uri="preferences">

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=674735&r1=674734&r2=674735&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Tue Jul  8 01:23:16 2008
@@ -89,4 +89,16 @@
         <field name="myTimesheet"><check/></field>
         <field name="updateButton"><submit/></field>
     </form>
+    
+    <form name="ListPartyCommEvents" extends="ListPartyCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" >
+        <field use-when="headerItem.equals(&quot;main&quot;)" name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
+        </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="deletePartyCommunicationEventMy?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
+        </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="deletePartyCommunicationEventOthers?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
+        </field>
+    </form>
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=674735&r1=674734&r2=674735&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Tue Jul  8 01:23:16 2008
@@ -196,7 +196,7 @@
                     <include-menu name="MyCommunicationsMenu"
                         location="component://mypage/widget/MyPageMenus.xml" />
                     <include-form name="ListPartyCommEvents"
-                        location="component://party/webapp/partymgr/communication/CommForms.xml" />
+                        location="component://mypage/widget/MyPageForms.xml" />
                 </screenlet>
             </widgets>
         </section>
@@ -225,7 +225,7 @@
                                 <include-menu name="MyCommunicationsMenu"
                                     location="component://mypage/widget/MyPageMenus.xml" />
                                 <include-form name="ListPartyCommEvents"
-                                    location="component://party/webapp/partymgr/communication/CommForms.xml" />
+                                    location="component://mypage/widget/MyPageForms.xml" />
                             </screenlet>
                         </widgets>
                     </section>