------------------------------------------------------------ revno: 10170 committer: Lars Helge Øverland <[email protected]> branch nick: dhis2 timestamp: Wed 2013-03-13 10:57:42 +0100 message: Fixed compilation error in dhis-service-mobile modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AccessStringHelper.java dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/ProgramStageDataElement.java dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ModelMapping.java dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
-- 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/common/AccessStringHelper.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AccessStringHelper.java 2013-01-08 16:31:45 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AccessStringHelper.java 2013-03-13 09:57:42 +0000 @@ -28,6 +28,8 @@ */ /** + * Currently only the two first positions in the access string are used - rw. + * * @author Morten Olav Hansen <[email protected]> */ public class AccessStringHelper === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/ProgramStageDataElement.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/ProgramStageDataElement.java 2013-03-13 08:59:09 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/ProgramStageDataElement.java 2013-03-13 09:57:42 +0000 @@ -33,6 +33,7 @@ import org.hisp.dhis.api.mobile.model.Model; import org.hisp.dhis.api.mobile.model.ModelList; +import org.hisp.dhis.api.mobile.model.OptionSet; /** * @author Nguyen Kim Lai === modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ModelMapping.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ModelMapping.java 2013-03-13 08:59:09 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ModelMapping.java 2013-03-13 09:57:42 +0000 @@ -69,10 +69,10 @@ return mobileOptionSet; } - public org.hisp.dhis.api.mobile.model.LWUITmodel.OptionSet getLWUITOptionSet( org.hisp.dhis.dataelement.DataElement dataElement ) + public org.hisp.dhis.api.mobile.model.OptionSet getLWUITOptionSet( org.hisp.dhis.dataelement.DataElement dataElement ) { org.hisp.dhis.option.OptionSet dhisOptionSet = dataElement.getOptionSet(); - org.hisp.dhis.api.mobile.model.LWUITmodel.OptionSet mobileOptionSet = new org.hisp.dhis.api.mobile.model.LWUITmodel.OptionSet(); + org.hisp.dhis.api.mobile.model.OptionSet mobileOptionSet = new org.hisp.dhis.api.mobile.model.OptionSet(); if ( dhisOptionSet != null ) { mobileOptionSet.setId( dhisOptionSet.getId() ); === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm 2012-10-12 17:04:19 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm 2013-03-13 09:57:42 +0000 @@ -11,6 +11,7 @@ <li><a href="../dhis-web-dashboard-integration/profile.action?id=${currentUser.uid}">$i18n.getString( "profile" ) </a></li> <li><a href="../dhis-web-dashboard-integration/message.action">$i18n.getString( "messages" ) </a></li> <li><a href="../dhis-web-dashboard-integration/interpretation.action">$i18n.getString( "interpretations" ) </a></li> + <li><a href="../dhis-web-dashboard-integration/getAllUserGroups.action">$i18n.getString( "user_groups" ) </a></li> </ul> <h2>$i18n.getString( "dhis2_online" ) </h2> === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-03-12 19:32:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-03-13 09:57:42 +0000 @@ -367,6 +367,7 @@ interface_style=Interface style server_memory=Server memory cpu_cores=CPU cores +user_groups=User groups #-- Change Log------------------------------------------------------------------# === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2013-03-12 09:27:40 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2013-03-13 09:57:42 +0000 @@ -188,6 +188,7 @@ class="org.hisp.dhis.dashboard.usergroup.action.GetUserGroupListAction"> <result name="success" type="velocity">/main.vm</result> <param name="page">/dhis-web-dashboard-integration/userGroupList.vm</param> + <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param> <param name="javascripts">javascript/usergroup.js</param> <param name="requiredAuthorities">F_USERGROUP_LIST</param> </action>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
