dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7925
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-08-17 14:24:13 +0700
message:
  Error thrown if not create an gateway when to open the SMS management in SMS Reminder.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/GetOutboundSmsListAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sendSmsForm.vm


--
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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/GetOutboundSmsListAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/GetOutboundSmsListAction.java	2012-08-17 06:42:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/GetOutboundSmsListAction.java	2012-08-17 07:24:13 +0000
@@ -117,7 +117,7 @@
 
     public Map<String, String> getGatewayMap()
     {
-        return gatewayMap;
+        return transportService.getGatewayMap();
     }
 
     // -------------------------------------------------------------------------
@@ -132,8 +132,6 @@
 
         outboundSms = new ArrayList<OutboundSms>( programStageInstance.getOutboundSms() );
         
-        gatewayMap = transportService.getGatewayMap();
-        
         comments = new ArrayList<Comment>( programStageInstance.getComments() );
         
         currentUsername = currentUserService.getCurrentUsername();

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-08-17 06:42:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-08-17 07:24:13 +0000
@@ -415,4 +415,5 @@
 please_select_program_stage = Please select program stage
 send_sms_to_list = Send SMS to list
 post_comment = Post comment
-comments = Comments
\ No newline at end of file
+comments = Comments
+no_sms_service_available = No Sms service available
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sendSmsForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sendSmsForm.vm	2012-08-16 13:46:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sendSmsForm.vm	2012-08-17 07:24:13 +0000
@@ -43,5 +43,5 @@
 		</script>
 	</div>
 #else
-	<p>No Sms service available</p>
+	<p>$i18n.getString('no_sms_service_available')</p>
 #end