dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7890
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-08-10 10:14:08 +0700
message:
  minor fixed
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.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-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java	2012-08-10 02:43:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java	2012-08-10 03:14:08 +0000
@@ -63,16 +63,16 @@
     // Input & Output
     // -------------------------------------------------------------------------
     
-    private String name;
+    private String index;
 
-    public String getName()
+    public String getIndex()
     {
-        return name;
+        return index;
     }
 
-    public void setName( String name )
+    public void setIndex( String index )
     {
-        this.name = name;
+        this.index = index;
     }
 
     private Map<Integer, SmsGatewayConfig> gatewayConfigMap1 = new HashMap<Integer, SmsGatewayConfig>();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm	2012-08-10 02:43:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm	2012-08-10 03:14:08 +0000
@@ -115,7 +115,7 @@
 							#set( $gw = $!gatewayConfigMap1.get( $key ) )
 							<td>$!encoder.htmlEncode( $gw.name )</td>
 							<td style="text-align:right">
-							  <a href="showUpdateGateWayConfigForm.action?name=$key" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>		
+							  <a href="showUpdateGateWayConfigForm.action?index=$key" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>		
 							  <a href="javascript:removeGateway( $key, '$!encoder.jsEncode( $gw.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
 							</td>
 						</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm	2012-08-10 02:43:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm	2012-08-10 03:14:08 +0000
@@ -26,7 +26,7 @@
 			<td>$i18n.getString( "type" ):</td>
 			<td>
 				<select id="gatewayType" style="width:100%;" onchange="changeValueType( this.value )">
-					#if($name == $bulkIndex)
+					#if($index == $bulkIndex)
 						<option value="bulksms" selected="selected">$i18n.getString( "bulk_gw" )</option>
 						<script type="text/javascript">
 							changeGwType("bulksms");
@@ -35,7 +35,7 @@
 						<option value="bulksms">$i18n.getString( "bulk_gw" )</option>
 					#end
 					
-					#if($name == $clickatellIndex)					
+					#if($index == $clickatellIndex)					
 						<option value="clickatell" selected="selected">$i18n.getString( "clickatell_gw" )</option>
 						<script type="text/javascript">
 							changeGwType("clickatell");
@@ -44,7 +44,7 @@
 						<option value="clickatell">$i18n.getString( "clickatell_gw" )</option>
 					#end
 					
-					#if($name == $httpIndex)
+					#if($index == $httpIndex)
 						<option value="http" selected="selected">$i18n.getString( "generic_http_gw" )</option>
 						<script type="text/javascript">
 							changeGwType("http");
@@ -53,7 +53,7 @@
 						<option value="http">$i18n.getString( "generic_http_gw" )</option>
 					#end
 
-					#if($name == $modemIndex)
+					#if($index == $modemIndex)
 						<option value="modem" selected="selected" changeValueType( "modem" )>$i18n.getString( "modem_gw" )</option>
 						<script type="text/javascript">
 							changeGwType("modem");