Author: deepak
Date: Sat Jun 11 05:50:23 2016
New Revision: 1747848
URL: http://svn.apache.org/viewvc?rev=1747848&view=rev
Log:
(OFBIZ-7218) Relocate .groovy files in the specialpurpose/projectmgr component
Added:
ofbiz/trunk/specialpurpose/projectmgr/groovyScripts/
- copied from r1747847,
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/
Removed:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=1747848&r1=1747847&r2=1747848&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sat Jun 11
05:50:23 2016
@@ -112,7 +112,7 @@ under the License.
<actions>
<set field="headerItem" value="task"/>
<entity-one entity-name="WorkEffort" value-field="workEffort"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/getProjectId.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml?rev=1747848&r1=1747847&r2=1747848&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml Sat Jun
11 05:50:23 2016
@@ -76,7 +76,7 @@ under the License.
<set field="fromPartyId"
from-field="communicationEvent.partyIdFrom"/>
<set field="statusId" from-field="custRequest.statusId"/>
<entity-one entity-name="StatusItem"
value-field="currentStatus"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/getLastRequestAssignment.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonRequestDecorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1747848&r1=1747847&r2=1747848&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Jun 11
05:50:23 2016
@@ -110,7 +110,7 @@ under the License.
<set field="tabButtonItem" value="billing"/>
<set field="labelTitleProperty"
value="PageTitleProjectBilling"/>
<set field="projectId" from-field="parameters.projectId"
default-value="${parameters.workEffortId}"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/ProjectBilling.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonProjectDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -415,7 +415,7 @@ under the License.
<set field="tabButtonItem" value="ganttchart"/>
<set field="layoutSettings.javaScripts[]"
value="/images/jsgantt.js" global="true"/>
<set field="layoutSettings.styleSheets[]"
value="/images/jsgantt.css" global="true"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/GanttChart.groovy"/>
</actions>
<widgets>
<label text="${project}"/>
@@ -986,7 +986,7 @@ under the License.
<actions>
<set field="projectId"
from-field="project.workEffortId"/>
<set field="parameters.projectId"
from-field="project.workEffortId"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/GanttChart.groovy"/>
<service service-name="getProject"
result-map="result">
<field-map field-name="projectId"
from-field="projectId"/>
</service>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=1747848&r1=1747847&r2=1747848&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml Sat Jun 11
05:50:23 2016
@@ -55,7 +55,7 @@ under the License.
<set field="tabButtonItem" value="ListBillingHours"/>
<set field="labelTitleProperty" value="ProjectMgrProjectName"/>
<set field="partyId" from-field="parameters.partyId"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/ListResourceBillingHours.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=1747848&r1=1747847&r2=1747848&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sat Jun 11
05:50:23 2016
@@ -195,7 +195,7 @@ under the License.
<set field="labelTitleProperty" value="PageTitleEditTaskList"/>
<set field="workEffortId"
from-field="parameters.workEffortId"/>
<entity-one entity-name="WorkEffort" value-field="task"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/getProjectId.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -375,7 +375,7 @@ under the License.
<actions>
<set field="parameters.workEffortIdFrom"
from-field="parameters.workEffortId"/>
<set field="parameters.workEffortTypeId" value="TASK"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
+ <script
location="component://projectmgr/groovyScripts/ChildWorkEffort.bsh"/>
</actions>
<widgets>
<screenlet title="${uiLabelMap.ProjectMgrSubTasks}">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=1747848&r1=1747847&r2=1747848&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sat Jun
11 05:50:23 2016
@@ -52,7 +52,7 @@ under the License.
<set field="headerItem" value="timesheet"/>
<set field="tabButtonItem" value="editTimesheet"/>
<set field="labelTitleProperty"
value="ProjectMgrTimeSheetMyTime"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/EditWeekTimesheet.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonTimesheetDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -137,7 +137,7 @@ under the License.
<set field="tabButtonItem" value="edittimesheet"/>
<set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
<set field="my" value="My"/><!-- change link and target -->
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/EditWeekTimesheet.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonMyTimeDecorator"
location="${parameters.mainDecoratorLocation}">
@@ -204,7 +204,7 @@ under the License.
<section>
<actions>
<property-map resource="ProjectMgrUiLabels"
map-name="uiLabelMap" global="true"/>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/EditWeekTimesheet.groovy"/>
</actions>
<widgets>
<section>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1747848&r1=1747847&r2=1747848&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Jun
11 05:50:23 2016
@@ -189,10 +189,10 @@
<form name="ListCurrentProjects" type="list" list-name="projects"
paginate-target="main"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/ListCurrentProjects.groovy"/>
</actions>
<row-actions>
- <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy"/>
+ <script
location="component://projectmgr/groovyScripts/ProjectIsBillable.groovy"/>
</row-actions>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"
widget-style="buttontext">
<hyperlink description="${projectName}" target="projectView">