svn commit: r703765 - in /ofbiz/trunk/specialpurpose/mypage: script/org/ofbiz/mypage/Events.xml widget/MyPageForms.xml widget/MyPageScreens.xml

[hansbak-2]

Author: hansbak
Date: Sat Oct 11 23:25:26 2008
New Revision: 703765

URL: http://svn.apache.org/viewvc?rev=703765&view=rev
Log:
correcting some errors on previous commit

Modified:
    ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml

Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=703765&r1=703764&r2=703765&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Sat Oct 11 23:25:26 2008
@@ -180,25 +180,10 @@
     </simple-method>
     
     <simple-method method-name="checkEnteredEmailExists" short-description="Check Enter Email Exists when click New Email">        
-        <entity-and entity-name="CommunicationEvent" list-name="comEventList">
-            <field-map field-name="statusId" value="COM_PENDING"/>
-            <field-map field-name="partyIdFrom" env-name="userLogin.partyId"/>
-        </entity-and>
-        <if-not-empty field="comEventList">
-            <iterate entry-name="comevent" list-name="comEventList">            
-                <set field="communicationEventId" from-field="comevent.communicationEventId" />  
-                <field-to-request field-name="communicationEventId" request-name="communicationEventId"/>
-            </iterate>
-            <else>
-                <set field="chkExists" value="true"/>
-            </else>
-        </if-not-empty>
-        <if-compare field="chkExists" value="true" operator="equals">
-            <set-service-fields service-name="createCommunicationEvent" map-name="parameters" to-map-name="createCommEvent"/>
+        <set-service-fields service-name="createCommunicationEvent" map-name="parameters" to-map-name="createCommEvent"/>
             <call-service service-name="createCommunicationEvent" in-map-name="createCommEvent">
-                <result-to-request result-name="communicationEventId" request-name="communicationEventId"/>
-            </call-service>
-        </if-compare>                        
+            <result-to-request result-name="communicationEventId" request-name="communicationEventId"/>
+        </call-service>
     </simple-method>
     
     <simple-method method-name="createCommunicationContent" short-description="Upload Content and Create Communication Content Association">

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=703765&r1=703764&r2=703765&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sat Oct 11 23:25:26 2008
@@ -217,10 +217,8 @@
         <actions>
             <entity-condition entity-name="CommunicationEvent" list-name="commEvents">
                 <condition-list combine="and">
-                    <condition-expr env-name="" field-name="statusId" operator="equals" value="COM_READ"/>
-                    <condition-list combine="or">
-                        <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/>                        
-                    </condition-list>
+                    <condition-expr field-name="statusId" operator="equals" value="COM_PENDING"/>
+                    <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/>                        
                 </condition-list>
                 <order-by field-name="-lastUpdatedStamp"/>
             </entity-condition>
@@ -278,7 +276,7 @@
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
         <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20"/></field>
         <field name="save" title="&amp;nbsp;">
-            <hyperlink also-hidden="true" target-type="plain" description="Save" target="javascript:(document.MyPageNewEmail.statusId.value='COM_READ'),(document.MyPageNewEmail.submit())"/>          
+            <hyperlink also-hidden="true" target-type="plain" description="Save" target="javascript:(document.MyPageNewEmail.statusId.value='COM_PENDING'),(document.MyPageNewEmail.submit())"/>          
         </field>
         <field name="send" title="&amp;nbsp;">
             <hyperlink also-hidden="true" target-type="plain" description="Send" target="javascript:(document.MyPageNewEmail.submit())"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=703765&r1=703764&r2=703765&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sat Oct 11 23:25:26 2008
@@ -196,8 +196,8 @@
  <condition-list combine="and">
                         <condition-expr field-name="statusId" operator="not-equals"
                             value="COM_UNKNOWN_PARTY" />
-                        <condition-expr field-name="roleStatusId" operator="not-equals"
-                            value="COM_ROLE_CREATED" />
+                        <condition-expr field-name="statusId" operator="not-equals"
+                            value="COM_PENDING" />
  <condition-expr field-name="partyId" operator="equals"
  value="${partyId}" />
                         <condition-expr field-name="roleStatusId"
@@ -220,7 +220,7 @@
     <entity-condition entity-name="CommunicationEventAndRole" list-name="commEventDraft">
         <condition-list combine="and">
             <condition-expr field-name="statusId" operator="equals"
-                value="COM_READ"/>
+                value="COM_PENDING"/>
             <condition-expr field-name="partyId" operator="equals"
                 value="${partyId}"/>            
         </condition-list>