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

[hansbak]

Author: hansbak
Date: Sun Jul 27 09:07:50 2008
New Revision: 680137

URL: http://svn.apache.org/viewvc?rev=680137&view=rev
Log:
only show open communications by default

Modified:
    ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.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=680137&r1=680136&r2=680137&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml 
(original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Sun 
Jul 27 09:07:50 2008
@@ -115,7 +115,7 @@
         <security https="true" auth="true"/>
         <event type="simple" 
path="org/ofbiz/party/communication/CommunicationEventServices.xml" 
invoke="allocateMsgToParty"/>
         <response name="success" type="request" value="getToNextDonePage"/>
-        <response name="error" type="request" value="getToNextDonePage"/>
+        <response name="error" type="view" value="ViewCommunicationEvent"/>
     </request-map>
     
     <request-map uri="deleteCommunicationEvents">
@@ -142,12 +142,6 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="otherCommunications"/>
     </request-map>
-    <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="request" value="getToNextDonePage"/>
-        <response name="error" type="request" value="getToNextDonePage"/>
-    </request-map>
     <request-map uri="setCommEventRoleToComplete">
         <security https="true" auth="true"/>
         <event type="simple" path="org/ofbiz/mypage/Events.xml" 
invoke="setCommEventRoleToComplete"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=680137&r1=680136&r2=680137&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Jul 27 
09:07:50 2008
@@ -25,7 +25,7 @@
             <condition>
                 <not><if-empty field-name="userLogin"/></not>
             </condition>
-            <link target="main?status=open&amp;donePage=main"/>
+            <link target="main?donePage=main"/>
         </menu-item>
         <menu-item name="viewprofile" title="${uiLabelMap.MyProfile}">
             <condition>
@@ -40,7 +40,7 @@
                     <if-compare 
field-name="preferences.userPrefMap.myCommunications" operator="not-equals" 
value="Y"/>
                 </and>
             </condition>
-            <link 
target="myCommunications?status=open&amp;donePage=myCommunications"/>
+            <link target="myCommunications?donePage=myCommunications"/>
         </menu-item>
         <menu-item name="otherCommunications" 
title="${uiLabelMap.OtherCommunications}">
             <condition>
@@ -49,7 +49,7 @@
                     <if-compare 
field-name="preferences.userPrefMap.otherCommunications" operator="not-equals" 
value="Y"/>
                 </and>
             </condition>
-            <link 
target="otherCommunications?status=open&amp;donePage=otherCommunications"/>
+            <link target="otherCommunications?donePage=otherCommunications"/>
         </menu-item>
         <menu-item name="myCompanyComms" title="${uiLabelMap.MyCompanyComms}">
             <condition>
@@ -114,16 +114,20 @@
                </menu-item>
                <menu-item name="openEvents" title="${uiLabelMap.OpenEvents}">
                        <condition>
-                               <if-empty field-name="parameters.status"/>
+                <if-compare field-name="parameters.status" operator="equals"
+                    value="all" />
                        </condition>
                        <link target="${donePage}?status=open" />
                </menu-item>
                <menu-item name="allOtherEvents" 
title="${uiLabelMap.AllEvents}">
                        <condition>
-                               <if-compare field-name="parameters.status" 
operator="equals"
-                                       value="open" />
+                           <or>
+                                   <if-compare field-name="parameters.status" 
operator="equals"
+                                           value="open" />
+                           <if-empty field-name="parameters.status"/>
+                           </or>
                        </condition>
-                       <link target="${donePage}" />
+                       <link target="${donePage}?status=all" />
                </menu-item>
        </menu>    
     

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=680137&r1=680136&r2=680137&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Jul 27 
09:07:50 2008
@@ -180,7 +180,7 @@
         <section>
             <actions>
                 <set field="partyId" from-field="userLogin.partyId" />
-                   <set field="donePage" from-field="donePage" 
default-value="myCommunications"/>
+                   <set field="donePage" value="myCommunications"/>
             </actions>
             <widgets>
                 <include-screen name="Communications"/>
@@ -190,7 +190,8 @@
        <screen name="Communications">
                <section>
                        <actions>
-                           <set field="status" from-field="parameters.status" 
default-value="%"/>
+                <set field="status" from-field="parameters.status"/>
+                <set field="status" 
value="${bsh:&quot;all&quot;.equals(status)?&quot;%&quot;:&quot;open&quot;}"/>
                                <entity-condition 
entity-name="CommunicationEventAndRole"
                                        list-name="commEvents">
                                        <condition-list combine="and">