------------------------------------------------------------
revno: 46
committer: Lars Helge Oeverland [email protected]
branch nick: trunk
timestamp: Wed 2009-03-11 16:50:56 +0100
message:
Fixed bug: Indicator type with factor = 0
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/ValidateIndicatorTypeAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/ValidateIndicatorTypeAction.java'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/ValidateIndicatorTypeAction.java
2009-03-03 16:46:36 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/ValidateIndicatorTypeAction.java
2009-03-11 15:50:56 +0000
@@ -133,6 +133,15 @@
return INPUT;
}
+ else
+ {
+ if ( factor == 0 )
+ {
+ message = i18n.getString( "factor_cannot_be_zero" );
+
+ return INPUT;
+ }
+ }
message = i18n.getString( "everything_is_ok" );
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
2009-03-10 07:12:50 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
2009-03-11 15:50:56 +0000
@@ -334,4 +334,5 @@
indicator_group_editor
= Indicator Group Editor
select_indicator_group =
Please select indicator group !
confirm_delete_indicator_group = Do you want
delete this indicator ?
-update_indicator_group_member = Update
Indicator Member
\ No newline at end of file
+update_indicator_group_member = Update
Indicator Member
+factor_cannot_be_zero =
Factor cannot be zero
--
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
