=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2012-02-05 13:27:40 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2012-02-21 19:20:15 +0000 @@ -105,9 +105,9 @@ this.code = code; } - private Integer expiryDays; + private int expiryDays; - public void setExpiryDays( Integer expiryDays ) + public void setExpiryDays( int expiryDays ) { this.expiryDays = expiryDays; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2012-02-05 13:27:40 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2012-02-21 19:20:15 +0000 @@ -108,9 +108,9 @@ this.code = code; } - private Integer expiryDays; + private int expiryDays; - public void setExpiryDays( Integer expiryDays ) + public void setExpiryDays( int expiryDays ) { this.expiryDays = expiryDays; } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2012-02-21 11:39:05 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2012-02-21 19:20:15 +0000 @@ -35,7 +35,7 @@ dataentryform_details=Data entry form details dataentryform_design=Design data entry form delete=Delete this form -dataset=Dataset +dataset=Data set dataentryform_confirm_delete=Are you sure you want to delete this data entry form? unable_delete=Unable to delete data entry form insert=Insert === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2011-03-18 14:20:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2012-02-21 19:20:15 +0000 @@ -5,9 +5,9 @@
$i18n.getString( "section_details" ) | @@ -16,25 +16,21 @@|||
---|---|---|---|
- | $section.name | -||
- | $section.dataSet.name | -||
- | $categoryCombo.name | ++ | $section.name | +
+ | $section.dataSet.name | +||
+ | $categoryCombo.name |
- +