dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7996
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-09-04 15:15:42 +0700
message:
  (mobile) Fixed bug show username and password params of generic-http gateway. And code style fixed.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/SMPPGatewayConfig.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/SMSCommandAction.java
  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-api/src/main/java/org/hisp/dhis/sms/config/SMPPGatewayConfig.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/SMPPGatewayConfig.java	2012-08-30 12:47:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/SMPPGatewayConfig.java	2012-09-04 08:15:42 +0000
@@ -3,7 +3,6 @@
 public class SMPPGatewayConfig
     extends SmsGatewayConfig
 {
-
     private static final long serialVersionUID = 780006289158356660L;
 
     private String address;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/SMSCommandAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/SMSCommandAction.java	2012-08-30 12:47:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/SMSCommandAction.java	2012-09-04 08:15:42 +0000
@@ -6,7 +6,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.comparator.DataElementSortOrderComparator;
@@ -14,8 +13,8 @@
 import org.hisp.dhis.dataset.DataSetService;
 import org.hisp.dhis.sms.parse.ParserType;
 import org.hisp.dhis.smscommand.SMSCode;
+import org.hisp.dhis.smscommand.SMSCommand;
 import org.hisp.dhis.smscommand.SMSCommandService;
-import org.hisp.dhis.smscommand.SMSCommand;
 
 import com.opensymphony.xwork2.Action;
 

=== 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-30 12:47:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm	2012-09-04 08:15:42 +0000
@@ -46,7 +46,7 @@
             </tr> 
             <tr>
                 <td>$i18n.getString( "password" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
-                <td><input type="text" name="password" id="password" style="width: 28em" value="$!smppGateway.password"/></td>
+                <td><input type="password" name="password" id="password" style="width: 28em" value="$!smppGateway.password"/></td>
             </tr>
             <tr>
                 <td>$i18n.getString( "address" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
@@ -69,7 +69,7 @@
 			</tr> 
 			<tr>
 				<td>$i18n.getString( "password" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
-				<td><input type="text" name="password" id="password" style="width: 28em" value="$!bulkGateway.password"/></td>
+				<td><input type="password" name="password" id="password" style="width: 28em" value="$!bulkGateway.password"/></td>
 			</tr>
 			<tr>
 				<td>$i18n.getString( "region" ):</td>
@@ -142,7 +142,7 @@
 			</tr>
 			<tr>
 				<td>$i18n.getString( "password" ):</td>
-				<td><input type="text" name="password" id="password" style="width: 28em" value="$!clickatellGateway.password"/></td>
+				<td><input type="password" name="password" id="password" style="width: 28em" value="$!clickatellGateway.password"/></td>
 			</tr>
 			<tr>
 				<td>$i18n.getString( "api_id" ):</td>
@@ -150,6 +150,7 @@
 			</tr>
 		</tbody>
 		#set( $httpGateway = $!gatewayConfigMap.get( $httpIndex ) )
+		#set( $params = $!httpGateway.getParameters() )
 		<tbody id="genericHTTPFields">
 			<tr>
 				<td>$i18n.getString( "gateway_name" ):</td>
@@ -157,11 +158,11 @@
 			</tr>
 			<tr>
 				<td>$i18n.getString( "username" ):</td>
-				<td><input type="text" name="username" id="username" style="width: 28em" value="$!httpGateway.username"/></td>
+				<td><input type="text" name="username" id="username" style="width: 28em" value="$!params.get( 'username' )"/></td>
 			</tr>
 			<tr>
 				<td>$i18n.getString( "password" ):</td>
-				<td><input type="text" name="password" id="password" style="width: 28em" value="$!httpGateway.password"/></td>
+				<td><input type="password" name="password" id="password" style="width: 28em" value="$!params.get( 'password' )"/></td>
 			</tr>
 			<tr>
 				<td>$i18n.getString( "url_template" ):</td>