Author: pranayp
Date: Sat Jun 18 07:13:41 2016
New Revision: 1748926
URL: http://svn.apache.org/viewvc?rev=1748926&view=rev
Log:
Applied fix from trunk for revision: 1748925
===
[OFBIZ-7329] Fixed an exception being thrown when day links are clicked in the
Week and Month view of the Calendar widget. Changed the name of the 'start'
parameter to "startTime" as at the time of creating a valid context for
"getWorkEffortEventsByPeriod", the "start" parameter for the service was
expected to be in Timestamp format but was actually in String format.
Thanks Aditya Patwa for reporting the issue and providing patch.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/day.ftl
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/month.ftl
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/week.ftl
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 18 07:13:41 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925
Modified:
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/day.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/day.ftl?rev=1748926&r1=1748925&r2=1748926&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/day.ftl
(original)
+++
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/day.ftl
Sat Jun 18 07:13:41 2016
@@ -37,7 +37,7 @@ under the License.
<tr<#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="label">
${period.start?time?string.short}<br />
- <a
href="<@ofbizUrl>${newCalEventUrl}?period=day&form=edit&parentTypeId=${parentTypeId!}&start=${parameters.start!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a
href="<@ofbizUrl>${newCalEventUrl}?period=day&form=edit&parentTypeId=${parentTypeId!}&startTime=${parameters.start!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate??>
Modified:
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/month.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/month.ftl?rev=1748926&r1=1748925&r2=1748926&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/month.ftl
(original)
+++
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/month.ftl
Sat Jun 18 07:13:41 2016
@@ -39,12 +39,12 @@ under the License.
<#if indexMod7 = 0>
<tr>
<td class="label" ${styleTd}>
- <a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonWeek}
${period.start?date?string("w")}</a>
+ <a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&startTime=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonWeek}
${period.start?date?string("w")}</a>
</td>
</#if>
<td ${styleTd} <#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
- <span class="h1"><a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
- <a class="add-new"
href='<@ofbizUrl>${newCalEventUrl}?period=month&form=edit&start=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
+ <span class="h1"><a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&startTime=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
+ <a class="add-new"
href='<@ofbizUrl>${newCalEventUrl}?period=month&form=edit&startTime=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
<br class="clear"/>
<#assign maxNumberOfPersons = 0/>
@@ -114,7 +114,7 @@ under the License.
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td nowrap="nowrap" class="monthdaynumber"><a
href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam!}</@ofbizUrl>'
class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
+ <td nowrap="nowrap" class="monthdaynumber"><a
href='<@ofbizUrl>day?startTime=${period.start.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam!}</@ofbizUrl>'
class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
<td align="right"><a
href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam!}</@ofbizUrl>'
class="add">${uiLabelMap.CommonAddNew}</a> </td>
</tr>
</table>
Modified:
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/week.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/week.ftl?rev=1748926&r1=1748925&r2=1748926&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/week.ftl
(original)
+++
ofbiz/branches/release15.12/applications/workeffort/webapp/workeffort/calendar/week.ftl
Sat Jun 18 07:13:41 2016
@@ -36,8 +36,8 @@ under the License.
<#if (nowTimestamp >= period.start) && (nowTimestamp <=
period.end)><#assign currentPeriod = true/></#if>
<tr<#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="centered" width="1%">
- <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br
/>
- <a
href="<@ofbizUrl>${newCalEventUrl}?period=week&form=edit&start=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam!}${urlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&startTime=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br
/>
+ <a
href="<@ofbizUrl>${newCalEventUrl}?period=week&form=edit&startTime=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam!}${urlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate??>
