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

[Bug #947] When closing OrderElement window, if there are errors in advance tab, show this tab with the error

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-04-04 14:33:41 +02:00
parent 1e4dd5eb49
commit 1fa9fb076c
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -241,18 +241,17 @@ public class OrderElementController extends GenericForwardComposer {
}
private void close() {
validateTabs();
self.setVisible(false);
Util.reloadBindings(self.getParent());
if (validateTabs()) {
self.setVisible(false);
Util.reloadBindings(self.getParent());
}
}
private void validateTabs() {
validateProgressTab();
validateTaskQualityTab();
validateCriterionRequirementsTab();
private boolean validateTabs() {
return (validateProgressTab() && validateTaskQualityTab() && validateCriterionRequirementsTab());
}
private void validateTaskQualityTab() {
private boolean validateTaskQualityTab() {
try {
if (assignedTaskQualityFormsController != null) {
assignedTaskQualityFormsController.confirm();
@ -261,9 +260,10 @@ public class OrderElementController extends GenericForwardComposer {
selectTab("tabTaskQualityForm");
throw e;
}
return true;
}
private void validateCriterionRequirementsTab() {
private boolean validateCriterionRequirementsTab() {
try {
if (assignedCriterionRequirementController != null) {
assignedCriterionRequirementController.close();
@ -272,17 +272,20 @@ public class OrderElementController extends GenericForwardComposer {
selectTab("tabRequirements");
throw e;
}
return true;
}
private void validateProgressTab() {
private boolean validateProgressTab() {
try {
if (manageOrderElementAdvancesController != null) {
manageOrderElementAdvancesController.close();
if ((manageOrderElementAdvancesController != null) && (!manageOrderElementAdvancesController.close())){
selectTab("tabAdvances");
return false;
}
} catch (WrongValueException e) {
selectTab("tabAdvances");
throw e;
}
return true;
}
public void close(Event event) {