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

Bug #1406: Add validation in the UI and also a try catch for possible ValidationExceptions

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-04-04 16:51:15 +02:00
parent cd229f13af
commit e2df00309a
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java
View file

@ -28,8 +28,11 @@ import java.util.List;
import javax.annotation.Resource;
import org.apache.commons.logging.LogFactory;
import org.hibernate.validator.InvalidValue;
import org.libreplan.business.common.exceptions.ValidationException;
import org.libreplan.business.orders.entities.OrderElement;
import org.libreplan.business.templates.entities.OrderElementTemplate;
import org.libreplan.web.common.ConstraintChecker;
import org.libreplan.web.common.IMessagesForUser;
import org.libreplan.web.common.Level;
import org.libreplan.web.common.MessagesForUser;
@ -215,9 +218,16 @@ public class OrderTemplatesController extends GenericForwardComposer implements
public void saveAndExit() {
if (isAllValid()) {
model.confirmSave();
messagesForUser.showMessage(Level.INFO, _("Template saved"));
show(listWindow);
try {
model.confirmSave();
messagesForUser.showMessage(Level.INFO, _("Template saved"));
show(listWindow);
} catch (ValidationException e) {
for (InvalidValue invalidValue : e.getInvalidValues()) {
messagesForUser.showMessage(Level.ERROR,
invalidValue.getMessage());
}
}
}
}
@ -227,15 +237,24 @@ public class OrderTemplatesController extends GenericForwardComposer implements
public void saveAndContinue() {
if (isAllValid()) {
model.confirmSave();
model.initEdit(getTemplate());
bindTemplatesTreeWithModel();
messagesForUser.showMessage(Level.INFO, _("Template saved"));
try {
model.confirmSave();
model.initEdit(getTemplate());
bindTemplatesTreeWithModel();
messagesForUser.showMessage(Level.INFO, _("Template saved"));
} catch (ValidationException e) {
for (InvalidValue invalidValue : e.getInvalidValues()) {
messagesForUser.showMessage(Level.ERROR,
invalidValue.getMessage());
}
}
}
}
private boolean isAllValid() {
// validate template name
ConstraintChecker.isValid(editWindow);
name = (Textbox) editWindow.getFellowIfAny("name");
if ((name != null) && (!name.isValid())) {
selectTab("tabGeneralData");

2
libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java
View file

@ -127,6 +127,8 @@ public class TemplatesTreeController extends
element.setCode(value);
}
});
textBoxCode.setConstraint("no empty:"
+ _("cannot be null or empty"));
addCell(textBoxCode);
}