svn commit: r786021 - in /ofbiz/trunk/applications/marketing/webapp/marketing: WEB-INF/controller.xml contact/ContactListForms.xml

[ashish-18]

Author: ashish
Date: Thu Jun 18 11:34:02 2009
New Revision: 786021

URL: http://svn.apache.org/viewvc?rev=786021&view=rev
Log:
Applied fix from jira issue OFBIZ-2627 (Clicking on expire button shows only expired record in List Contact List Party form of marketing component, it should show active records only.)

Thanks Divesh, Ratnesh for the contribution.

Modified:
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=786021&r1=786020&r2=786021&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Thu Jun 18 11:34:02 2009
@@ -311,7 +311,9 @@
     <request-map uri="updateContactListParty">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateContactListParty"/>
+        
         <response name="success" type="view" value="EditContactListParty"/>
+        
         <response name="error" type="view" value="EditContactListParty"/>
     </request-map>
     <request-map uri="removeContactListParty">
@@ -350,6 +352,16 @@
         <response name="success" type="view" value="ListContactListCommEvents"/>
         <response name="error" type="view" value="ListContactListCommEvents"/>
     </request-map>    
+    <request-map uri="expireContactListParty">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateContactListParty"/>
+        <response name="success" type="request-redirect" value="ListContactListParties">
+            <redirect-parameter name="contactListId"/>
+            <redirect-parameter name="hideExpired"/>
+        </response>
+        <response name="error" type="view" value="ListContactListParties"/>
+    </request-map>
+    
 
     <!-- Lookup request mappings -->
     <request-map uri="LookupSegmentGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupSegmentGroup"/></request-map>

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=786021&r1=786020&r2=786021&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Thu Jun 18 11:34:02 2009
@@ -219,12 +219,13 @@
             </hyperlink>
         </field>
         <field name="expireLink" title=" " widget-style="buttontext">            
-            <hyperlink target="updateContactListParty/ListContactListParties" description="${uiLabelMap.CommonExpire}"  link-type="hidden-form" also-hidden="false">                
+            <hyperlink target="expireContactListParty" description="${uiLabelMap.CommonExpire}"  link-type="hidden-form" also-hidden="false">                
                 <parameter param-name="contactListId"/>                
                 <parameter param-name="partyId"/>
                 <parameter param-name="fromDate"/>
                 <parameter param-name="donePage"/>                
                 <parameter param-name="thruDate" value="${nowTimestamp}"/>
+                <parameter param-name="hideExpired" value="Y"/>
             </hyperlink>
         </field>
     </form>