dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19020
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8132: Add validation rule for gateways, fix bug in main menu of web light
------------------------------------------------------------
revno: 8132
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-09-19 14:48:54 +0700
message:
Add validation rule for gateways, fix bug in main menu of web light
modified:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/MenuAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js
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-light/src/main/java/org/hisp/dhis/light/action/MenuAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/MenuAction.java 2012-09-14 08:40:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/MenuAction.java 2012-09-19 07:48:54 +0000
@@ -182,14 +182,23 @@
for (String each: user.getUserCredentials().getAllAuthorities())
{
- if ( each.equals( "M_dhis-web-maintenance-patient" ) )
+ if ( each.equals( "ALL" ))
{
trackingAuthority = true;
- }
- if ( each.equals( "M_dhis-web-dataentry" ))
- {
+
aggregateAuthority = true;
}
+ else
+ {
+ if ( each.equals( "M_dhis-web-maintenance-patient" ) )
+ {
+ trackingAuthority = true;
+ }
+ if ( each.equals( "M_dhis-web-dataentry" ))
+ {
+ aggregateAuthority = true;
+ }
+ }
}
if ( complete )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js 2012-09-07 10:23:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js 2012-09-19 07:48:54 +0000
@@ -164,31 +164,50 @@
}
else if ( currentType == 'clickatell' )
{
- lockScreen();
- jQuery.postJSON( "saveClickatellConfig.action", {
- gatewayType: getFieldValue( 'gatewayType' ),
- name: getFieldValue( 'clickatellFields input[id=name]' ),
- username: getFieldValue( 'clickatellFields input[id=username]' ),
- password: getFieldValue( 'clickatellFields input[id=password]' ),
- apiId: getFieldValue( 'clickatellFields input[id=apiId]' )
- }, function ( json ) {
- unLockScreen();
- showMessage( json );
- } );
+ var username = getFieldValue( 'clickatellFields input[id=username]' );
+ var password = getFieldValue( 'clickatellFields input[id=password]' );
+ if ( username == "" || password == "")
+ {
+ showErrorMessage( i18n_required_data_error );
+ }
+ else
+ {
+ lockScreen();
+ jQuery.postJSON( "saveClickatellConfig.action", {
+ gatewayType: getFieldValue( 'gatewayType' ),
+ name: getFieldValue( 'clickatellFields input[id=name]' ),
+ username: getFieldValue( 'clickatellFields input[id=username]' ),
+ password: getFieldValue( 'clickatellFields input[id=password]' ),
+ apiId: getFieldValue( 'clickatellFields input[id=apiId]' )
+ }, function ( json ) {
+ unLockScreen();
+ showMessage( json );
+ } );
+ }
}
else
{
- lockScreen();
- jQuery.postJSON( "saveHTTPConfig.action", {
- gatewayType: getFieldValue( 'gatewayType' ),
- name: getFieldValue( 'genericHTTPFields input[id=name]' ),
- username: getFieldValue( 'genericHTTPFields input[id=username]' ),
- password: getFieldValue( 'genericHTTPFields input[id=password]' ),
- urlTemplate: getFieldValue( 'genericHTTPFields input[id=urlTemplate]' )
- }, function ( json ) {
- unLockScreen();
- showMessage( json );
- } );
+ var username = getFieldValue( 'genericHTTPFields input[id=username]' );
+ var password = getFieldValue( 'genericHTTPFields input[id=password]' );
+ var URL = getFieldValue( 'genericHTTPFields input[id=urlTemplate]' );
+ if( username == "" || password == "" || URL == "" )
+ {
+ showErrorMessage( i18n_required_data_error );
+ }
+ else
+ {
+ lockScreen();
+ jQuery.postJSON( "saveHTTPConfig.action", {
+ gatewayType: getFieldValue( 'gatewayType' ),
+ name: getFieldValue( 'genericHTTPFields input[id=name]' ),
+ username: getFieldValue( 'genericHTTPFields input[id=username]' ),
+ password: getFieldValue( 'genericHTTPFields input[id=password]' ),
+ urlTemplate: getFieldValue( 'genericHTTPFields input[id=urlTemplate]' )
+ }, function ( json ) {
+ unLockScreen();
+ showMessage( json );
+ } );
+ }
}
}
=== 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-09-07 10:18:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm 2012-09-19 07:48:54 +0000
@@ -169,7 +169,7 @@
<td><input type="password" name="password" id="password" style="width: 28em" value="$!params.get( 'password' )"/></td>
</tr>
<tr>
- <td>$i18n.getString( "url_template" ):</td>
+ <td>$i18n.getString( "url_template" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
<td><input type="text" name="urlTemplate" id="urlTemplate" style="width: 28em" value="$!encoder.htmlEncode( $!httpGateway.urlTemplate )"/></td>
</tr>
</tbody>
