=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java 2013-10-08 10:20:06 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java 2014-01-08 17:41:22 +0000 @@ -45,9 +45,11 @@ import org.hisp.dhis.common.view.ExportView; import org.hisp.dhis.organisationunit.OrganisationUnit; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashSet; +import java.util.List; import java.util.Set; /** @@ -112,6 +114,8 @@ */ private Set attributeValues = new HashSet(); + private List apps = new ArrayList(); //TODO not yet in use + // ------------------------------------------------------------------------- // Logic // ------------------------------------------------------------------------- @@ -449,6 +453,16 @@ this.attributeValues = attributeValues; } + public List getApps() + { + return apps; + } + + public void setApps( List apps ) + { + this.apps = apps; + } + @Override public void mergeWith( IdentifiableObject other ) { === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2013-12-19 11:50:58 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2014-01-08 17:41:22 +0000 @@ -77,6 +77,8 @@ + + === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2013-12-20 19:48:58 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2014-01-08 17:41:22 +0000 @@ -289,6 +289,11 @@ plainTextError + + + /dhis-web-commons/ajax/jsonModules.vm + plainTextError +