svn commit: r1747776 - in /ofbiz/trunk: applications/marketing/widget/
Locked
svn commit: r1747776 - in /ofbiz/trunk: applications/marketing/widget/
 
|
Author: deepak
Date: Fri Jun 10 18:58:37 2016 New Revision: 1747776 URL: http://svn.apache.org/viewvc?rev=1747776&view=rev Log: (OFBIZ-7231) Relocate .groovy files in the framework/common component Added: ofbiz/trunk/framework/common/groovyScripts/ - copied from r1747740, ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ Removed: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/ Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/framework/common/widget/LookupScreens.xml ofbiz/trunk/framework/common/widget/PortalPageScreens.xml ofbiz/trunk/framework/common/widget/flotScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.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=1747776&r1=1747775&r2=1747776&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Fri Jun 10 18:58:37 2016 @@ -39,7 +39,7 @@ under the License. <set field="applicationMenuLocation" value="component://marketing/widget/sfa/SfaMenus.xml" global="true"/> <set field="applicationTitle" value="${uiLabelMap.SfaManagerApplication}" global="true"/> <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="SFA" global="true"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/> + <script location="component://common/groovyScripts/GetParentPortalPageId.groovy"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1747776&r1=1747775&r2=1747776&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Jun 10 18:58:37 2016 @@ -43,7 +43,7 @@ under the License. <screen name="cctypes"> <section> <actions> - <script location="component://common/webcommon/WEB-INF/actions/includes/CcTypes.groovy"/> + <script location="component://common/groovyScripts/CcTypes.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://common/template/includes/CcTypes.ftl"/></html></platform-specific> @@ -423,7 +423,7 @@ under the License. <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="searchType" from-field="parameters.searchType" default-value="${searchType}"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy"/> + <script location="component://common/groovyScripts/FindAutocompleteOptions.groovy"/> </actions> <widgets> <decorator-screen name="AjaxGlobalDecorator"> Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=1747776&r1=1747775&r2=1747776&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Fri Jun 10 18:58:37 2016 @@ -264,7 +264,7 @@ under the License. <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="inputFields" from-field="parameters"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy"/> + <script location="component://common/groovyScripts/GetLocaleList.groovy"/> </actions> <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=1747776&r1=1747775&r2=1747776&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Fri Jun 10 18:58:37 2016 @@ -128,7 +128,7 @@ under the License. <actions> <set field="originalPortalPageId" from-field="parameters.originalPortalPageId"/> <set field="mainPortalPageId" from-field="parameters.mainPortalPageId"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPortlets.groovy"/> + <script location="component://common/groovyScripts/ListPortalPortlets.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/common/widget/flotScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/flotScreens.xml?rev=1747776&r1=1747775&r2=1747776&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/flotScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/flotScreens.xml Fri Jun 10 18:58:37 2016 @@ -23,7 +23,7 @@ under the License. <screen name="FlotChart"> <section> <actions> - <script location="component://common/webcommon/WEB-INF/actions/includes/PrepareDataForFlotGraph.groovy"/> + <script location="component://common/groovyScripts/PrepareDataForFlotGraph.groovy"/> </actions> <widgets> <platform-specific> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=1747776&r1=1747775&r2=1747776&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Fri Jun 10 18:58:37 2016 @@ -40,7 +40,7 @@ under the License. <set field="applicationMenuName" value="MyPortalAppBar" global="true"/> <set field="applicationMenuLocation" value="component://myportal/widget/MyPortalMenus.xml" global="true"/> <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" global="true"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/> + <script location="component://common/groovyScripts/GetParentPortalPageId.groovy"/> <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/> <set field="my" value="My" global="true"/> </actions> @@ -71,7 +71,7 @@ under the License. <set field="applicationMenuLocation" value="component://myportal/widget/MyPortalMenus.xml" global="true"/> <!-- <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" global="true"/> - <script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/> + <script location="component://common/groovyScripts/GetParentPortalPageId.groovy"/> <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/> <set field="my" value="My" global="true"/> --> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |