Author: pranayp
Date: Mon Jun 13 13:19:48 2016
New Revision: 1748222
URL: http://svn.apache.org/viewvc?rev=1748222&view=rev
Log:
Applied fix from trunk for revision: 1748218
===
[OFBIZ-7115] Fixed terminal errors on Timesheet overview page of projectmgr and
scrum. Removed the check on workEffortId which was not making difference or
directing any purpose and causing errors.
Thanks Vaibhav Jain for reporting the issue and providing initial patch, thanks
Amardeep Singh Jhajj and Jacques for reviewing the patch and providing your
comments, thanks Montalbano Florian for providing final patch including Scrum
component.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
ofbiz/branches/release15.12/specialpurpose/scrum/widget/MyWorkForms.xml
ofbiz/branches/release15.12/specialpurpose/scrum/widget/TimeSheetForms.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 13 13:19:48 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
+/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
Modified:
ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1748222&r1=1748221&r2=1748222&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
(original)
+++
ofbiz/branches/release15.12/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Mon Jun 13 13:19:48 2016
@@ -42,7 +42,7 @@
<entity-order-by field-name="sequenceNum"/>
<entity-order-by field-name="workEffortName"/>
</entity-options>
- <sub-hyperlink target="taskView"
description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}">
+ <sub-hyperlink target="taskView" description="${workEffortId}">
<parameter param-name="workEffortId"/>
<parameter param-name="my"/>
</sub-hyperlink>
@@ -206,9 +206,7 @@
<form name="QuickCreateTimeEntry" target="createQuickTimeEntry" title=""
type="single"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <entity-one entity-name="WorkEffort">
- <field-map field-name="workEffortId" from-field=""/>
- </entity-one>
+ <entity-one entity-name="WorkEffort" value-field="workEffortId"/>
</actions>
<field name="timesheetId" map-name="currentTimesheet"><hidden/></field>
<field name="partyId" map-name="userLogin"><hidden/></field>
Modified:
ofbiz/branches/release15.12/specialpurpose/scrum/widget/MyWorkForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/widget/MyWorkForms.xml?rev=1748222&r1=1748221&r2=1748222&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/scrum/widget/MyWorkForms.xml
(original)
+++ ofbiz/branches/release15.12/specialpurpose/scrum/widget/MyWorkForms.xml Mon
Jun 13 13:19:48 2016
@@ -132,7 +132,7 @@
<drop-down allow-empty="true"
current-description="${result.projectId} ${product.productId} -
${result.projectName}${product.internalName} - ${result.sprintName} -
${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}]
-
${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]">
<list-options key-name="taskId" list-name="taskListDropdown"
description="${projectId}${productId} - ${projectName} ${productName} -
${sprintName} - ${groovy: if (description)
description.substring(0,Math.min(description.length(),30))} [${custRequestId}]
- ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
<entity-options entity-name="EmplLeaveType"
key-field-name="leaveTypeId"/>
- <sub-hyperlink target="taskView"
description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}"
target-window="_blank">
+ <sub-hyperlink target="taskView" description="${workEffortId}">
<parameter param-name="taskId" from-field="workEffortId"/>
</sub-hyperlink>
</drop-down>
@@ -163,4 +163,4 @@
<field name="updateButton"><submit button-type="button"/></field>
<field name="_rowSubmit" title="${uiLabelMap.ScrumRowSubmit}"><hidden
value="Y"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified:
ofbiz/branches/release15.12/specialpurpose/scrum/widget/TimeSheetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/widget/TimeSheetForms.xml?rev=1748222&r1=1748221&r2=1748222&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/scrum/widget/TimeSheetForms.xml
(original)
+++ ofbiz/branches/release15.12/specialpurpose/scrum/widget/TimeSheetForms.xml
Mon Jun 13 13:19:48 2016
@@ -145,7 +145,7 @@
<drop-down allow-empty="true"
current-description="${result.projectId} ${product.productId} -
${result.projectName}${product.internalName} - ${result.sprintName} -
${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}]
-
${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]">
<list-options key-name="taskId" list-name="taskListDropdown"
description="${projectId}${productId} - ${projectName} ${productName} -
${sprintName} - ${groovy: if (description)
description.substring(0,Math.min(description.length(),30))} [${custRequestId}]
- ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
<entity-options entity-name="EmplLeaveType"
key-field-name="leaveTypeId"/>
- <sub-hyperlink target="taskView"
description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}"
target-window="_blank">
+ <sub-hyperlink target="taskView" description="${workEffortId}">
<parameter param-name="taskId" from-field="workEffortId"/>
</sub-hyperlink>
</drop-down>
@@ -198,4 +198,4 @@
<field entry-name="dummy" name="requiredDate"
title="${uiLabelMap.ScrumSelectedDate}"><date-time type="date"/></field>
<field name="addButton"><submit/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
