Author: pranayp
Date: Sat May 21 07:17:48 2016
New Revision: 1744862
URL: http://svn.apache.org/viewvc?rev=1744862&view=rev
Log:
Applied bug fix from trunk revision 1744856.
---------------------------------------------------------------------
[OFBIZ-7095] Fixed console error on Calendar Widget pagination. An exception is
being thrown when pagination buttons are clicked on the Calendar widget.
While clicking on the Prev or Next button from the Calendar widget in any view
(Day, Week or Month), an exception is thrown due to unparseable date format.
The main reason behind this was due to the 'start' parameter in the parameters
map. At the time of creating a valid context for "getWorkEffortEventsByPeriod",
the start parameter was expected to be in Timestamp format but was actually in
String.
---------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortMenus.xml
Modified:
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy?rev=1744862&r1=1744861&r2=1744862&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy
(original)
+++
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy
Sat May 21 07:17:48 2016
@@ -21,7 +21,7 @@ import java.util.*;
import java.sql.Timestamp;
import org.ofbiz.base.util.*;
-String startParam = parameters.get("start");
+String startParam = parameters.startTime;
Timestamp start = null;
if (UtilValidate.isNotEmpty(startParam)) {
start = new Timestamp(Long.parseLong(startParam));
Modified:
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy?rev=1744862&r1=1744861&r2=1744862&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
(original)
+++
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy
Sat May 21 07:17:48 2016
@@ -21,7 +21,7 @@ import java.sql.*;
import java.util.*;
import org.ofbiz.base.util.*;
-startParam = parameters.start;
+String startParam = parameters.startTime;
Timestamp start = null;
if (UtilValidate.isNotEmpty(startParam)) {
start = new Timestamp(Long.parseLong(startParam));
Modified:
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy?rev=1744862&r1=1744861&r2=1744862&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
(original)
+++
ofbiz/branches/release14.12/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy
Sat May 21 07:17:48 2016
@@ -21,7 +21,7 @@ import java.util.*;
import java.sql.Timestamp;
import org.ofbiz.base.util.*;
-String startParam = parameters.start;
+String startParam = parameters.startTime;
Timestamp start = null;
if (UtilValidate.isNotEmpty(startParam)) {
start = new Timestamp(Long.parseLong(startParam));
Modified:
ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortMenus.xml?rev=1744862&r1=1744861&r2=1744862&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortMenus.xml
(original)
+++
ofbiz/branches/release14.12/applications/workeffort/widget/WorkEffortMenus.xml
Sat May 21 07:17:48 2016
@@ -144,7 +144,7 @@ under the License.
<menu-item name="next">
<link target="${parameters._LAST_VIEW_NAME_}"
text="${uiLabelMap.WorkEffortNextDay}">
<parameter param-name="period" value="day"/>
- <parameter param-name="start" value="${nextMillis}"/>
+ <parameter param-name="startTime" value="${nextMillis}"/>
<parameter param-name="partyId"
from-field="parameters.partyId"/>
<parameter param-name="fixedAssetId"
from-field="parameters.fixedAssetId"/>
<parameter param-name="workEffortTypeId"
from-field="parameters.workEffortTypeId"/>
@@ -167,7 +167,7 @@ under the License.
<menu-item name="prev">
<link target="${parameters._LAST_VIEW_NAME_}"
text="${uiLabelMap.WorkEffortPreviousDay}">
<parameter param-name="period" value="day"/>
- <parameter param-name="start" value="${prevMillis}"/>
+ <parameter param-name="startTime" value="${prevMillis}"/>
<parameter param-name="partyId"
from-field="parameters.partyId"/>
<parameter param-name="fixedAssetId"
from-field="parameters.fixedAssetId"/>
<parameter param-name="workEffortTypeId"
from-field="parameters.workEffortTypeId"/>
@@ -181,7 +181,7 @@ under the License.
<menu-item name="next">
<link target="${parameters._LAST_VIEW_NAME_}"
text="${uiLabelMap.WorkEffortNextWeek}">
<parameter param-name="period" value="week"/>
- <parameter param-name="start" value="${nextMillis}"/>
+ <parameter param-name="startTime" value="${nextMillis}"/>
<parameter param-name="partyId"
from-field="parameters.partyId"/>
<parameter param-name="fixedAssetId"
from-field="parameters.fixedAssetId"/>
<parameter param-name="workEffortTypeId"
from-field="parameters.workEffortTypeId"/>
@@ -204,7 +204,7 @@ under the License.
<menu-item name="prev">
<link target="${parameters._LAST_VIEW_NAME_}"
text="${uiLabelMap.WorkEffortPreviousWeek}">
<parameter param-name="period" value="week"/>
- <parameter param-name="start" value="${prevMillis}"/>
+ <parameter param-name="startTime" value="${prevMillis}"/>
<parameter param-name="partyId"
from-field="parameters.partyId"/>
<parameter param-name="fixedAssetId"
from-field="parameters.fixedAssetId"/>
<parameter param-name="workEffortTypeId"
from-field="parameters.workEffortTypeId"/>
@@ -218,7 +218,7 @@ under the License.
<menu-item name="next">
<link target="${parameters._LAST_VIEW_NAME_}"
text="${uiLabelMap.WorkEffortNextMonth}">
<parameter param-name="period" value="month"/>
- <parameter param-name="start" value="${nextMillis}"/>
+ <parameter param-name="startTime" value="${nextMillis}"/>
<parameter param-name="partyId"
from-field="parameters.partyId"/>
<parameter param-name="fixedAssetId"
from-field="parameters.fixedAssetId"/>
<parameter param-name="workEffortTypeId"
from-field="parameters.workEffortTypeId"/>
@@ -241,7 +241,7 @@ under the License.
<menu-item name="prev">
<link target="${parameters._LAST_VIEW_NAME_}"
text="${uiLabelMap.WorkEffortPreviousMonth}">
<parameter param-name="period" value="month"/>
- <parameter param-name="start" value="${prevMillis}"/>
+ <parameter param-name="startTime" value="${prevMillis}"/>
<parameter param-name="partyId"
from-field="parameters.partyId"/>
<parameter param-name="fixedAssetId"
from-field="parameters.fixedAssetId"/>
<parameter param-name="workEffortTypeId"
from-field="parameters.workEffortTypeId"/>
