svn commit: r600304 - in /ofbiz/trunk/specialpurpose/projectmgr: webapp/projectmgr/WEB-INF/actions/getProjectId.bsh widget/forms/ProjectForms.xml widget/forms/TaskForms.xml

[hansbak-2]

Author: hansbak
Date: Sun Dec  2 07:04:44 2007
New Revision: 600304

URL: http://svn.apache.org/viewvc?rev=600304&view=rev
Log:
error corrected in task dependency delete

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh?rev=600304&r1=600303&r2=600304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh Sun Dec  2 07:04:44 2007
@@ -23,7 +23,7 @@
 import org.ofbiz.base.util.*;
 import org.ofbiz.base.util.UtilMisc;
 import javolution.util.FastMap;
-Debug.logInfo("==========workEffortId:" + parameters.get("workEffortId"),"");
+
 if (parameters.get("workEffortId") != null) {
     workEffortId = parameters.get("workEffortId");
     projects = delegator.findByAnd("ProjectAndPhaseAndTask", UtilMisc.toMap("workEffortId", workEffortId));

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=600304&r1=600303&r2=600304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Dec  2 07:04:44 2007
@@ -289,6 +289,7 @@
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
                 <entity-options entity-name="RoleType" description="${description}">
+                    <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=600304&r1=600303&r2=600304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Dec  2 07:04:44 2007
@@ -183,10 +183,10 @@
     </form>
     <form name="Dependencies" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies">
         <field name="workEffortIdTo"><hidden/></field>
-        <field name="projectId"><hidden/></field>
+        <field name="workEffortIdFrom"><hidden/></field>
         <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field>
         <field name="fromDate"><hidden/></field>
-        <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
+        <field name="workEffortId"><hidden/></field>
         <field name="workEffortToName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="workEffortToParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/>/></field>        
         <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/>/></field>
@@ -212,8 +212,8 @@
         <field name="add"><submit/></field>
     </form>
     <form name="AddDependencyAfter" type="single" target="addDependency">
+        <field name="workEffortIdFrom"><hidden value="${workEffortId}"/></field>
         <field name="workEffortId"><hidden/></field>
-        <field name="projectId"><hidden value="${parameters.workEffortId}"/></field>
         <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field>
         <field name="relatedTasks" parameter-name="workEffortIdTo">
             <drop-down>