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

Use new database query when filtering projects list

Browse source 
The database query that filters the orders by several fields is used only when
the subelements checkbox is not clicked. Otherwise the old query is used and the
old behavior is kept for the filtering.

However, if the checkbox is not clicked, the new query is used to get the
initial list and to do the successive filtering too.

FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Manuel Rego Casasnovas 2013-02-04 14:17:36 +01:00
parent 86e1d77791
commit 5044e541c2
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
View file

@ -698,6 +698,14 @@ public class OrderCRUDController extends GenericForwardComposer {
}
public List<Order> getOrders() {
if (checkIncludeOrderElements.isChecked()) {
return orderModel.getOrders();
}
return getOrdersFiltered();
}
private List<Order> getOrdersFiltered() {
List<org.libreplan.business.labels.entities.Label> labels = new ArrayList<org.libreplan.business.labels.entities.Label>();
List<Criterion> criteria = new ArrayList<Criterion>();
ExternalCompany customer = null;
@ -1427,7 +1435,9 @@ public class OrderCRUDController extends GenericForwardComposer {
public void onApplyFilter() {
OrderPredicate predicate = createPredicate();
if (predicate != null) {
if (predicate != null && checkIncludeOrderElements.isChecked()) {
// Force reload conversation state in oderModel
getOrders();
filterByPredicate(predicate);
} else {
showAllOrders();
@ -1454,8 +1464,8 @@ public class OrderCRUDController extends GenericForwardComposer {
listing.invalidate();
}
public void showAllOrders() {
listing.setModel(new SimpleListModel(orderModel.getOrders().toArray()));
private void showAllOrders() {
listing.setModel(new SimpleListModel(getOrders().toArray()));
listing.invalidate();
}