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

Bug #1494: Deadline field disabled for subcontracted tasks also in Project

Browse source 
Details perspective.

FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-07-13 11:43:31 +02:00
parent c370dccc65
commit f4e6f6f59b
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,7 @@ import org.libreplan.business.orders.entities.OrderElement;
import org.libreplan.web.common.Util;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.api.Datebox;
/**
* Controller for {@link OrderElement} details
@ -37,6 +38,8 @@ public class DetailsOrderElementController extends
private IOrderElementModel orderElementModel;
private Datebox deadline;
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
@ -53,6 +56,7 @@ public class DetailsOrderElementController extends
public void openWindow(IOrderElementModel model) {
setOrderElementModel(model);
deadline.setDisabled(isSubcontracted());
Util.reloadBindings(self);
}
@ -67,6 +71,14 @@ public class DetailsOrderElementController extends
return !orderElementModel.getOrderElement().isLeaf();
}
private boolean isSubcontracted() {
if (orderElementModel.getOrderElement() == null) {
return false;
}
return orderElementModel.getOrderElement().getTaskSource().getTask()
.isSubcontracted();
}
public String getMoneyFormat() {
return Util.getMoneyFormat();
}

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

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