dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18436
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7775: minor fixed
------------------------------------------------------------
revno: 7775
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-07-31 10:07:26 +0700
message:
minor fixed
modified:
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java
--
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-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java 2012-07-26 09:56:22 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java 2012-07-31 03:07:26 +0000
@@ -58,7 +58,7 @@
private String searchUrl;
- public static double currentVersion = 3.0;
+ public static double currentVersion = 2.9;
private String updateNewVersionUrl;
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java 2012-07-26 10:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java 2012-07-31 03:07:26 +0000
@@ -74,13 +74,11 @@
public String execute()
{
Device device = deviceResolver.resolveDevice( ServletActionContext.getRequest() );
-
+
if ( device.isMobile() )
{
- System.out.println("mobile");
return "mobile";
}
- System.out.println("PC");
return "standard";
}
}