Author: rayb
Date: Thu Apr 12 10:23:29 2007 New Revision: 528049 URL: http://svn.apache.org/viewvc?view=rev&rev=528049 Log: Changed 'Find Parties' screen under Contact List to use a new LookupContactMech search added to party mgr. Last one was a restricted result listing based on partyId which is fine when editting existing entries but not for finding them. Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml ofbiz/trunk/applications/party/config/PartyUiLabels.properties ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.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?view=diff&rev=528049&r1=528048&r2=528049 ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Thu Apr 12 10:23:29 2007 @@ -378,6 +378,7 @@ <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> <request-map uri="LookupCommEvent"><security https="true" auth="true"/><response name="success" type="view" value="LookupCommEvent"/></request-map> <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map> @@ -448,6 +449,7 @@ <view-map name="LookupPartyClassificationGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyClassificationGroup"/> <view-map name="LookupCommEvent" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupCommEvent"/> <view-map name="LookupGeo" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeo"/> + <view-map name="LookupContactMech" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupContactMech"/> <view-map name="TrackingCodeReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#TrackingCodeReport"/> <view-map name="MarketingCampaignReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#MarketingCampaignReport"/> 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?view=diff&rev=528049&r1=528048&r2=528049 ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Thu Apr 12 10:23:29 2007 @@ -173,7 +173,7 @@ </drop-down> </field> <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}"> - <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/> + <lookup target-form-name="LookupContactMech" target-parameter="partyId"/> </field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?view=diff&rev=528049&r1=528048&r2=528049 ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Thu Apr 12 10:23:29 2007 @@ -308,6 +308,7 @@ PartyListItems=List Items PartyListName=List Name PartyListType=List Type +PartyLookupContactMech=Lookup Contact Mech PartyLookupParty=Lookup Party PartyLookupPartyByName=Lookup Party by Name PartyLookupPartyPerson=Lookup Person Modified: ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml?view=diff&rev=528049&r1=528048&r2=528049 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml Thu Apr 12 10:23:29 2007 @@ -270,4 +270,47 @@ <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field> <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field> </form> + + <form name="lookupContactMech" target="LookupContactMech" type="single"> + <field name="contactMechId" title="${uiLabelMap.contactMechId}"><text-find/></field> + + <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"> + <drop-down allow-empty="true" no-current-selected-key="EMAIL_ADDRESS"> + <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="PartyType"/> + </drop-down> + </field> + <field name="infoString" title="${uiLabelMap.infoString}"><text-find/></field> + <field name="paAddress1" title="${uiLabelMap.paAddress1}"><text-find/></field> + <field name="paAddress2" title="${uiLabelMap.paAddress2}"><text-find/></field> + <field name="paPostalCode" title="${uiLabelMap.paPostalCode}"><text-find/></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="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + </form> + + <form name="listLookupContactMech" type="list" list-name="listIt" paginate-target="LookupContactMech"> + <actions> + <service service-name="performFind" result-map-list-name="listIt" result-map-name="result"> + <field-map field-name="inputFields" env-name="parameters"/> + <field-map field-name="entityName" value="PartyAndContactMech"/> + </service> + </actions> + + <field name="contactMechId" widget-style="buttontext"> + <hyperlink description="${contactMechId}" target-type="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/> + </field> + <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}"> + <display-entity also-hidden="false" entity-name="PartyType" description="${description}"/> + </field> + <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field> + <field name="cmDetail"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field> + </form> + </forms> Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?view=diff&rev=528049&r1=528048&r2=528049 ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml Thu Apr 12 10:23:29 2007 @@ -194,4 +194,25 @@ </widgets> </section> </screen> + + <screen name="LookupContactMech"> + <section> + <actions> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + + <set field="title" value="${uiLabelMap.PartyLookupContactMech}"/> + <set field="entityName" value="PartyAndContactMech"/> + <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"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <include-form name="lookupContactMech" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <include-form name="listLookupContactMech" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> |
Free forum by Nabble | Edit this page |