RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allows the limiting resource assignment when there are

Browse source 
subcontractor progresses.

FEA: ItEr76S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2012-07-04 18:57:22 +01:00
parent 1f34a41d0d
commit adfa296873
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
View file

@ -339,11 +339,8 @@ public class TaskPropertiesController extends GenericForwardComposer {
restoreOldState();
editTaskController.showNonPermitChangeResourceAllocationType();
} else {
if(newState.equals(ResourceAllocationTypeEnum.SUBCONTRACT) && checkCompatibleAllocation()){
changeResourceAllocationType(oldState, newState);
editTaskController.selectAssignmentTab(lbResourceAllocationType
.getSelectedIndex() + 1);
}else{
if(newState.equals(ResourceAllocationTypeEnum.SUBCONTRACT)
&& !checkCompatibleAllocation()){
try {
restoreOldState();
Messagebox.show(_("This resource allocation type is incompatible. The task has an associated order element which has a progress that is of type subcontractor. "),
@ -352,6 +349,9 @@ public class TaskPropertiesController extends GenericForwardComposer {
// TODO Auto-generated catch block
e.printStackTrace();
}
}else{
changeResourceAllocationType(oldState,newState);
editTaskController.selectAssignmentTab(lbResourceAllocationType.getSelectedIndex() + 1);
}
}
}