You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2016/09/16 21:05:17 UTC
svn commit: r1761087 - in /ofbiz/trunk/applications/marketing/widget: ./
sfa/ sfa/forms/
Author: mbrohl
Date: Fri Sep 16 21:05:17 2016
New Revision: 1761087
URL: http://svn.apache.org/viewvc?rev=1761087&view=rev
Log:
Improved: Marketing: Consistent form name.
(OFBIZ-8077)
Change all form names to upper camel case for consistency.
Thanks: Tanmay Muley for reporting and providing the patch.
Modified:
ofbiz/trunk/applications/marketing/widget/LookupForms.xml
ofbiz/trunk/applications/marketing/widget/LookupScreens.xml
ofbiz/trunk/applications/marketing/widget/SegmentForms.xml
ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml
Modified: ofbiz/trunk/applications/marketing/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/LookupForms.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/LookupForms.xml Fri Sep 16 21:05:17 2016
@@ -30,7 +30,7 @@ under the License.
<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.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listLookupSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="LookupSegmentGroup"
+ <form name="ListLookupSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="LookupSegmentGroup"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
@@ -48,7 +48,7 @@ under the License.
<field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field>
</form>
- <form name="listSegmentGroupClass" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupClass"
+ <form name="ListSegmentGroupClass" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupClass"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="SegmentGroupClassification">
Modified: ofbiz/trunk/applications/marketing/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/LookupScreens.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/LookupScreens.xml Fri Sep 16 21:05:17 2016
@@ -42,7 +42,7 @@ under the License.
<include-form name="LookupSegmentGroup" location="component://marketing/widget/LookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupSegmentGroup" location="component://marketing/widget/LookupForms.xml"/>
+ <include-form name="ListLookupSegmentGroup" location="component://marketing/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/SegmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentForms.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentForms.xml Fri Sep 16 21:05:17 2016
@@ -88,7 +88,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
- <form name="listSegmentGroupClass" list-name="segmentGroupClassList" target="" title="" type="list" paginate-target="listSegmentGroupClass"
+ <form name="ListSegmentGroupClass" list-name="segmentGroupClassList" target="" title="" type="list" paginate-target="listSegmentGroupClass"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="SegmentGroupClassification">
@@ -114,7 +114,7 @@ under the License.
<field name="geoId" title="${uiLabelMap.CommonGeoId}"><lookup target-form-name="LookupGeo"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
- <form name="listSegmentGroupGeo" list-name="segmentGroupGeos" target="" title="" type="list" paginate-target="listSegmentGroupGeo"
+ <form name="ListSegmentGroupGeo" list-name="segmentGroupGeos" target="" title="" type="list" paginate-target="listSegmentGroupGeo"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="SegmentGroupGeo">
@@ -147,7 +147,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
- <form name="listSegmentGroupRole" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupRole"
+ <form name="ListSegmentGroupRole" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupRole"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result" result-map-list="listIt">
Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Fri Sep 16 21:05:17 2016
@@ -175,7 +175,7 @@ under the License.
<screenlet id="AddSegmentGroupClassPanel" title="${uiLabelMap.MarketingSegmentGroupClassCreate}" collapsible="true">
<include-form name="AddSegmentGroupClass" location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
- <include-form name="listSegmentGroupClass" location="component://marketing/widget/SegmentForms.xml"/>
+ <include-form name="ListSegmentGroupClass" location="component://marketing/widget/SegmentForms.xml"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label>
@@ -218,7 +218,7 @@ under the License.
<screenlet id="AddSegmentGroupGeoPanel" title="${uiLabelMap.PageTitleEditSegmentGroupGeo}" collapsible="true">
<include-form name="AddSegmentGroupGeo" location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
- <include-form name="listSegmentGroupGeo" location="component://marketing/widget/SegmentForms.xml"/>
+ <include-form name="ListSegmentGroupGeo" location="component://marketing/widget/SegmentForms.xml"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label>
@@ -261,7 +261,7 @@ under the License.
<screenlet id="AddSegmentGroupRolePanel" title="${uiLabelMap.PageTitleEditSegmentGroupRole}" collapsible="true">
<include-form name="AddSegmentGroupRole" location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
- <include-form name="listSegmentGroupRole" location="component://marketing/widget/SegmentForms.xml"/>
+ <include-form name="ListSegmentGroupRole" location="component://marketing/widget/SegmentForms.xml"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Fri Sep 16 21:05:17 2016
@@ -86,7 +86,7 @@ under the License.
<decorator-screen name="CommonLeadDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLead}">
- <include-form name="createLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ <include-form name="CreateLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -136,7 +136,7 @@ under the License.
<decorator-screen name="CommonLeadDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.SfaCloneLead}">
- <include-form name="createLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ <include-form name="CreateLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LookupScreens.xml Fri Sep 16 21:05:17 2016
@@ -44,7 +44,7 @@ under the License.
<include-form name="FindLeads" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupLead" location="component://marketing/widget/sfa/forms/LookupForms.xml"/>
+ <include-form name="ListLookupLead" location="component://marketing/widget/sfa/forms/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -73,7 +73,7 @@ under the License.
<include-form name="FindAccounts" location="component://marketing/widget/sfa/forms/AccountForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupAccount" location="component://marketing/widget/sfa/forms/LookupForms.xml"/>
+ <include-form name="ListLookupAccount" location="component://marketing/widget/sfa/forms/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -102,7 +102,7 @@ under the License.
<include-form name="FindAccounts" location="component://marketing/widget/sfa/forms/AccountForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupAccountLead" location="component://marketing/widget/sfa/forms/LookupForms.xml"/>
+ <include-form name="ListLookupAccountLead" location="component://marketing/widget/sfa/forms/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Fri Sep 16 21:05:17 2016
@@ -85,7 +85,7 @@ under the License.
<submit button-type="button"/>
</field>
</form>
- <form name="listAccounts" paginate-target="${currentUrl}" type="list" list-name="listIt"
+ <form name="ListAccounts" paginate-target="${currentUrl}" type="list" list-name="listIt"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
<actions>
<set field="roleTypeIdFrom" value="OWNER"/>
@@ -158,7 +158,7 @@ under the License.
</field>
<field name="relatedCompany" use-when="relatedCompanyPartyId==null" title="${uiLabelMap.PartyRelatedCompany}"><display/></field>
</form>
- <form name="ListAccounts" extends="listAccounts">
+ <form name="ListAccounts" extends="ListAccounts">
<field name="assignToMe" use-when="existRelationship==null&&!"false".equals(parameters.get("all"))"
title="${uiLabelMap.SfaAssignToMe}" widget-style="buttontext">
<hyperlink target="createPartyRelationshipAndRole" description="${uiLabelMap.SfaAssignToMe}">
@@ -232,7 +232,7 @@ under the License.
<field name="infoString" title="${contactMechType.description}"><text-find/></field>
</form>
- <form name="listAccountLeads" extends="listAccounts">
+ <form name="ListAccountLeads" extends="ListAccounts">
<actions>
<set field="roleTypeIdTo" value="ACCOUNT_LEAD"/>
<set field="parameters.statusId" value="PARTY_DISABLED"/>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Fri Sep 16 21:05:17 2016
@@ -38,7 +38,7 @@ under the License.
</sort-order>
</form>
<form name="ListContacts" paginate-target="${currentUrl}"
- extends="listAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
+ extends="ListAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
<actions>
<set field="roleTypeIdFrom" value="ACCOUNT"/>
<set field="roleTypeIdTo" value="CONTACT"/>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Fri Sep 16 21:05:17 2016
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="createLead" type="single" target="createLead" header-row-style="header-row" default-table-style="basic-table" default-map-name="contactDetailMap">
+ <form name="CreateLead" type="single" target="createLead" header-row-style="header-row" default-table-style="basic-table" default-map-name="contactDetailMap">
<field name="firstName" required-field="true"><text/></field>
<field name="lastName" required-field="true"><text/></field>
<field name="suffix"><text/></field>
@@ -172,7 +172,7 @@ under the License.
</form>
<form name="listLeads" paginate-target="${currentUrl}"
- extends="listAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
+ extends="ListAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
<actions>
<set field="roleTypeIdFrom" value="OWNER"/>
<set field="roleTypeIdTo" value="LEAD"/>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml?rev=1761087&r1=1761086&r2=1761087&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml Fri Sep 16 21:05:17 2016
@@ -21,19 +21,19 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="listLookupAccount" extends="listAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
+ <form name="ListLookupAccount" extends="ListAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
<field name="partyId">
<hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
</field>
<field name="relatedCompany"><hidden/></field>
</form>
- <form name="listLookupLead" extends="listLeads" extends-resource="component://marketing/widget/sfa/forms/LeadForms.xml">
+ <form name="ListLookupLead" extends="listLeads" extends-resource="component://marketing/widget/sfa/forms/LeadForms.xml">
<field name="partyId">
<hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
</field>
<field name="relatedCompany"><hidden/></field>
</form>
- <form name="listLookupAccountLead" extends="listAccountLeads" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
+ <form name="ListLookupAccountLead" extends="ListAccountLeads" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
<field name="partyId">
<hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
</field>