dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5156
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-11-14 16:02:32 +0000
message:
  fixed bug with userattributes (will be backported to 2.5)
modified:
  .bzrignore
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.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 '.bzrignore'
--- .bzrignore	2011-09-28 14:16:59 +0000
+++ .bzrignore	2011-11-14 16:02:32 +0000
@@ -16,4 +16,5 @@
 .idea
 *.iml
 *.ipr
+*.ids
 *.iws

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java	2011-10-03 09:23:01 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java	2011-11-14 16:02:32 +0000
@@ -58,6 +58,8 @@
 
     public Set<Attribute> getOrganisationUnitAttributes();
 
+    public Set<Attribute> getUserAttributes();
+
     public int getAttributeCount();
 
     public int getAttributeCountByName( String name );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java	2011-10-03 09:23:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java	2011-11-14 16:02:32 +0000
@@ -122,6 +122,12 @@
     }
 
     @Override
+    public Set<Attribute> getUserAttributes()
+    {
+        return attributeStore.getUserAttributes();
+    }
+
+    @Override
     public int getAttributeCount()
     {
         return attributeStore.getCount();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java	2011-09-23 18:54:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java	2011-11-14 16:02:32 +0000
@@ -178,7 +178,7 @@
             }
         }
 
-        attributes = new ArrayList<Attribute>( attributeService.getDataElementAttributes() );
+        attributes = new ArrayList<Attribute>( attributeService.getUserAttributes() );
 
         Collections.sort( attributes, new AttributeSortOrderComparator() );