Author: jleroux Date: Mon Jan 18 13:08:48 2016 New Revision: 1725259 URL: http://svn.apache.org/viewvc?rev=1725259&view=rev Log: "Applied fix from trunk for revision: 1725257" ------------------------------------------------------------------------ r1725257 | jleroux | 2016-01-18 14:08:12 +0100 (lun. 18 janv. 2016) | 7 lignes
A patch from "Ralph" (info at agentur-m3 dot de) for "ProjectMgr: GanttChart fails, in case of dependencies for tasks" https://issues.apache.org/jira/browse/OFBIZ-6842 the problen is in line 127: taskInfo.preDecessor = latestTaskIds This line causes brackets around ids (e.g.: [10098] ) And these brackets cannot be processed by jsgantt. So in case of dependencies the ganttchart will not be displayed. ------------------------------------------------------------------------ Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Propchange: ofbiz/branches/release15.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 18 13:08: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,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724975,1724978,1725006,1725217 +/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724975,1724978,1725006,1725217,1725257 Modified: ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=1725259&r1=1725258&r2=1725259&view=diff ============================================================================== --- ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original) +++ ofbiz/branches/release15.12/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Mon Jan 18 13:08:48 2016 @@ -123,8 +123,17 @@ if (phases) { wf = preTask.getRelatedOne("FromWorkEffort", false); latestTaskIds.add(wf.workEffortId); } + count = 0; if (UtilValidate.isNotEmpty(latestTaskIds)) { - taskInfo.preDecessor = latestTaskIds; + taskInfo.preDecessor = ""; + for (i in latestTaskIds) { + if (count > 0) { + taskInfo.preDecessor = taskInfo.preDecessor +", " + i; + } else { + taskInfo.preDecessor = taskInfo.preDecessor + i; + } + count ++; + } } ganttList.add(taskInfo); }
