svn commit: r1650888 - in /ofbiz/branches/release14.12: ./ specialpurpose/projectmgr/widget/forms/TaskForms.xml

Author: jleroux
Date: Sun Jan 11 11:26:24 2015
New Revision: 1650888

URL: http://svn.apache.org/r1650888
Log:
"Applied fix from trunk for revision: 1650887  "
------------------------------------------------------------------------
r1650887 | jleroux | 2015-01-11 12:25:00 +0100 (dim. 11 janv. 2015) | 7 lignes

A patch from Pierre Smits for "link of dependent task in Task Dependencies of task links Dependencies of Task" https://issues.apache.org/jira/browse/OFBIZ-5815

In the dependencies overview of a task links are provided for the tasks listed.
These links link to the dependencies overview of the task that has been accessed.
The links should point to the dependent task.

jleroux: while testing I had a doubt about Pierre's assertion, but I agree it makes more sense to link to the dependent tasks than to the dependencies overview
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 11 11:26:24 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649742,1650240,1650583,1650642,1650678,1650882
+/ofbiz/trunk:1649742,1650240,1650583,1650642,1650678,1650882,1650887

Modified: ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1650888&r1=1650887&r2=1650888&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Jan 11 11:26:24 2015
@@ -339,7 +339,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}">
-            <hyperlink target="Dependencies" description="${r.taskInfo.taskName}">
+            <hyperlink target="taskView" description="${r.taskInfo.taskName}">
                 <parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
             </hyperlink>
         </field>
@@ -351,6 +351,7 @@
         <field name="actualCompletionDate"  entry-name="r.taskInfo.actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field>
         <field name="deleteButton"><submit button-type="button"/></field>
     </form>
+    
     <form name="DependenciesAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <row-actions>
@@ -363,7 +364,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdTo" title="${uiLabelMap.CommonName}">
-            <hyperlink target="Dependencies" description="${r.taskInfo.taskName}">
+            <hyperlink target="taskView" description="${r.taskInfo.taskName}">
                 <parameter param-name="workEffortId" from-field="workEffortIdTo"/>
             </hyperlink>
         </field>