dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22287
committer: Morten Olav Hansen <morten@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-03-14 15:58:11 +0700
message:
  Minor fix, map users => userid in id populator
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.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-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java	2016-03-14 08:58:11 +0000
@@ -52,10 +52,12 @@
     private static final Map<String, String> TABLE_ID_MAP = DimensionalObjectUtils.asMap(
         "dataelementcategoryoption", "categoryoptionid",
         "dataelementcategory", "categoryid",
-        "program_attributes", "programtrackedentityattributeid" );
+        "program_attributes", "programtrackedentityattributeid",
+        "users", "userid"
+    );
 
     private List<String> tables = new ArrayList<>();
-    
+
     public void setTables( List<String> tables )
     {
         this.tables = tables;
@@ -177,7 +179,7 @@
 
     private String getIdColumn( String table )
     {
-        return TABLE_ID_MAP.getOrDefault( table, ( table + "id" ) );
+        return TABLE_ID_MAP.getOrDefault( table, (table + "id") );
     }
 
     private void createOrgUnitUuids()