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

ItEr37S11CUAdministracionMateriaisItEr36S13: Show all materials if not category is selected

Browse source
This commit is contained in:
Diego Pino Garcia 2009-12-01 11:25:53 +01:00 • committed by Javier Moran Rua
parent 5a9d27bbd5
commit a3a8e55ae2
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-webapp/src/main/java/org/navalplanner/web/materials/IMaterialsModel.java
View file

@ -20,6 +20,7 @@
package org.navalplanner.web.materials;
import java.util.Collection;
import java.util.List;
import org.navalplanner.business.common.exceptions.ValidationException;
@ -38,16 +39,18 @@ public interface IMaterialsModel {
void addMaterialToMaterialCategory(MaterialCategory materialCategory);
void confirmRemoveMaterialCategory(MaterialCategory materialCategory);
void confirmSave() throws ValidationException;
MutableTreeModel<MaterialCategory> getMaterialCategories();
Collection<? extends Material> getMaterials();
List<Material> getMaterials(MaterialCategory materialCategory);
void reloadMaterialCategories();
void removeMaterial(Material material);
void confirmRemoveMaterialCategory(MaterialCategory materialCategory);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
View file

@ -378,6 +378,8 @@ public class MaterialsController extends
final List<Material> result = new ArrayList<Material>();
if (treeitem != null) {
result.addAll(getMaterials((MaterialCategory) treeitem.getValue()));
} else {
result.addAll(materialsModel.getMaterials());
}
return result;
}

7
navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java
View file

@ -3,6 +3,7 @@ package org.navalplanner.web.materials;
import static org.navalplanner.web.I18nHelper._;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
@ -168,4 +169,10 @@ public class MaterialsModel implements IMaterialsModel {
material.getCategory().removeMaterial(material);
}
@Override
@Transactional(readOnly = true)
public Collection<? extends Material> getMaterials() {
return materialDAO.getAll();
}
}