Author: sichen
Date: Wed Sep 27 17:41:38 2006
New Revision: 450651
URL: http://svn.apache.org/viewvc?view=rev&rev=450651
Log:
Fixed contact list forms: Pagination fixed for ContactList and
ContactListCommEvent. Find form added for ContactLists, which is now the first
thing the user sees when clicking [Contact Lists]. Removed some duplicate
controller entries.
Modified:
incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
incubator/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
Modified:
incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties?view=diff&rev=450651&r1=450650&r2=450651
==============================================================================
---
incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties
(original)
+++
incubator/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties
Wed Sep 27 17:41:38 2006
@@ -27,6 +27,7 @@
ContactListContactListTypeId=Contact List Type Id
ContactListContactMechTypeId=Contact Mechanisism Type Id
ContactListCreate=Create New Contact List
+ContactListFindContactLists=Find Contact Lists
ContactListIsPublic=Is Public ?
ContactListIsSingleUse=Is Single Use ?
ContactListNotFound=Could not find email list [${contactListId}].
Modified:
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?view=diff&rev=450651&r1=450650&r2=450651
==============================================================================
---
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
(original)
+++
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
Wed Sep 27 17:41:38 2006
@@ -303,6 +303,7 @@
</request-map>
<!-- ContactList request mappings -->
+ <request-map uri="FindContactLists"><security https="true"
auth="true"/><response name="success" type="view"
value="FindContactLists"/></request-map>
<request-map uri="ListContactLists"><security https="true"
auth="true"/><response name="success" type="view"
value="ListContactLists"/></request-map>
<request-map uri="EditContactList"><security https="true"
auth="true"/><response name="success" type="view"
value="EditContactList"/></request-map>
<request-map uri="LookupContactList"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupContactList"/></request-map>
@@ -425,17 +426,11 @@
<view-map name="listSegmentGroupGeo" type="screen"
page="component://marketing/widget/SegmentScreens.xml#listSegmentGroupGeo"/>
<view-map name="listSegmentGroupRole" type="screen"
page="component://marketing/widget/SegmentScreens.xml#listSegmentGroupRole"/>
+ <view-map name="FindContactLists" type="screen"
page="component://marketing/widget/ContactListScreens.xml#FindContactLists"/>
<view-map name="ListContactLists" type="screen"
page="component://marketing/widget/ContactListScreens.xml#ListContactLists"/>
<view-map name="EditContactList" type="screen"
page="component://marketing/widget/ContactListScreens.xml#EditContactList"/>
- <view-map name="ListContactListParties" type="screen"
page="component://marketing/widget/ContactListScreens.xml#ListContactListParties"/>
- <view-map name="EditContactListParty" type="screen"
page="component://marketing/widget/ContactListScreens.xml#EditContactListParty"/>
- <view-map name="FindContactListParties" type="screen"
page="component://marketing/widget/ContactListScreens.xml#FindContactListParties"/>
- <view-map name="ListContactListCommEvents" type="screen"
page="component://marketing/widget/ContactListScreens.xml#ListContactListCommEvents"/>
- <view-map name="EditContactListCommEvent" type="screen"
page="component://marketing/widget/ContactListScreens.xml#EditContactListCommEvent"/>
- <view-map name="FindContactListCommEvents" type="screen"
page="component://marketing/widget/ContactListScreens.xml#FindContactListCommEvents"/>
- <view-map name="ListContactLists" type="screen"
page="component://marketing/widget/ContactListScreens.xml#ListContactLists"/>
- <view-map name="EditContactList" type="screen"
page="component://marketing/widget/ContactListScreens.xml#EditContactList"/>
+ <view-map name="ListContactListParties" type="screen"
page="component://marketing/widget/ContactListScreens.xml#ListContactListParties"/>
<view-map name="ListContactListParty" type="screen"
page="component://marketing/widget/ContactListScreens.xml#ListContactListParties"/>
<view-map name="EditContactListParty" type="screen"
page="component://marketing/widget/ContactListScreens.xml#EditContactListParty"/>
<view-map name="FindContactListParties" type="screen"
page="component://marketing/widget/ContactListScreens.xml#FindContactListParties"/>
Modified:
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?view=diff&rev=450651&r1=450650&r2=450651
==============================================================================
---
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
(original)
+++
incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
Wed Sep 27 17:41:38 2006
@@ -80,11 +80,45 @@
<!-- <field name="cancelLink" title=""
widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false"
description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field>
-->
</form>
+ <form name="FindContactLists" default-title-style="tableheadtext"
+ default-tooltip-style="tabletext" default-widget-style="inputBox"
+ target="ListContactLists" title="" type="single">
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="contactListId"
title="${uiLabelMap.ContactListContactListId}"><text size="20"
maxlength="20"/></field>
+ <field name="contactListName"
title="${uiLabelMap.ContactListContactListName}"><text-find/></field>
+ <field name="contactListTypeId"
title="${uiLabelMap.ContactListContactListTypeId}">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="ContactListType" key-field-name="contactListTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="contactMechTypeId"
title="${uiLabelMap.ContactListContactMechTypeId}">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="ContactMechType" key-field-name="contactMechTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="marketingCampaignId"
title="${uiLabelMap.MarketingCampaignId}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="MarketingCampaign"
description="${campaignName}">
+ <entity-order-by field-name="campaignName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit/></field>
+ </form>
+
<form name="ListContactLists" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="tabletext"
- target="ListContactLists" title="" type="list">
+ target="ListContactLists" title="" type="list" list-name="listIt">
<actions>
- <entity-condition entity-name="ContactList"/>
+ <service service-name="performFind" result-map-name="result"
result-map-list-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="orderBy" value="contactListId"/>
+ <field-map field-name="entityName" value="ContactList"/>
+ </service>
</actions>
<field name="contactListId" widget-style="buttontext"
title="${uiLabelMap.ContactListContactListId}">
<hyperlink target="EditContactList?contactListId=${contactListId}"
description="${contactListId}" also-hidden="false"/>
@@ -270,11 +304,18 @@
default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="tabletext">
<field name="contactListId"
title="${uiLabelMap.ContactListContactListId}"><text/></field>
<field name="commEventId"
title="${uiLabelMap.ContactListCommEventId}"><lookup
target-form-name="LookupCommEvent"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals"
value="COM_EVENT_STATUS"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="fromDate"
title="${uiLabelMap.CommonFromDate}"><date-find/></field>
<field name="thruDate"
title="${uiLabelMap.CommonThruDate}"><date-find/></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
- <form name="ListContactListCommEvents" list-name="listIt" title=""
type="list"
+ <form name="ListContactListCommEvents" list-name="listIt" title=""
type="list" paginate-target="ListContactListCommEvents"
default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="tabletext">
<actions>
<service result-map-list-name="listIt" result-map-name="result"
service-name="performFind">
Modified:
incubator/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?view=diff&rev=450651&r1=450650&r2=450651
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
(original)
+++ incubator/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
Wed Sep 27 17:41:38 2006
@@ -18,6 +18,27 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd";>
+
+ <screen name="FindContactLists">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindContactLists"/>
+ <set field="tabButtonItem" value="ContactList"/>
+ <set field="labelTitleProperty"
value="PageTitleFindContactLists"/>
+ <set field="donePage" from-field="parameters.DONE_PAGE"
default-value="/marketing/control/FindContactList"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonContactListDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container><label
style="head1">${uiLabelMap.ContactListFindContactLists}</label></container>
+ <container><link
text="${uiLabelMap.ContactListCreate}"
target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <include-form name="FindContactLists"
location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="EditContactList">
<section>
<actions>
@@ -59,6 +80,10 @@
<set field="tabButtonItem" value="ContactList"/>
<set field="labelTitleProperty"
value="PageTitleListContactList"/>
+ <!-- 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/ListContactList"/>
<set field="contactListId"
from-field="parameters.contactListId"/>
<set field="entityName" value="ContactList"/>
@@ -123,7 +148,6 @@
<set field="labelTitleProperty"
value="PageTitleListContactListParty"/>
<!-- parameters for pagination -->
- <set field="queryString"
value="contactListId=${parameters.contactListId}"/>
<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"/>
@@ -195,6 +219,10 @@
<set field="titleProperty"
value="PageTitleListContactListCommEvent"/>
<set field="tabButtonItem" value="ContactListCommEvent"/>
<set field="labelTitleProperty"
value="PageTitleListContactListCommEvent"/>
+
+ <!-- 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/ListContactList"/>
<set field="contactListId"
from-field="parameters.contactListId"/>
Modified: incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml?view=diff&rev=450651&r1=450650&r2=450651
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
(original)
+++ incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml Wed
Sep 27 17:41:38 2006
@@ -24,7 +24,7 @@
<menu-item name="Campaign"
title="${uiLabelMap.MarketingCampaign}"><link
target="FindMarketingCampaign"/></menu-item>
<menu-item name="Tracking" title="${uiLabelMap.Tracking}"><link
target="FindTrackingCode"/></menu-item>
<menu-item name="Segment" title="${uiLabelMap.Segment}"><link
target="FindSegmentGroup"/></menu-item>
- <menu-item name="ContactList" title="${uiLabelMap.ContactList}"><link
target="ListContactLists"/></menu-item>
+ <menu-item name="ContactList" title="${uiLabelMap.ContactList}"><link
target="FindContactLists"/></menu-item>
<menu-item name="Logout" title="Logout" align-style="col-right"
widget-style="headerButtonRight" selected-style="headerButtonRightSelected">
<condition><not><if-empty
field-name="userLogin"/></not></condition>
