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

Bug #1536: Do not regenerate project code when creating from template

Browse source 
Two changes:
* In project creation pop-up, it's not needed to change the project code when a
  template is selected.
* When the project is created from the template, the code used is the one in the
  project creation pop-up and not a new one (like it was happen before).

FEA: ItEr77S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-09-24 08:41:53 +02:00
parent 125146ebd2
commit 1ba7d62bc7
2 changed files with 12 additions and 4 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/OrderModel.java
View file

@ -392,15 +392,18 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
Order.create());
planningState.getOrder().setInitDate(new Date());
initializeOrder();
initializeCode();
initializeCalendar();
}
private void initializeOrder() {
Order order = planningState.getOrder();
this.orderElementTreeModel = new OrderElementTreeModel(
order);
planningState.getOrder());
}
private void initializeCode() {
setDefaultCode();
order.setCodeAutogenerated(true);
planningState.getOrder().setCodeAutogenerated(true);
}
private void initializeCalendar() {
@ -414,6 +417,9 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
Order newOrder = createOrderFrom((OrderTemplate) templateDAO
.findExistingEntity(template.getId()));
newOrder.setCode(getOrder().getCode());
newOrder.setCodeAutogenerated(true);
newOrder.setName(getOrder().getName());
newOrder.setCustomer(((Order) getOrder()).getCustomer());
newOrder.setCalendar(getCalendar());

4
libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
View file

@ -286,7 +286,9 @@ public class ProjectDetailsController extends GenericForwardComposer {
generateCode.setDisabled(false);
generateCode.setTooltiptext("");
} else {
setCodeAutogenerated(true);
if (!isCodeAutogenerated()) {
setCodeAutogenerated(true);
}
generateCode.setDisabled(true);
generateCode
.setTooltiptext(_("Set Code as autogenerated to create a new project from templates"));