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

[Bug #883] Just after creating a project save it and go to edit mode.

Browse source 
FEA : ItEr72S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-03-16 16:31:44 +01:00
parent 581713d8b9
commit 14d857c176
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -41,9 +41,9 @@ import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.externalcompanies.entities.ExternalCompany; import org.navalplanner.business.externalcompanies.entities.ExternalCompany;
import org.navalplanner.business.orders.entities.HoursGroup; import org.navalplanner.business.orders.entities.HoursGroup;
import org.navalplanner.business.orders.entities.Order; import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.orders.entities.Order.SchedulingMode;
import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.orders.entities.OrderStatusEnum; import org.navalplanner.business.orders.entities.OrderStatusEnum;
import org.navalplanner.business.orders.entities.Order.SchedulingMode;
import org.navalplanner.business.templates.entities.OrderTemplate; import org.navalplanner.business.templates.entities.OrderTemplate;
import org.navalplanner.business.users.entities.UserRole; import org.navalplanner.business.users.entities.UserRole;
import org.navalplanner.web.common.IMessagesForUser; import org.navalplanner.web.common.IMessagesForUser;
@ -1035,13 +1035,20 @@ public class OrderCRUDController extends GenericForwardComposer {
orderModel.prepareForCreate(); orderModel.prepareForCreate();
} }
public void editNewCreatedOrder() { private void editNewCreatedOrder() {
showOrderElementFilter(); showOrderElementFilter();
hideCreateButtons(); hideCreateButtons();
prepareEditWindow(); prepareEditWindow();
showEditWindow(_("Create project")); showEditWindow(_("Create project"));
} }
public void editNewCreatedOrder(Window detailsWindow) {
editNewCreatedOrder();
// close project details window
detailsWindow.setVisible(false);
saveAndContinue();
}
public ProjectDetailsController getCreationPopup() { public ProjectDetailsController getCreationPopup() {
if (projectDetailsController == null) { if (projectDetailsController == null) {
projectDetailsController = new ProjectDetailsController(); projectDetailsController = new ProjectDetailsController();

3
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java
View file

@ -122,8 +122,7 @@ public class ProjectDetailsController extends GenericForwardComposer {
if (tabs != null) { if (tabs != null) {
tabs.goToOrdersList(); tabs.goToOrdersList();
} }
orderController.editNewCreatedOrder(); orderController.editNewCreatedOrder(window);
close();
} }
} }