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

Bug #1494: Check for null TaskSources before calling getTask().isSubcontracted().

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-07-13 14:00:35 +02:00
parent 75f27d6715
commit b8e74ff392
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java
View file

@ -72,7 +72,8 @@ public class DetailsOrderElementController extends
}
private boolean isSubcontracted() {
if (orderElementModel.getOrderElement() == null) {
if (orderElementModel.getOrderElement() == null
|| orderElementModel.getOrderElement().getTaskSource() == null) {
return false;
}
return orderElementModel.getOrderElement().getTaskSource().getTask()

5
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
View file

@ -484,8 +484,9 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
currentOrderElement.setDeadline(value);
}
});
if (readOnly || currentOrderElement.getTaskSource().
getTask().isSubcontracted()) {
if (readOnly
|| (currentOrderElement.getTaskSource() != null && currentOrderElement
.getTaskSource().getTask().isSubcontracted())) {
dinamicDatebox.setDisabled(true);
}
addDateCell(dinamicDatebox, _("end"));