svn commit: r774228 - in /ofbiz/trunk/applications/marketing: webapp/marketing/contact/ContactListForms.xml webapp/marketing/contact/ContactListMenus.xml widget/ContactListScreens.xml

[jaz-3]

Author: jaz
Date: Wed May 13 06:17:00 2009
New Revision: 774228

URL: http://svn.apache.org/viewvc?rev=774228&view=rev
Log:
fixed cancel/done buttons so they no longer throw errors; fixed publish button (missing contactListId)

Modified:
    ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml
    ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=774228&r1=774227&r2=774228&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Wed May 13 06:17:00 2009
@@ -163,6 +163,7 @@
         </field>
 
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
+        <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
      </form>
 
     <form name="FindContactListParties" type="single" target="ListContactListParties" title=""

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml?rev=774228&r1=774227&r2=774228&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml Wed May 13 06:17:00 2009
@@ -63,6 +63,7 @@
             </condition>
             <link target="updateContactListCommEvent" link-type="hidden-form">                
                 <parameter param-name="communicationEventId"/>
+                <parameter param-name="contactListId"/>
                 <parameter param-name="statusId" value="COM_IN_PROGRESS"/>                
             </link>
         </menu-item>        

Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=774228&r1=774227&r2=774228&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Wed May 13 06:17:00 2009
@@ -167,9 +167,10 @@
                 <set field="titleProperty" value="PageTitleEditContactListParty"/>
                 <set field="contactListTabButtonItem" value="ContactListParty"/>
                 <set field="labelTitleProperty" value="PageTitleEditContactListParty"/>
-
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/>
+                
                 <set field="contactListId" from-field="parameters.contactListId"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindContactListParties?contactListId=${contactListId}"/>
+                
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="fromDate" from-field="parameters.fromDate"/>
                 <entity-one entity-name="ContactListParty" value-field="contactListParty"/>
@@ -229,9 +230,9 @@
                 <!-- parameters for pagination -->
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
-
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactLists"/>
+                
                 <set field="contactListId" from-field="parameters.contactListId"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindContactListParties?contactListId=${contactListId}"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}">
@@ -269,7 +270,7 @@
                 <set field="labelTitleProperty" value="PageTitleFindContactListParty"/>
 
                 <set field="contactListId" from-field="parameters.contactListId"/>
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/EditContactList?contactListId=${contactListId}"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindContactListParties?contactListId=${contactListId}"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}">
@@ -307,7 +308,7 @@
                 <set field="contactListTabButtonItem" value="ContactListCommEvent"/>
                 <set field="labelTitleProperty" value="PageTitleEditContactListCommEvent"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindContactListCommEvents?contactListId=${parameters.contactListId}"/>
                 <set field="contactListId" from-field="parameters.contactListId"/>
                 <set field="communicationEventId" from-field="parameters.communicationEventId"/>
                 <entity-one entity-name="ContactList" value-field="contactList"/>
@@ -360,7 +361,7 @@
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindContactListCommEvents?contactListId=${parameters.contactListId}"/>
                 <set field="contactListId" from-field="parameters.contactListId"/>
             </actions>
             <widgets>
@@ -398,7 +399,7 @@
                 <set field="contactListTabButtonItem" value="ContactListCommEvent"/>
                 <set field="labelTitleProperty" value="PageTitleFindContactListCommEvents"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindContactListCommEvents?contactListId=${parameters.contactListId}"/>
                 <set field="contactListId" from-field="parameters.contactListId"/>
             </actions>
             <widgets>