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

ItEr30S06CUAltaMaquina: Changed pagesize standard limit to 10

Browse source
This commit is contained in:
Diego Pino Garcia 2009-10-19 09:37:20 +02:00 • committed by Javier Moran Rua
parent cee7f2d312
commit f293cdfa66
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
View file

@ -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<CriterionSatisfaction> newList = new HashSet<CriterionSatisfaction>();
for (CriterionSatisfactionDTO satisfactionDTO : criterionSatisfactionDTOs) {
CriterionSatisfaction satisfaction;
if (satisfactionDTO.isIsNewObject()) {
if (satisfactionDTO.isNewObject()) {
Criterion criterion = satisfactionDTO.getCriterionWithItsType()
.getCriterion();
Interval interval = satisfactionDTO.getInterval();

2
navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
View file

@ -20,7 +20,7 @@
<window id="listWindow" title="${i18n:_('Machines list')}">
<grid id="listing" model="@{controller.machines}" mold="paging"
pageSize="5" fixedLayout="true">
pageSize="10" fixedLayout="true">
<columns>
<column label="${i18n:_('Code')}" sort="auto(code)" />
<column label="${i18n:_('Name')}" sort="auto(name)" />

2
navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul
View file

@ -16,7 +16,7 @@
</hbox>
<grid id="listingCriterions"
model="@{assignedCriterionsController.criterionSatisfactionDTOs}"
mold="paging" pageSize="5">
mold="paging" pageSize="10">
<columns>
<column label="${i18n:_('Criterion name')}" sort="auto(criterionAndType)" sortDirection="ascending" />
<column label="${i18n:_('Starting date')}" width="200px" align="center"/>