dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23760
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11571: support '+'prefix for phone number, minor
------------------------------------------------------------
revno: 11571
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-08-05 16:18:33 +0700
message:
support '+'prefix for phone number, minor
modified:
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.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-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java 2013-07-17 06:24:30 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java 2013-08-05 09:18:33 +0000
@@ -183,6 +183,10 @@
for ( String each : recipients )
{
+ if ( !each.startsWith( "+" ) )
+ {
+ each = "+" + each;
+ }
User user = new User();
user.setPhoneNumber( each );
recipientsList.add( user );
=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm 2013-03-20 04:23:51 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm 2013-08-05 09:18:33 +0000
@@ -2,7 +2,6 @@
jQuery(document).ready( function() {
validation( "sendSMSForm", function( form ) { sendSMSMessage( form ); } );
selectionTreeSelection.setListenerFunction( selectedOrganisationUnitSendSMS );
-
var target = '${sendTo}';
jQuery( "#sendTarget > option" ).each( function( i, item )
{