[OFBiz] SVN: r5933 - in trunk/applications/party:
webapp/partymgr/WEB-INF webapp/partymgr/lookup
webapp/partymgr/party widget/partymgr
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Sat Oct 8 04:46:34 EDT 2005
Author: jonesde
Date: 2005-10-08 03:46:27 -0500 (Sat, 08 Oct 2005)
New Revision: 5933
Modified:
trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
trunk/applications/party/webapp/partymgr/party/PartyForms.xml
trunk/applications/party/widget/partymgr/LookupScreens.xml
trunk/applications/party/widget/partymgr/SecurityForms.xml
Log:
A few cleanups and added forms from marketing component written by Al Byers that should be in the party component
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml 2005-10-08 08:44:46 UTC (rev 5932)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml 2005-10-08 08:46:27 UTC (rev 5933)
@@ -978,11 +978,14 @@
<view-map name="visitdetail" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#visitdetail"/>
<view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
+ <view-map name="LookupPartyClassificationGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyClassificationGroup"/>
<view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/>
<view-map name="LookupPartyAndUserLoginAndPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson"/>
<view-map name="LookupPartyGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>
- <view-map name="LookupSegmentGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupSegmentGroup"/>
<view-map name="LookupCustRequest" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupCustRequest"/>
+
<view-map name="LookupContactList" type="screen" page="component://party/widget/partymgr/PartyContactListScreens.xml#ListLookupContactList"/>
+
+ <view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSegmentGroup"/>
<!-- end of view mappings -->
</site-conf>
Modified: trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml 2005-10-08 08:44:46 UTC (rev 5932)
+++ trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml 2005-10-08 08:46:27 UTC (rev 5933)
@@ -92,6 +92,7 @@
<field name="suffix" title="${uiLabelMap.PartySuffix}"><display/></field>
<field name="nickname" title="${uiLabelMap.PartyNickname}"><display/></field>
</form>
+
<form name="lookupPartyAndUserLoginAndPerson" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
target="LookupPerson" title="" type="single">
@@ -124,6 +125,7 @@
</field>
<field name="lastName" title="${uiLabelMap.PartyName}"><display description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
</form>
+
<form name="lookupPartyGroup" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="LookupPartyGroup"
title="" type="single">
<!--<auto-fields-entity entity-name="PartyGroup" default-field-type="find"/>-->
@@ -149,20 +151,34 @@
</field>
</form>
- <form name="listLookupSegmentGroup" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
- paginate-target="" title="" type="list" view-size="100">
- <!--
+ <form name="LookupPartyClassificationGroup" target="LookupPartyClassificationGroup" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <auto-fields-entity entity-name="PartyClassificationGroup" default-field-type="find"/>
+ <field name="partyClassificationTypeId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PartyClassificationType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="listLookupPartyClassificationGroup" list-iterator-name="listIt" target="" paginate-target="" title="" type="list"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
<actions>
- <entity-and entity-name="SegmentGroup">
- </entity-and>
+ <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="PartyClassificationGroup"/>
+ <field-map field-name="orderBy" value="description"/>
+ </service>
</actions>
- -->
- <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.PartySegmentGroupId}">
- <hyperlink also-hidden="false" target-type="content" description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')"/>
+
+ <field name="partyClassificationGroupId" title=" " widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')"/>
</field>
- <field name="segmentGroupTypeId" title="${uiLabelMap.PartySegmentGroupTypeId}"><display/></field>
- <field name="description" title="${uiLabelMap.PartySegmentGroupDescription}"><display/></field>
- <field name="productStoreId" title="${uiLabelMap.PartySegmentGroupProductStoreId}"><display/></field>
- <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="partyClassificationTypeId"><display/></field>
+ <field name="parentGroupId"><display/></field>
+ <field name="description"><display/></field>
</form>
</forms>
Modified: trunk/applications/party/webapp/partymgr/party/PartyForms.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/party/PartyForms.xml 2005-10-08 08:44:46 UTC (rev 5932)
+++ trunk/applications/party/webapp/partymgr/party/PartyForms.xml 2005-10-08 08:46:27 UTC (rev 5933)
@@ -195,7 +195,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deletePartyTaxInfo?partyId=${partyId}&geoId=${geoId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -306,7 +306,7 @@
<field name="roleTypeId" title="${uiLabelMap.PartySegmentGroupTypeId}">
<display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
</field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteSegmentGroupRole?segmentGroupId=${segmentGroupId}&partyId=${partyId}&roleTypeId=${roleTypeId}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -346,7 +346,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}" widget-style="inputBox"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deletePartyClassification?partyClassificationGroupId=${partyClassificationGroupId}&partyId=${partyId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -370,7 +370,7 @@
<field name="description" title="${uiLabelMap.Description}">
<display/>
</field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deletePartyClassificationGroup?partyClassificationGroupId=${partyClassificationGroupId}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -457,7 +457,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deletePartyClassification?partyClassificationGroupId=${partyClassificationGroupId}&partyId=${partyId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
Modified: trunk/applications/party/widget/partymgr/LookupScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/LookupScreens.xml 2005-10-08 08:44:46 UTC (rev 5932)
+++ trunk/applications/party/widget/partymgr/LookupScreens.xml 2005-10-08 08:46:27 UTC (rev 5933)
@@ -127,7 +127,9 @@
</widgets>
</section>
</screen>
- <screen name="LookupSegmentGroup">
+
+ <!-- PartyClassificationGroup Lookup Screen -->
+ <screen name="LookupPartyClassificationGroup">
<section>
<condition>
<or>
@@ -135,15 +137,18 @@
</or>
</condition>
<actions>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-
- <set field="title" value="Lookup Segment Group"/>
- <set field="entityName" value="SegmentGroup"/>
+ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+
+ <set field="title" value="Lookup PartyClassificationGroup"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="listLookupSegmentGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ <include-form name="LookupPartyClassificationGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
+ <include-form name="listLookupPartyClassificationGroup" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: trunk/applications/party/widget/partymgr/SecurityForms.xml
===================================================================
--- trunk/applications/party/widget/partymgr/SecurityForms.xml 2005-10-08 08:44:46 UTC (rev 5932)
+++ trunk/applications/party/widget/partymgr/SecurityForms.xml 2005-10-08 08:46:27 UTC (rev 5933)
@@ -62,7 +62,7 @@
<field name="groupId"><hidden/></field>
<field name="permissionId" title="${uiLabelMap.PartyPermissionId}" widget-style="tabletext"><display-entity entity-name="SecurityPermission" description="[${permissionId}] ${description}"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeSecurityPermissionFromSecurityGroup?permissionId=${permissionId}&groupId=${groupId}"
description="[${uiLabelMap.CommonRemove}]" also-hidden="false"/>
</field>
More information about the Svn
mailing list