dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7961
committer: Magnus Korvald <korvald@xxxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2012-08-23 10:09:35 +0200
message:
  Fix for nullpointer
modified:
  dhis-2/dhis-web/dhis-web-sms/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.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/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/struts.xml	2012-08-22 06:31:11 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/struts.xml	2012-08-23 08:09:35 +0000
@@ -6,7 +6,15 @@
     <include file="dhis-web-commons.xml" />
 
     <package name="dhis-web-sms" extends="dhis-web-commons" namespace="/sms">
-		
+
+
+        <action name="index" class="org.hisp.dhis.sms.action.NoAction">
+            <result name="success" type="velocity">
+                /dhis-web-sms/main.vm
+            </result>
+            <param name="page">/dhis-web-sms/menu.vm</param>
+        </action>
+        
         <action name="smsinput" class="org.hisp.dhis.sms.input.SMSInput">
             <result name="success" type="velocity">/dhis-web-sms/smssuccess.vm</result>
             <result name="error" type="velocity">/dhis-web-sms/smserror.vm</result>

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm	2012-08-23 08:09:35 +0000
@@ -21,12 +21,6 @@
 <p>
 <ul>
     <li><a href="testsms.action">Test SMS Input</a></li>
-    <li><a href="selectOrganisationUnit.action">$i18n.getString( "data_entry" )</a></li>
-    <li><a href="selectNamebasedOrganisationUnit.action">$i18n.getString( "namebased_data_entry" )</a></li>
-    <li><a href="selectRegistrationOrganisationUnit.action">$i18n.getString( "beneficiary_registration" )</a></li>
-    <li><a href="messages.action">$i18n.getString( "messages" ) #if($unreadMessageConversationCount > 0)($unreadMessageConversationCount)#end</a></li>
-    <li><a href="reports.action">$i18n.getString( "reports" )</a></li>
-    <li><a href="settings.action">$i18n.getString( "settings" )</a></li>
 </ul>
 </p>