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

Bug #1461: NullPointerException in WorkReportLines

Browse source 
Clicking button 'Filter' if there was no Task selected resulted into a
NullPointerException

FEA: ItEr76S29WorkReports
This commit is contained in:
Diego Pino 2012-06-08 17:15:21 +02:00
parent db25351f15
commit 43044a78af
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
View file

@ -31,6 +31,7 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.apache.commons.logging.LogFactory;
import org.hibernate.validator.InvalidValue;
import org.joda.time.LocalDate;
@ -1636,7 +1637,6 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
/**
* Method to manage the query work report lines
*/
public List<WorkReportLine> getQueryWorkReportLines() {
List<WorkReportLine> result = workReportModel.getAllWorkReportLines();
updateSummary(result);
@ -1692,14 +1692,20 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
* @param event
*/
public void onApplyFilterWorkReportLines(Event event) {
createPredicateLines();
filterByPredicateLines();
updateSummary();
OrderElement selectedOrder = getSelectedOrderElement();
if (selectedOrder == null) {
// Show all work report lines
Util.reloadBindings(gridListQuery);
} else {
createPredicateLines(selectedOrder);
filterByPredicateLines();
updateSummary();
}
}
private void createPredicateLines() {
private void createPredicateLines(OrderElement orderElement) {
Validate.notNull(orderElement);
String type = filterType.getValue();
OrderElement orderElement = getSelectedOrderElement();
Resource resource = getSelectedResource();
TypeOfWorkHours hoursType = getSelectedHoursType();
Date startDate = filterStartDateLine.getValue();