=== modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/DefaultParserManager.java' --- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/DefaultParserManager.java 2013-07-24 07:03:54 +0000 +++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/DefaultParserManager.java 2013-08-01 05:25:14 +0000 @@ -57,6 +57,7 @@ import org.hisp.dhis.message.MessageConversation; import org.hisp.dhis.message.MessageConversationStore; import org.hisp.dhis.message.MessageSender; +import org.hisp.dhis.message.MessageService; import org.hisp.dhis.message.UserMessage; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.patient.Patient; @@ -135,6 +136,13 @@ { this.emailMessageSender = emailMessageSender; } + + private MessageService messageService; + + public void setMessageService( MessageService messageService ) + { + this.messageService = messageService; + } @Autowired private IncomingSmsService incomingSmsService; === modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml 2013-07-16 11:33:35 +0000 +++ dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml 2013-08-01 05:25:14 +0000 @@ -63,6 +63,7 @@ + === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm 2013-07-22 18:11:07 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm 2013-08-01 05:25:14 +0000 @@ -12,16 +12,16 @@ if ( json.response == "success" ) { setHeaderDelayMessage( json.message ); - //setTimeout( "refreshPage()", 4000); + setTimeout( "refreshPage()", 4000); } }); }); }); - //function refreshPage() - //{ - //window.location = "userSettings.action"; - //}; + function refreshPage() + { + window.location = "userSettings.action"; + };

$i18n.getString( "settings" ) #openHelp( "userGeneralSettings" )