svn commit: r661917 - in /ofbiz/trunk/applications: marketing/widget/sfa/CommonScr
Locked
 
|
Author: hansbak
Date: Fri May 30 17:05:53 2008 New Revision: 661917 URL: http://svn.apache.org/viewvc?rev=661917&view=rev Log: menus now showing correctly according Adrians directions, converted the partygroup screen to form Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/setRoleVars.groovy ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=661917&r1=661916&r2=661917&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Fri May 30 17:05:53 2008 @@ -305,16 +305,14 @@ <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/> <section> <actions> - <entity-one entity-name="PartyGroup" value-name="lookupGroup"> + <entity-one entity-name="PartyGroup" value-name="partyGroup"> <field-map field-name="partyId" env-name="partyGroupId"/> </entity-one> </actions> <widgets> - <platform-specific> - <html> - <html-template location="component://party/webapp/partymgr/party/profileblocks/Party.ftl"/> - </html> - </platform-specific> + <screenlet title="${uiLabelMap.PartyPartyGroupInformation}" > + <include-form name="ViewPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/> + </screenlet> </widgets> </section> <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=661917&r1=661916&r2=661917&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Fri May 30 17:05:53 2008 @@ -19,7 +19,7 @@ --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="SfaAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.SfaManagerApplication}" - default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="headerItem"> + default-selected-style="selected" menu-container-style="button-bar tab-bar no-clear" selected-menuitem-context-field-name="headerItem"> <menu-item name="Main" title="${uiLabelMap.MarketingMainPage}"><link target="main"/></menu-item> <menu-item name="Accounts" title="${uiLabelMap.SfaAcccounts}"><link target="FindAccounts"/></menu-item> <menu-item name="Contacts" title="${uiLabelMap.SfaContacts}"><link target="FindContacts"/></menu-item> @@ -39,7 +39,7 @@ </menu-item> </menu> - <menu name="OpportunityTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> + <menu name="OpportunityTabBar" type="simple" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="ViewOpportunity" title="${uiLabelMap.SfaOpportunitySummary}"> <link target="ViewOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/> </menu-item> @@ -48,7 +48,7 @@ </menu-item> </menu> - <menu name="AccountTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> + <menu name="AccountTabBar" type="simple" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="profile" title="${uiLabelMap.PartyProfile}"> <link target="viewprofile?partyId=${parameters.partyId}"/> </menu-item> @@ -59,7 +59,7 @@ </menu-item> </menu> - <menu name="LeadTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem"> + <menu name="LeadTabBar" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="profile" title="${uiLabelMap.PartyProfile}"> <link target="viewprofile?partyId=${parameters.partyId}"/> </menu-item> @@ -74,7 +74,7 @@ </menu-item> </menu> - <menu name="LeadSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> + <menu name="LeadSubTabBar" menu-container-style="button-bar button-style-2 no-clear" default-selected-style="selected"> <menu-item name="CreateLead" title="${uiLabelMap.CommonCreateNew}"> <link target="CreateLead"/> </menu-item> @@ -83,7 +83,7 @@ </menu-item> </menu> - <menu name="ContactTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> + <menu name="ContactTabBar" type="simple" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="profile" title="${uiLabelMap.PartyProfile}"> <link target="viewprofile?partyId=${parameters.partyId}"/> </menu-item> @@ -91,7 +91,7 @@ <link target="MergeContacts"/> </menu-item> </menu> - <menu name="ContactSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> + <menu name="ContactSubTabBar" menu-container-style="button-bar button-style-2 no-clear" default-selected-style="selected"> <menu-item name="CreateContact" title="${uiLabelMap.CommonCreateNew}"> <link target="CreateContact"/> </menu-item> Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/setRoleVars.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/setRoleVars.groovy?rev=661917&r1=661916&r2=661917&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/setRoleVars.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/setRoleVars.groovy Fri May 30 17:05:53 2008 @@ -17,6 +17,7 @@ * under the License. */ import org.ofbiz.entity.*; + import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.base.util.*; roleTypeAndParty = delegator.findByAnd("RoleTypeAndParty", ['partyId': parameters.partyId, 'roleTypeId': 'ACCOUNT']); @@ -30,4 +31,15 @@ roleTypeAndParty = delegator.findByAnd("RoleTypeAndParty", ['partyId': parameters.partyId, 'roleTypeId': 'LEAD']); if (UtilValidate.isNotEmpty(roleTypeAndParty)) { context.put("leadDescription", roleTypeAndParty.get(0).getString("description")); + partyRelationships = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", ["partyIdTo": parameters.partyId, "roleTypeIdFrom": "ACCOUNT_LEAD", "roleTypeIdTo": "LEAD", "partyRelationshipTypeId": "LEAD_REL"])); + context.put("partyGroupId", partyRelationships.get(0).partyIdFrom); + context.put("partyId", parameters.partyId); } + roleTypeAndParty = delegator.findByAnd("RoleTypeAndParty", ['partyId': parameters.partyId, 'roleTypeId': 'ACCOUNT_LEAD']); + if (UtilValidate.isNotEmpty(roleTypeAndParty)) { + context.put("leadDescription", roleTypeAndParty.get(0).getString("description")); + partyRelationships = EntityUtil.filterByDate(delegator.findByAnd("PartyRelationship", ["partyIdFrom": parameters.partyId, "roleTypeIdFrom": "ACCOUNT_LEAD", "roleTypeIdTo": "LEAD", "partyRelationshipTypeId": "LEAD_REL"])); + context.put("partyGroupId", parameters.partyId); + context.put("partyId", partyRelationships.get(0).partyIdTo); + } + Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=661917&r1=661916&r2=661917&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Fri May 30 17:05:53 2008 @@ -77,7 +77,7 @@ </form> <form name="EditPartyGroup" type="single" target="updatePartyGroup" default-map-name="partyGroup" - focus-field-name="groupName" header-row-style="header-row" default-table-style="basic-table"> + focus-field-name="groupName" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="partyGroup==null" target="createPartyGroup"/> <auto-fields-service service-name="updatePartyGroup"/> <field use-when="partyGroup!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> @@ -96,7 +96,24 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> - + + <form name="ViewPartyGroup" type="single" default-map-name="partyGroup" + focus-field-name="groupName" header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="PartyGroup" default-field-type="display"/> + <field name="partyTypeId"><ignored/></field> + <field name="preferredCurrencyUomId"> + <drop-down allow-empty="true"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="abbreviation"/> + </entity-options> + </drop-down> + </field> + <field name="comments"><ignored/></field> + <field name="logoImageUrl"><ignored/></field> + <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field> + </form> + <form name="AddUserLogin" type="single" target="createUserLogin" focus-field-name="userLoginId" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createUserLogin"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |