diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java index 3f5b46f7a..b76516bfb 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java @@ -167,7 +167,7 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion @Override public void remove(CriterionSatisfactionDTO criterionSatisfactionDTO) { - if (criterionSatisfactionDTO.isIsNewObject()) { + if (criterionSatisfactionDTO.isNewObject()) { criterionSatisfactionDTOs.remove(criterionSatisfactionDTO); } else { criterionSatisfactionDTO.setIsDeleted(true); @@ -312,7 +312,7 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion } private void save(CriterionSatisfactionDTO satisfactionDTO) { - if (satisfactionDTO.isIsNewObject()) { + if (satisfactionDTO.isNewObject()) { addNewSatisfaction(satisfactionDTO); } else { if (satisfactionDTO.isIsDeleted()) { @@ -383,7 +383,7 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion Set newList = new HashSet(); for (CriterionSatisfactionDTO satisfactionDTO : criterionSatisfactionDTOs) { CriterionSatisfaction satisfaction; - if (satisfactionDTO.isIsNewObject()) { + if (satisfactionDTO.isNewObject()) { Criterion criterion = satisfactionDTO.getCriterionWithItsType() .getCriterion(); Interval interval = satisfactionDTO.getInterval(); diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul index 12522fa1b..e9c5465c9 100644 --- a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul +++ b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul @@ -20,7 +20,7 @@ + pageSize="10" fixedLayout="true"> diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul index dc923e3e1..d673af8f9 100644 --- a/navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul +++ b/navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul @@ -16,7 +16,7 @@ + mold="paging" pageSize="10">