Author: deepak
Date: Fri Jun 10 18:30:58 2016
New Revision: 1747767
URL: http://svn.apache.org/viewvc?rev=1747767&view=rev
Log:
(OFBIZ-7226) relocate .groovy files in the marketing component
Added:
ofbiz/trunk/applications/marketing/groovyScripts/
ofbiz/trunk/applications/marketing/groovyScripts/marketing/
- copied from r1747740,
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/
ofbiz/trunk/applications/marketing/groovyScripts/sfa/
- copied from r1747740,
ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/
Removed:
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/
ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/
Modified:
ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=1747767&r1=1747766&r2=1747767&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Fri Jun 10
18:30:58 2016
@@ -261,7 +261,7 @@ under the License.
<entity-one entity-name="StatusItem" value-field="status"/>
<!-- get the contact list owner's marketing email -->
- <script
location="component://marketing/webapp/marketing/WEB-INF/actions/contact/GetContactListMarketingEmail.groovy"/>
+ <script
location="component://marketing/groovyScripts/marketing/contact/GetContactListMarketingEmail.groovy"/>
<set field="contactMechIdFrom"
value="${marketingEmail.contactMechId}"/>
<set field="partyIdFrom" value="${contactList.ownerPartyId}"/>
</actions>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?rev=1747767&r1=1747766&r2=1747767&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
(original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Fri
Jun 10 18:30:58 2016
@@ -87,7 +87,7 @@ under the License.
<set field="fromDate" from-field="requestParameters.fromDate"
type="Timestamp"/>
<set field="thruDate" from-field="requestParameters.thruDate"
type="Timestamp"/>
<set field="trackingCodeId"
from-field="requestParameters.trackingCodeId"/>
- <script
location="component://marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy"/>
+ <script
location="component://marketing/groovyScripts/marketing/reports/TrackingCodeReport.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonMarketReportDecorator">
@@ -109,7 +109,7 @@ under the License.
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
<set field="fromDate" from-field="requestParameters.fromDate"
type="Timestamp"/>
<set field="thruDate" from-field="requestParameters.thruDate"
type="Timestamp"/>
- <script
location="component://marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy"/>
+ <script
location="component://marketing/groovyScripts/marketing/reports/MarketingCampaignReport.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonMarketReportDecorator">
@@ -132,7 +132,7 @@ under the License.
<set field="partyIdFrom" from-field="parameters.partyIdFrom"
type="String"/>
<set field="partyIdTo" from-field="parameters.partyIdTo"
type="String"/>
<set field="roleStatusId" from-field="parameters.roleStatusId"
type="String"/>
- <script
location="component://marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy"/>
+ <script
location="component://marketing/groovyScripts/marketing/reports/EmailStatusReport.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonMarketReportDecorator">
@@ -154,7 +154,7 @@ under the License.
<set field="thruDate" from-field="parameters.thruDate"
type="Timestamp"/>
<set field="contactListId"
from-field="parameters.contactListId" type="String"/>
<set field="statusId" from-field="parameters.statusId"
type="String"/>
- <script
location="component://marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy"/>
+ <script
location="component://marketing/groovyScripts/marketing/reports/PartyStatusReport.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonMarketReportDecorator">
Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=1747767&r1=1747766&r2=1747767&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Fri Jun 10
18:30:58 2016
@@ -98,7 +98,7 @@ under the License.
<set field="titleProperty" value="PageTitleCreateContact"/>
<set field="headerItem" value="Contacts"/>
<set field="tabButtonItem" value="MergeContacts"/>
- <script
location="component://marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy"/>
+ <script
location="component://marketing/groovyScripts/sfa/MergeContacts.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonContactDecorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=1747767&r1=1747766&r2=1747767&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Fri Jun 10
18:30:58 2016
@@ -130,7 +130,7 @@ under the License.
<actions>
<set field="headerItem" value="Leads"/>
<set field="tabButtonItem" value="CloneLead"/>
- <script
location="component://marketing/webapp/sfa/WEB-INF/action/CloneLead.groovy"/>
+ <script
location="component://marketing/groovyScripts/sfa/CloneLead.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonLeadDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -149,7 +149,7 @@ under the License.
<actions>
<set field="headerItem" value="Leads"/>
<set field="tabButtonItem" value="MergeLeads"/>
- <script
location="component://marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy"/>
+ <script
location="component://marketing/groovyScripts/sfa/MergeContacts.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonLeadDecorator"
location="${parameters.mainDecoratorLocation}">
