svn commit: r1747775 - in /ofbiz/trunk/applications: humanres/widget/ workeffort/groovyScripts/ workeffort/groovyScripts/ical/ workeffort/groovyScripts/worke
Locked
svn commit: r1747775 - in /ofbiz/trunk/applications: humanres/widget/ workeffort/groovyScripts/ workeffort/groovyScripts/ical/ workeffort/groovyScripts/worke
 
|
Author: deepak
Date: Fri Jun 10 18:52:49 2016 New Revision: 1747775 URL: http://svn.apache.org/viewvc?rev=1747775&view=rev Log: (OFBIZ-7230) Relocate .groovy files in the workeffort component Added: ofbiz/trunk/applications/workeffort/groovyScripts/ ofbiz/trunk/applications/workeffort/groovyScripts/ical/ - copied from r1747740, ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/actions/ ofbiz/trunk/applications/workeffort/groovyScripts/workeffort/ - copied from r1747740, ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/ Removed: ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/actions/ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/ Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=1747775&r1=1747774&r2=1747775&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Fri Jun 10 18:52:49 2016 @@ -33,7 +33,7 @@ <actions> <set field="titleProperty" value="PageTitleCalendarDay"/> <set field="tabButtonItem" value="day"/> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Days.groovy"/> </actions> <widgets> <screenlet title="${uiLabelMap.WorkEffortDayView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day"> @@ -53,7 +53,7 @@ </or> </condition> <actions> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Week.groovy"/> </actions> <widgets> <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week"> @@ -70,7 +70,7 @@ <if-compare field="parameters.period" operator="equals" value="month"/> </condition> <actions> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Month.groovy"/> </actions> <widgets> <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month"> @@ -87,7 +87,7 @@ <if-compare field="parameters.period" operator="equals" value="upcoming"/> </condition> <actions> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Upcoming.groovy"/> </actions> <widgets> <screenlet title="${uiLabelMap.WorkEffortCalendarUpComingEventsView}" navigation-menu-name="Upcoming"> @@ -120,7 +120,7 @@ <section> <actions> <entity-one entity-name="WorkEffort" value-field="workEffort"/> - <script location="component:///workeffort/webapp/ical/WEB-INF/actions/isCalOwner.groovy"/> + <script location="component:///workeffort/groovyScripts/ical/isCalOwner.groovy"/> <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="trainingClassTypeId" from-field="workEffort.workEffortName"/> <set field="workEffortTypeId" from-field="workEffort.workEffortTypeId"/> Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=1747775&r1=1747774&r2=1747775&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Fri Jun 10 18:52:49 2016 @@ -26,7 +26,7 @@ under the License. <actions> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> <set field="parameters.period" from-field="parameters.period" default-value="${initialView}"/> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/CreateUrlParam.groovy"/> <set field="parentTypeId" from-field="parameters.parentTypeId" default-value="EVENT"/><!-- workeffortTypeId parent to ad events --> </actions> <widgets> @@ -45,7 +45,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleCalendarDay"/> <set field="tabButtonItem" value="day"/> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Days.groovy"/> </actions> <widgets> <include-screen name="eventDetail"/> @@ -67,7 +67,7 @@ under the License. </or> </condition> <actions> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Week.groovy"/> </actions> <widgets> <include-screen name="eventDetail"/> @@ -86,7 +86,7 @@ under the License. <if-compare field="parameters.period" operator="equals" value="month"/> </condition> <actions> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Month.groovy"/> </actions> <widgets> <include-screen name="eventDetail"/> @@ -105,7 +105,7 @@ under the License. <if-compare field="parameters.period" operator="equals" value="upcoming"/> </condition> <actions> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Upcoming.groovy"/> </actions> <widgets> <include-screen name="eventDetail"/> @@ -127,7 +127,7 @@ under the License. <section> <actions> <set field="parameters.period" from-field="parameters.period" default-value="${initialView}"/> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/calendar/CreateUrlParam.groovy"/> <set field="titleProperty" value="WorkEffortCalendar"/> </actions> <widgets> @@ -154,7 +154,7 @@ under the License. <not><if-empty field="workEffort" /></not> </condition> <actions> - <script location="component:///workeffort/webapp/ical/WEB-INF/actions/isCalOwner.groovy" /> + <script location="component:///workeffort/groovyScripts/ical/isCalOwner.groovy" /> </actions> <widgets /> </section> Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=1747775&r1=1747774&r2=1747775&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Fri Jun 10 18:52:49 2016 @@ -159,7 +159,7 @@ under the License. <if-has-permission permission="WORKEFFORTMGR" action="_VIEW" /> </condition> <actions> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy" /> + <script location="component://workeffort/groovyScripts/workeffort/calendar/Days.groovy" /> </actions> <widgets> <screenlet id="calendarOptions" name="calendarOptionsScreenlet" collapsible="true" title="${uiLabelMap.WorkEffortCalendarFindEntries}"> Modified: ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml?rev=1747775&r1=1747774&r2=1747775&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CustRequestScreens.xml Fri Jun 10 18:52:49 2016 @@ -32,7 +32,7 @@ under the License. <set field="custRequestId" from-field="parameters.custRequestId"/> <entity-one entity-name="CustRequest" value-field="custRequest"/> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/request/RequestList.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/request/RequestList.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=1747775&r1=1747774&r2=1747775&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Fri Jun 10 18:52:49 2016 @@ -674,7 +674,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleSearchResults"/> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchResults.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/find/WorkEffortSearchResults.groovy"/> </actions> <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> @@ -692,7 +692,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleSearchResults"/> - <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.groovy"/> + <script location="component://workeffort/groovyScripts/workeffort/find/WorkEffortSearchOptions.groovy"/> </actions> <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |