------------------------------------------------------------ revno: 18213 committer: Morten Olav Hansen <morte...@gmail.com> branch nick: dhis2 timestamp: Tue 2015-02-10 11:21:31 +0700 message: npe check in loadform modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2015-02-06 09:06:49 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2015-02-10 04:21:31 +0000 @@ -235,6 +235,11 @@ public String execute() throws Exception { + if ( dataSetId == null ) + { + return INPUT; + } + dataSet = dataSetService.getDataSet( dataSetId, true, false, false, true ); List<DataElement> dataElements = new ArrayList<>( dataElementService.getDataElements( dataSet, null, @@ -375,7 +380,7 @@ displayMode = DataSet.TYPE_SECTION_MULTIORG; } - + if ( displayMode.equals( DataSet.TYPE_SECTION ) ) { getSectionForm( dataElements, dataSet ); @@ -399,7 +404,7 @@ Collections.sort( sections, new SectionOrderComparator() ); for ( Section section : sections ) - { + { DataElementCategoryCombo sectionCategoryCombo = section.getCategoryCombo(); if ( sectionCategoryCombo != null )
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp