Re: svn commit: r642905 - in /ofbiz/trunk/applications/mark
Locked
Re: svn commit: r642905 - in /ofbiz/trunk/applications/mark
 
|
Hello Hans,
comments are inline :- [hidden email] wrote: > Author: hansbak > Date: Sun Mar 30 23:57:20 2008 > New Revision: 642905 > > URL: http://svn.apache.org/viewvc?rev=642905&view=rev > Log: > first initial screens for sales opportunities and related services > > Added: > ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/ > ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/ > ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml (with props) > ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/ > ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/OpportunityForms.xml (with props) > Modified: > ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml > ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml > ofbiz/trunk/applications/marketing/servicedef/services.xml > ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml > ofbiz/trunk/applications/marketing/widget/CommonScreens.xml > ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml > ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml > > Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=642905&r1=642904&r2=642905&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original) > +++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sun Mar 30 23:57:20 2008 > @@ -1107,6 +1107,9 @@ > <property key="SfaOpportunities"> > <value xml:lang="en">Opportunities</value> > </property> > + <property key="SfaNewOpportunity"> > + <value xml:lang="en">Create New Opportunity</value> > + </property> > <property key="SfaLeads"> > <value xml:lang="en">Leads</value> > </property> > @@ -1115,6 +1118,51 @@ > </property> > <property key="SfaManagerWelcome"> > <value xml:lang="en">Welcome to the SFA Manager Application</value> > + </property> > According to convention we should follow the alphabetical order for UiLabels. Also I have an suggestion : According to convention, can we use the prefix Marketing for UiLabels instead of Sfa. What is the best practice ? > + <property key="SfaFindOpportunities"> > + <value xml:lang="en">Find Opportunities</value> > + </property> > + <property key="SfaFindResults"> > + <value xml:lang="en">Find Results</value> > + </property> > + <property key="SfaOpportunityName"> > + <value xml:lang="en">Opportunity Name</value> > + </property> > + <property key="SfaInitialAccount"> > + <value xml:lang="en">Initial Account</value> > + </property> > + <property key="SfaEstimatedAmount"> > + <value xml:lang="en">Estimated Amount</value> > + </property> > + <property key="SfaInitialStage"> > + <value xml:lang="en">Initial Stage</value> > + </property> > + <property key="SfaCloseDate"> > + <value xml:lang="en">Close Date</value> > + </property> > + <property key="SfaType"> > + <value xml:lang="en">Type</value> > + </property> > + <property key="SfaNextStep"> > + <value xml:lang="en">Next Step</value> > + </property> > + <property key="SfaOpportunitySummary"> > + <value xml:lang="en">Opportunity Summary</value> > + </property> > + <property key="SfaEditOpportunity"> > + <value xml:lang="en">Edit Opportunity</value> > + </property> > + <property key="SfaOpportunityInfo"> > + <value xml:lang="en">Opportunity Information</value> > + </property> > + <property key="SfaOpportunityId"> > + <value xml:lang="en">Opportunity ID</value> > + </property> > + <property key="SfaProbability"> > + <value xml:lang="en">Probability(%)</value> > + </property> > + <property key="DataSourceLabel"> > + <value xml:lang="en">Source</value> > </property> > <property key="Tracking"> > <value xml:lang="en">Tracking</value> > > Modified: ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml?rev=642905&r1=642904&r2=642905&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml (original) > +++ ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml Sun Mar 30 23:57:20 2008 > @@ -57,5 +57,5 @@ > > <EnumerationType description="Tracking Code Source" enumTypeId="TRACKINGCODE_SRC" hasTable="N" parentTypeId=""/> > <Enumeration description="Cookie" enumCode="COOKIE" enumId="TKCDSRC_COOKIE" sequenceId="01" enumTypeId="TRACKINGCODE_SRC"/> > - <Enumeration description="URL Parameter" enumCode="URL_PARAM" enumId="TKCDSRC_URL_PARAM" sequenceId="01" enumTypeId="TRACKINGCODE_SRC"/> > + <Enumeration description="URL Parameter" enumCode="URL_PARAM" enumId="TKCDSRC_URL_PARAM" sequenceId="01" enumTypeId="TRACKINGCODE_SRC"/> > </entity-engine-xml> > > Added: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml?rev=642905&view=auto > ============================================================================== > --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml (added) > +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml Sun Mar 30 23:57:20 2008 > @@ -0,0 +1,39 @@ > +<?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 > + distributed with this work for additional information > + regarding copyright ownership. The ASF licenses this file > + to you under the Apache License, Version 2.0 (the > + "License"); you may not use this file except in compliance > + with the License. You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > + Unless required by applicable law or agreed to in writing, > + software distributed under the License is distributed on an > + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > + KIND, either express or implied. See the License for the > + specific language governing permissions and limitations > + under the License. > +--> > + > +<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> > + > + <simple-method method-name="createOpportunity" short-description="Create Opportunity for SFA"> > + <make-value entity-name="SalesOpportunity" value-name="newEntity"/> > + <if-empty field-name="parameters.salesOpportunityId"> > + <sequenced-id-to-env sequence-name="SalesOpportunity" env-name="parameters.salesOpportunityId"/> > + </if-empty> > + <set-nonpk-fields map-name="parameters" value-name="newEntity"/> > + <set-pk-fields map-name="parameters" value-name="newEntity"/> > + <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> > + <create-value value-name="newEntity"/> > + </simple-method> > + <simple-method method-name="updateOpportunity" short-description="Update an opportunity"> > + <entity-one entity-name="SalesOpportunity" value-name="lookedUpValue"/> > + <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/> > + <store-value value-name="lookedUpValue"/> > + </simple-method> > +</simple-methods> > > Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml > ------------------------------------------------------------------------------ > svn:keywords = "Date Rev Author URL Id" > > Propchange: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml > ------------------------------------------------------------------------------ > svn:mime-type = text/xml > > Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=642905&r1=642904&r2=642905&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/servicedef/services.xml (original) > +++ ofbiz/trunk/applications/marketing/servicedef/services.xml Sun Mar 30 23:57:20 2008 > @@ -367,4 +367,21 @@ > <attribute name="primaryPermission" type="String" mode="IN" optional="true" default-value="MARKETING"/> > <attribute name="altPermission" type="String" mode="IN" optional="true"/> > </service> > + > + <!-- opportunity service --> > + <service name="createOpportunity" engine="simple" default-entity-name="SalesOpportunity" > + location="org/ofbiz/sfa/opportunity/OpportunityServices.xml" invoke="createOpportunity"> > + <description>Create an opportunity</description> > + <auto-attributes mode="IN" include="pk" optional="false"></auto-attributes> > + <auto-attributes mode="IN" include="nonpk" optional="true"> > + <exclude field-name="createdByUserLogin"/> > + </auto-attributes> > + <override name="salesOpportunityId" mode="IN" optional="true"/> > + </service> > + <service name="updateOpportunity" engine="simple" default-entity-name="SalesOpportunity" > + location="org/ofbiz/sfa/opportunity/OpportunityServices.xml" invoke="updateOpportunity"> > + <description>Update an opportnity</description> > + <auto-attributes mode="IN" include="pk" optional="false"/> > + <auto-attributes mode="IN" include="nonpk" optional="true"/> > + </service> > </services> > > 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=642905&r1=642904&r2=642905&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original) > +++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Sun Mar 30 23:57:20 2008 > @@ -21,17 +21,53 @@ > <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> > <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> > + <include location="component://party/webapp/partymgr/WEB-INF/controller.xml"/> > <description>SFA Manager Module Site Configuration File</description> > <owner>Copyright 2001-2007 The Apache Software Foundation</owner> > - > + > <!-- Request Mappings --> > <request-map uri="main"> > <security https="true" auth="true"/> > <response name="success" type="view" value="main"/> > </request-map> > + <!-- Opportunity Requests --> > + <request-map uri="FindOpportunity"> > + <security https="true" auth="true"/> > + <response name="success" type="view" value="FindOpportunity"/> > + <response name="error" type="view" value="FindOpportunity"/> > + </request-map> > + <request-map uri="NewOpportunity"> > + <security https="true" auth="true"/> > + <response name="success" type="view" value="NewOpportunity"></response> > + </request-map> > + <request-map uri="viewOpportunity"> > + <security https="true" auth="true"/> > + <response name="success" type="view" value="viewOpportunity"/> > + </request-map> > + <request-map uri="createOpportunity"> > + <security https="true" auth="true"/> > + <event type="service" invoke="createOpportunity"/> > + <response name="success" type="view" value="viewOpportunity"/> > + <response name="error" type="view" value="NewOpportunity"/> > + </request-map> > + <request-map uri="EditOpportunity"> > + <security https="true" auth="true"/> > + <response name="success" type="view" value="EditOpportunity"/> > + <response name="error" type="view" value="EditOpportunity"/> > + </request-map> > + <request-map uri="updateOpportunity"> > + <security https="true" auth="true"/> > + <event type="service" invoke="updateOpportunity"/> > + <response name="success" type="request" value="viewOpportunity"/> > + <response name="error" type="view" value="EditOpportunity"/> > + </request-map> > <!-- end of request mappings --> > - > + > <!-- View Mappings --> > <view-map name="main" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#main"/> > + <view-map name="FindOpportunity" type="screen" page="component://marketing/widget/sfa/OpportunityScreens.xml#FindOpportunity"/> > + <view-map name="NewOpportunity" type="screen" page="component://marketing/widget/sfa/OpportunityScreens.xml#NewOpportunity"/> > + <view-map name="viewOpportunity" type="screen" page="component://marketing/widget/sfa/OpportunityScreens.xml#viewOpportunity"/> > + <view-map name="EditOpportunity" type="screen" page="component://marketing/widget/sfa/OpportunityScreens.xml#EditOpportunity"/> > <!-- end of view mappings --> > -</site-conf> > +</site-conf> > \ No newline at end of file > > Added: ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/OpportunityForms.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/OpportunityForms.xml?rev=642905&view=auto > ============================================================================== > --- ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/OpportunityForms.xml (added) > +++ ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/OpportunityForms.xml Sun Mar 30 23:57:20 2008 > @@ -0,0 +1,153 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> > + > + <form name="FindOpportunity" type="single" target="FindOpportunity" > + header-row-style="header-row" default-table-style="basic-table"> > + <field name="salesOpportunityId"><hidden/></field> > + <field name="opportunityName" title="${uiLabelMap.SfaFindOpportunities}"><text-find size="25" default-option="contains"></text-find></field> > + <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}"> > + <drop-down allow-empty="true"> > + <entity-options description="${description}" entity-name="SalesOpportunityStage"> > + </entity-options> > + </drop-down> > + </field> > + <field name="type" title="${uiLabelMap.SfaType}"> > + <drop-down allow-empty="true"> > + <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration"> > + <entity-constraint name="enumTypeId" operator="equals" value="SLSOPP_TYP_ENUM"/> > + <entity-order-by field-name="sequenceId"/> > + </entity-options> > + </drop-down> > + </field> > + <field name="searchButton" widget-style="smallSubmit"><submit/></field> > + </form> > + <form name="listOpportunity" type="multi" list-name="listIt" paginate-target="FindOpportunity" > + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> > + <actions> > + <set field="parameters.noConditionFind" value="Y"/> > + <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="entityName" value="SalesOpportunity"/> > + <field-map field-name="orderBy" value="salesOpportunityId"/> > + </service> > + </actions> > + <field name="salesOpportunityId"><hidden/></field> > + <field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}"> > + <hyperlink target="viewOpportunity?salesOpportunityId=${salesOpportunityId}" description="${opportunityName}"/> > + </field> > + <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}"><display/></field> > + <field name="estimatedAmount" title="${uiLabelMap.SfaEstimatedAmount}"><display/></field> > + <field name="estimatedCloseDate" title="${uiLabelMap.SfaCloseDate}"><display/></field> > + <field name="editButton" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> > + <hyperlink target="EditOpportunity?salesOpportunityId=${salesOpportunityId}" description="${uiLabelMap.CommonEdit}"/> > + </field> > + </form> > + <form name="NewOpportunity" type="single" target="createOpportunity" > + header-row-style="header-row" default-table-style="basic-table"> > + <field name="opportunityName" position="1" title="${uiLabelMap.SfaOpportunityName}" widget-style="required"><text size="25"></text></field> > + <field name="initialAccount" position="1" title="${uiLabelMap.SfaInitialAccount}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field> > + <field name="typeEnumId" position="1" title="${uiLabelMap.SfaType}"> > + <drop-down allow-empty="true"> > + <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration"> > + <entity-constraint name="enumTypeId" operator="equals" value="SLSOPP_TYP_ENUM"/> > + <entity-order-by field-name="sequenceId"/> > + </entity-options> > + </drop-down> > + </field> > + <field name="estimatedAmount" position="1" title="${uiLabelMap.SfaEstimatedAmount}"><text size="25"></text></field> > + <field name="currencyUomId" position="2" title="${uiLabelMap.CommonCurrency}"> > + <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}"> > + <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="estimatedCloseDate" position="1" title="${uiLabelMap.SfaCloseDate}" widget-style="required"><date-time/></field> > + <field name="opportunityStageId" position="2" title="${uiLabelMap.SfaInitialStage}" widget-style="required"> > + <drop-down > > + <entity-options description="${description}" entity-name="SalesOpportunityStage"> > + </entity-options> > + </drop-down> > + </field> > + <field name="estimatedProbability" position="1" title="${uiLabelMap.SfaProbability}"><text size="25"></text></field> > + <field name="dataSourceId" position="2" title="${uiLabelMap.DataSourceLabel}"> > + <drop-down allow-empty="true"> > + <entity-options key-field-name="dataSourceId" description="${description}" entity-name="DataSource"> > + <entity-constraint name="dataSourceTypeId" operator="equals" value="SLSOPP_SRC"/> > + </entity-options> > + </drop-down> > + </field> > + <field name="marketingCampaignId" position="1" title="${uiLabelMap.MarketingCampaign}"> > + <drop-down allow-empty="true"> > + <entity-options description="${campaignName}" entity-name="MarketingCampaign" key-field-name="marketingCampaignId"> > + </entity-options> > + </drop-down> > + </field> > + <field name="description" position="1" title="${uiLabelMap.SegmentGroupDescription}"><textarea/></field> > + <field name="nextStep" position="1" title="${uiLabelMap.SfaNextStep}"><textarea/></field> > + <field name="createButton" widget-style="smallSubmit" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> > + </form> > + <form name="ViewOpportunity" type="single" default-map-name="salesOpportunity" > + header-row-style="header-row" default-table-style="basic-table"> > + <field name="salesOpportunityId"><hidden/></field> > + <field name="opportunityName" position="1" title="${uiLabelMap.SfaOpportunityName}"><display/></field> > + <field name="initialAccount" position="1" title="${uiLabelMap.SfaInitialAccount}"><display/></field> > + <field name="estimatedAmount" position="1" title="${uiLabelMap.SfaEstimatedAmount} ${currencyUomId}"><display/></field> > + <field name="typeEnumId" position="1" title="${uiLabelMap.SfaType}"><display/></field> > + <field name="estimatedCloseDate" position="1" title="${uiLabelMap.SfaCloseDate}"><display/></field> > + <field name="opportunityStageId" position="2" title="${uiLabelMap.SfaInitialStage}"><display/></field> > + <field name="estimatedProbability" position="1" title="${uiLabelMap.SfaProbability}"><display/></field> > + <field name="dataSourceId" position="2" title="${uiLabelMap.DataSourceLabel}"><display/></field> > + <field name="marketingCampaignId" position="1" title="${uiLabelMap.MarketingCampaign}"><display/></field> > + <field name="description" position="1" title="${uiLabelMap.SegmentGroupDescription}"><display/></field> > + <field name="nextStep" position="1" title="${uiLabelMap.SfaNextStep}"><display/></field> > + </form> > + <form name="EditOpportunity" type="single" target="updateOpportunity" default-map-name="salesOpportunity" header-row-style="header-row" default-table-style="basic-table"> > + <field name="salesOpportunityId" position="1" title="${uiLabelMap.SfaOpportunityId}"><display/></field> > + <field name="opportunityName" position="1" title="${uiLabelMap.SfaOpportunityName}" widget-style="required"><text/></field> > + <field name="initialAccount" position="1" title="${uiLabelMap.SfaInitialAccount}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field> > + <field name="typeEnumId" position="1" title="${uiLabelMap.SfaType}"> > + <drop-down allow-empty="true"> > + <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration"> > + <entity-constraint name="enumTypeId" operator="equals" value="SLSOPP_TYP_ENUM"/> > + <entity-order-by field-name="sequenceId"/> > + </entity-options> > + </drop-down> > + </field> > + <field name="estimatedAmount" position="1" title="${uiLabelMap.SfaEstimatedAmount}"><text/></field> > + <field name="currencyUomId" position="2" title="${uiLabelMap.CommonCurrency}"> > + <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}"> > + <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="estimatedCloseDate" position="1" title="${uiLabelMap.SfaCloseDate}" widget-style="required"><date-time/></field> > + <field name="opportunityStageId" position="2" title="${uiLabelMap.SfaInitialStage}" widget-style="required"> > + <drop-down > > + <entity-options description="${description}" entity-name="SalesOpportunityStage"> > + </entity-options> > + </drop-down> > + </field> > + <field name="estimatedProbability" position="1" title="${uiLabelMap.SfaProbability}"><text/></field> > + <field name="dataSourceId" position="2" title="${uiLabelMap.DataSourceLabel}"> > + <drop-down allow-empty="true"> > + <entity-options key-field-name="dataSourceId" description="${description}" entity-name="DataSource"> > + <entity-constraint name="dataSourceTypeId" operator="equals" value="SLSOPP_SRC"/> > + </entity-options> > + </drop-down> > + </field> > + <field name="marketingCampaignId" position="1" title="${uiLabelMap.MarketingCampaign}"> > + <drop-down allow-empty="true"> > + <entity-options description="${campaignName}" entity-name="MarketingCampaign" key-field-name="marketingCampaignId"> > + </entity-options> > + </drop-down> > + </field> > + <field name="description" position="1" title="${uiLabelMap.SegmentGroupDescription}"><textarea/></field> > + <field name="nextStep" position="1" title="${uiLabelMap.SfaNextStep}"><textarea/></field> > + <field name="createButton" widget-style="smallSubmit" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> > + </form> > +</forms> > > Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/OpportunityForms.xml > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/OpportunityForms.xml > ------------------------------------------------------------------------------ > svn:keywords = "Date Rev Author URL Id" > > Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/opportunity/OpportunityForms.xml > ------------------------------------------------------------------------------ > svn:mime-type = text/xml > > Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=642905&r1=642904&r2=642905&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Sun Mar 30 23:57:20 2008 > @@ -83,7 +83,6 @@ > </widgets> > </section> > </screen> > - > <screen name="main"> > <section> > <widgets> > > Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=642905&r1=642904&r2=642905&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sun Mar 30 23:57:20 2008 > @@ -43,7 +43,7 @@ > <screen name="main"> > <section> > <widgets> > - <decorator-screen name="main-decorator" location="component://marketing/widget/sfa/CommonScreens.xml"> > + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-header"> > @@ -88,4 +88,31 @@ > </widgets> > </section> > </screen> > -</screens> > + <screen name="CommonOpportunityDecorator"> > + <section> > + <actions> > + <!-- Do action here --> > + <set field="salesOpportunityId" from-field="parameters.salesOpportunityId"/> > + </actions> > + <widgets> > + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <widgets> > + <section> > + <widgets> > + <include-menu name="OpportunityTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > + </widgets> > + </section> > + <decorator-section-include name="body"/> > + </widgets> > + <fail-widgets> > + <label style="h3">${uiLabelMap.ProjectMgrViewPermissionError}</label> > + </fail-widgets> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > +</screens> > \ No newline at end of file > > Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=642905&r1=642904&r2=642905&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) > +++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Sun Mar 30 23:57:20 2008 > @@ -28,7 +28,7 @@ > <menu-item name="Events" title="${uiLabelMap.SfaEvents}"><link target=""/></menu-item> > <menu-item name="Documents" title="${uiLabelMap.SfaDocuments}"><link target=""/></menu-item> > <menu-item name="Forecasts" title="${uiLabelMap.SfaForecasts}"><link target=""/></menu-item> > - <menu-item name="Opportunities" title="${uiLabelMap.SfaOpportunities}"><link target=""/></menu-item> > + <menu-item name="Opportunities" title="${uiLabelMap.SfaOpportunities}"><link target="FindOpportunity"/></menu-item> > <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected"> > <condition><not><if-empty field-name="userLogin"/></not></condition> > <link target="logout"/> > @@ -38,4 +38,12 @@ > <link target="${checkLoginUrl}"/> > </menu-item> > </menu> > -</menus> > + <menu name="OpportunityTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected"> > + <menu-item name="opportunityView" title="${uiLabelMap.SfaOpportunitySummary}"> > + <link target="viewOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/> > + </menu-item> > + <menu-item name="editOpportunity" title="${uiLabelMap.SfaEditOpportunity}"> > + <link target="EditOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/> > + </menu-item> > + </menu> > +</menus> > \ No newline at end of file > > > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |