Small code refactor.
This commit is contained in:
parent
23e9034372
commit
6baf5d0459
1 changed files with 9 additions and 14 deletions
|
|
@ -136,8 +136,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
|||
showOrderElementFilter();
|
||||
showCreateButtons(false);
|
||||
orderModel.prepareCreationFrom(template, getDesktop());
|
||||
prepareEditWindow();
|
||||
showEditWindow(_("Create project from Template"));
|
||||
prepareEditWindow(_("Create project from Template"));
|
||||
}
|
||||
|
||||
@Resource
|
||||
|
|
@ -939,15 +938,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
|||
}
|
||||
|
||||
orderModel.initEdit(order, getDesktop());
|
||||
if (editWindow != null) {
|
||||
resetTabControllers();
|
||||
setupOrderElementTreeController();
|
||||
selectDefaultTab();
|
||||
return;
|
||||
}
|
||||
|
||||
prepareEditWindow();
|
||||
showEditWindow(_("Edit project"));
|
||||
prepareEditWindow(_("Edit project"));
|
||||
}
|
||||
|
||||
private Desktop getDesktop() {
|
||||
|
|
@ -965,11 +956,16 @@ public class OrderCRUDController extends GenericForwardComposer {
|
|||
orderAuthorizationController = null;
|
||||
}
|
||||
|
||||
private void prepareEditWindow() {
|
||||
private void prepareEditWindow(String title) {
|
||||
resetTabControllers();
|
||||
addEditWindowIfNecessary();
|
||||
updateDisabilitiesOnInterface();
|
||||
setupOrderElementTreeController();
|
||||
selectDefaultTab();
|
||||
|
||||
if (editWindow == null) {
|
||||
showEditWindow(title);
|
||||
}
|
||||
}
|
||||
|
||||
private void showEditWindow(String title) {
|
||||
|
|
@ -1069,8 +1065,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
|||
public void editNewCreatedOrder(Window detailsWindow) {
|
||||
showOrderElementFilter();
|
||||
hideCreateButtons();
|
||||
prepareEditWindow();
|
||||
showEditWindow(_("Create project"));
|
||||
prepareEditWindow(_("Create project"));
|
||||
detailsWindow.setVisible(false);
|
||||
setupOrderAuthorizationController();
|
||||
detailsWindow.getAttributes();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue