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

i18n: Use the same error messages in the assigned criteria tab for both workers

Browse source 
and machines.

FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-07-17 12:35:12 +02:00
parent 22eecd54cb
commit 86ca3c69dd
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java
View file

@ -332,15 +332,13 @@ public class AssignedCriterionsModel extends IntegrationEntityModel implements
.getCriterion(); .getCriterion();
if (checkSameCriterionAndSameInterval(satisfactionDTO)) { if (checkSameCriterionAndSameInterval(satisfactionDTO)) {
throw new IllegalStateException( throw new IllegalStateException(
_(" The " _("The {0} can not be assigned to this resource. Its interval overlaps with other criterion",
+ criterion.getName() criterion.getName()));
+ " can not be assigned to this resource. Its interval overlap with other criterion"));
} }
if (checkNotAllowSimultaneousCriterionsPerResource(satisfactionDTO)) { if (checkNotAllowSimultaneousCriterionsPerResource(satisfactionDTO)) {
throw new IllegalStateException( throw new IllegalStateException(
_(" The " _("The {0} is not valid. Other value exists from the same criterion type",
+ criterion.getName() criterion.getName()));
+ "is not valid, the criterionType overlap other criterionSatisfaction whith same criterionType"));
} }
} }
} }