svn commit: r701764 - in /ofbiz/trunk/applications/marketing: webapp/marketing/WEB-INF/controller.xml webapp/marketing/campaign/MarketingCampaignMenus.xml webapp/sfa/WEB-INF/controller.xml widget/MarketingCampaignScreens.xml

[mrisaliti]

Author: mrisaliti
Date: Sun Oct  5 02:27:11 2008
New Revision: 701764

URL: http://svn.apache.org/viewvc?rev=701764&view=rev
Log:
Some cleanup on marketing component (Part of issue OFBIZ-1982)

Modified:
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
    ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
    ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.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=701764&r1=701763&r2=701764&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Sun Oct  5 02:27:11 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -152,7 +152,10 @@
         <response name="error" type="view" value="FindMarketingCampaign"/>
     </request-map>
     
-    <request-map uri="EditMarketingCampaignRoles"><security https="true" auth="true"/><response name="success" type="view" value="EditMarketingCampaignRoles"/></request-map>
+    <request-map uri="EditMarketingCampaignRoles">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditMarketingCampaignRoles"/>
+    </request-map>
     <request-map uri="addRoleToMarketingCampaign"><security https="true" auth="true"/>
         <event type="service" path="" invoke="addRoleToMarketingCampaign"/>
         <response name="success" type="view" value="EditMarketingCampaignRoles"/>
@@ -163,8 +166,10 @@
         <response name="success" type="view" value="EditMarketingCampaignRoles"/>
         <response name="error" type="view" value="EditMarketingCampaignRoles"/>
     </request-map>
-    <request-map uri="FindMarketingCampaignRoles"><security https="true" auth="true"/><response name="success" type="view" value="FindMarketingCampaignRoles"/></request-map>
-    <request-map uri="ListMarketingCampaignRoles"><security https="true" auth="true"/><response name="success" type="view" value="ListMarketingCampaignRoles"/></request-map>
+    <request-map uri="ListMarketingCampaignRoles">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ListMarketingCampaignRoles"/>
+    </request-map>
     <request-map uri="createMarketingCampaignRole">
         <security https="true" auth="true"/>
         <event type="service" invoke="createMarketingCampaignRole"/>
@@ -180,8 +185,8 @@
     <request-map uri="removeMarketingCampaignRole">
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteMarketingCampaignRole"/>
-        <response name="success" type="view" value="FindMarketingCampaignRoles"/>
-        <response name="error" type="view" value="FindMarketingCampaignRoles"/>
+        <response name="success" type="view" value="ListMarketingCampaignRoles"/>
+        <response name="error" type="view" value="ListMarketingCampaignRoles"/>
     </request-map>
     
     <!--  SegmentGroup requests -->
@@ -202,8 +207,8 @@
    <request-map uri="deleteSegmentGroup">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="deleteSegmentGroup"/>
-        <response name="success" type="view" value="listSegmentGroup"/>
-        <response name="error" type="view" value="listSegmentGroup"/>
+        <response name="success" type="view" value="FindSegmentGroup"/>
+        <response name="error" type="view" value="FindSegmentGroup"/>
     </request-map>
     
     <!--  SegmentGroupClassification requests -->
@@ -335,7 +340,7 @@
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteCommunicationEvent"/>
         <response name="success" type="view" value="ListContactListCommEvents"/>
-        <response name="error" type="view" value="ListContactListEvents"/>
+        <response name="error" type="view" value="ListContactListCommEvents"/>
     </request-map>
     
     <!-- Lookup request mappings -->
@@ -344,7 +349,6 @@
     <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
     
     <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
-    <request-map uri="LookupRoleType"><security https="true" auth="true"/><response name="success" type="view" value="LookupRoleType"/></request-map>
     <request-map uri="LookupPartyClassificationGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyClassificationGroup"/></request-map>
     <request-map uri="LookupContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupContactMech"/></request-map>
     
@@ -382,7 +386,7 @@
 
     <view-map name="FindMarketingCampaign"  type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#ListMarketingCampaign"/>
     <view-map name="EditMarketingCampaign" type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#EditMarketingCampaign"/>
-    <view-map name="FindMarketingCampaignRoles"  type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#ListMarketingCampaignRoles"/>
+    <view-map name="ListMarketingCampaignRoles"  type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#ListMarketingCampaignRoles"/>
     <view-map name="EditMarketingCampaignRoles" type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#EditMarketingCampaignRoles"/>
 
     <view-map name="FindSegmentGroup" type="screen" page="component://marketing/widget/SegmentScreens.xml#FindSegmentGroup"/>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml?rev=701764&r1=701763&r2=701764&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml Sun Oct  5 02:27:11 2008
@@ -25,7 +25,7 @@
             <link target="/EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/>
         </menu-item>
         <menu-item name="MarketingCampaignRole" title="${uiLabelMap.PartyRoles}">
-            <link target="/FindMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}"/>
+            <link target="/ListMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}"/>
         </menu-item>
     </menu>
 </menus>

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=701764&r1=701763&r2=701764&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Sun Oct  5 02:27:11 2008
@@ -101,10 +101,6 @@
         <security https="true" auth="true" external-view="false"/>
         <response type="view" name="success" value="CloneLead"/>
     </request-map>
-    <request-map uri="viewLead">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="viewLead"/>
-    </request-map>
     <request-map uri="MergeLeads">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="MergeLeads"/>

Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=701764&r1=701763&r2=701764&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Sun Oct  5 02:27:11 2008
@@ -154,7 +154,7 @@
                 <set field="campaignTabButtonItem" value="MarketingCampaignRole"/>
                 <set field="labelTitleProperty" value="PageTitleEditMarketingCampaignRole"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindMarketingCampaignRoles"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ListMarketingCampaignRoles"/>
                 <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="roleTypeId" from-field="parameters.roleTypeId"/>
@@ -218,37 +218,4 @@
             </widgets>
         </section>
     </screen>
-    <screen name="FindMarketingCampaignRoles">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleFindMarketingCampaignRole"/>
-                <set field="tabButtonItem" value="MarketingCampaignRole"/>
-                <set field="labelTitleProperty" value="PageTitleFindMarketingCampaignRole"/>
-
-                <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonMarketingCampaignDecorator">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleFindMarketingCampaignRole}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <container><link  text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRole?marketingCampaignId=${marketingCampaignId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
-                                        <include-form name="FindMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>    
 </screens>
\ No newline at end of file