svn commit: r660423 - in /ofbiz/trunk/applications/marketing: servicedef/services.xml webapp/sfa/WEB-INF/controller.xml widget/DataSourceScreens.xml widget/sfa/OpportunityScreens.xml widget/sfa/SfaMenus.xml widget/sfa/forms/OpportunityForms.xml

[mor-2]

Author: mor
Date: Tue May 27 01:29:32 2008
New Revision: 660423

URL: http://svn.apache.org/viewvc?rev=660423&view=rev
Log:
misc cleanup

Modified:
    ofbiz/trunk/applications/marketing/servicedef/services.xml
    ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
    ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml

Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=660423&r1=660422&r2=660423&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Tue May 27 01:29:32 2008
@@ -372,7 +372,7 @@
     <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="OUT" include="pk" optional="false"/>
+        <auto-attributes mode="INOUT" include="pk" optional="true"/>
         <auto-attributes mode="IN" include="nonpk" optional="true">
             <exclude field-name="createdByUserLogin"/>
         </auto-attributes>

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=660423&r1=660422&r2=660423&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Tue May 27 01:29:32 2008
@@ -36,25 +36,25 @@
         <response name="success" type="view" value="FindOpportunity"/>
         <response name="error" type="view" value="FindOpportunity"/>
     </request-map>
-    <request-map uri="viewOpportunity">
+    <request-map uri="ViewOpportunity">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="viewOpportunity"/>
+        <response name="success" type="view" value="ViewOpportunity"/>
     </request-map>
-    <request-map uri="createOpportunity">
+    <request-map uri="EditOpportunity">
         <security https="true" auth="true"/>
-        <event type="service" invoke="createOpportunity"/>
-        <response name="success" type="view" value="viewOpportunity"/>
+        <response name="success" type="view" value="EditOpportunity"/>
         <response name="error" type="view" value="EditOpportunity"/>
     </request-map>
-    <request-map uri="EditOpportunity">
+    <request-map uri="createOpportunity">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditOpportunity"/>
+        <event type="service" invoke="createOpportunity"/>
+        <response name="success" type="view" value="ViewOpportunity"/>
         <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="success" type="request" value="ViewOpportunity"/>
         <response name="error" type="view" value="EditOpportunity"/>
     </request-map>
 
@@ -66,7 +66,7 @@
     </request-map>
     <request-map uri="NewAccounts">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="NewAccounts"></response>
+        <response name="success" type="view" value="NewAccounts"/>
     </request-map>
     <request-map uri="createAccount">
         <security https="true" auth="true"/>
@@ -186,7 +186,7 @@
     <view-map name="viewprofile" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#ViewProfile"/>
 
     <view-map name="FindOpportunity" type="screen" page="component://marketing/widget/sfa/OpportunityScreens.xml#FindOpportunity"/>
-    <view-map name="viewOpportunity" type="screen" page="component://marketing/widget/sfa/OpportunityScreens.xml#viewOpportunity"/>
+    <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"/>
     
     <view-map name="FindAccounts" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#FindAccounts"/>

Modified: ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml?rev=660423&r1=660422&r2=660423&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Tue May 27 01:29:32 2008
@@ -61,7 +61,7 @@
             <actions>
                 <set field="titleProperty" value="PageTitleEditDataSource"/>
                 <set field="labelTitleProperty" value="PageTitleEditDataSource"/>
-
+                 <set field="dataSourceTabButtonItem" value="DataSource"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListDataSource"/>
                 <set field="dataSourceId" from-field="parameters.dataSourceId"/>
                 <entity-one entity-name="DataSource" value-name="dataSource"/>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=660423&r1=660422&r2=660423&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Tue May 27 01:29:32 2008
@@ -24,8 +24,6 @@
     <screen name="FindOpportunity">
         <section>
             <actions>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="headerItem" value="Opportunities"/>
             </actions>
             <widgets>
@@ -56,7 +54,7 @@
                                 <container>
                                     <section>
                                         <widgets>
-                                            <include-form name="listOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
+                                            <include-form name="ListOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
                                         </widgets>
                                     </section>
                                 </container>
@@ -71,8 +69,10 @@
     <screen name="EditOpportunity">
         <section>
             <actions>
-                <entity-one entity-name="SalesOpportunity" value-name="salesOpportunity"/>
+                <set field="titleProperty" value="Opportunities"/>
+                <set field="tabButtonItem" value="EditOpportunity"/>            
                 <set field="salesOpportunityId" from-field="parameters.salesOpportunityId"/>
+                <entity-one entity-name="SalesOpportunity" value-name="salesOpportunity"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -97,13 +97,13 @@
         </section>
     </screen>
     
-    <screen name="viewOpportunity">
+    <screen name="ViewOpportunity">
         <section>
             <actions>
-                <entity-one entity-name="SalesOpportunity" value-name="salesOpportunity"/>
                 <set field="titleProperty" value="Opportunities"/>
-                <set field="tabButtonItem" value="opportunityView"/>  
+                <set field="tabButtonItem" value="ViewOpportunity"/>  
                 <set field="salesOpportunityId" from-field="parameters.salesOpportunityId"/>
+                <entity-one entity-name="SalesOpportunity" value-name="salesOpportunity"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOpportunityDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=660423&r1=660422&r2=660423&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Tue May 27 01:29:32 2008
@@ -40,10 +40,10 @@
     </menu>
     
     <menu name="OpportunityTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="opportunityView" title="${uiLabelMap.SfaOpportunitySummary}">
-            <link target="viewOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/>
+        <menu-item name="ViewOpportunity" title="${uiLabelMap.SfaOpportunitySummary}">
+            <link target="ViewOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/>
         </menu-item>
-        <menu-item name="editOpportunity" title="${uiLabelMap.SfaEditOpportunity}">
+        <menu-item name="EditOpportunity" title="${uiLabelMap.SfaEditOpportunity}">
             <link target="EditOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/>
         </menu-item>
     </menu>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=660423&r1=660422&r2=660423&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Tue May 27 01:29:32 2008
@@ -42,7 +42,7 @@
         <field name="searchButton" widget-style="smallSubmit"><submit/></field>
     </form>
     
-    <form name="listOpportunity" type="multi" list-name="listIt" paginate-target="FindOpportunity"
+    <form name="ListOpportunity" type="list" list-name="listIt" paginate-target="FindOpportunity" view-size="20"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
         <actions>
             <set field="parameters.noConditionFind" value="Y"/>
@@ -54,7 +54,7 @@
         </actions>
         <field name="salesOpportunityId"><hidden/></field>
         <field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}">
-            <hyperlink target="viewOpportunity?salesOpportunityId=${salesOpportunityId}" description="${opportunityName}"/>
+            <hyperlink target="ViewOpportunity?salesOpportunityId=${salesOpportunityId}" description="${opportunityName}"/>
         </field>
         <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}"><display/></field>
         <field name="estimatedAmount" title="${uiLabelMap.SfaEstimatedAmount}"><display/></field>