dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6571
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-04-14 09:38:49 +0200
message:
  Missing translations
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties
  resources/sql/div.sql


--
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-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java	2012-04-14 07:38:49 +0000
@@ -83,8 +83,7 @@
 
     public String execute()
         throws Exception
-    {
-        
+    {        
         if ( isNotBlank( key ) ) // Filter on key only if set
         {
             this.paging = createPaging( userService.getUserRoleCountByName( key ) );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-04-12 15:32:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-04-14 07:38:49 +0000
@@ -196,6 +196,9 @@
 F_ELIMINATE_DUPLICATE_DATA_ELEMENTS=Eliminate duplicate data elements
 F_GENERATE_MIN_MAX_VALUES=Generate min-max values
 F_ARCHIVE_DATA=Archive data
+F_ATTRIBUTE_ADD=Add Attribute
+F_ATTRIBUTE_DELETE=Delete Attribute
+F_ATTRIBUTE_UPDATE=Update Attribute
 
 #-- User module ---------------------------------------------------------------#
 

=== modified file 'resources/sql/div.sql'
--- resources/sql/div.sql	2012-04-03 10:37:31 +0000
+++ resources/sql/div.sql	2012-04-14 07:38:49 +0000
@@ -59,12 +59,13 @@
 
 -- Facility overview --
 
-select ou.name, ou.uid, ou.code, ou.coordinates, oustr.level, gsstr.type, gsstr.ownership, 
+select ou.name, ou.uid, ou.code, ou.coordinates, oustr.level, gsstr.type, gsstr.ownership,
   (select name from organisationunit where organisationunitid=oustr.idlevel2) as province,
   (select name from organisationunit where organisationunitid=oustr.idlevel3) as county,
   (select name from organisationunit where organisationunitid=oustr.idlevel4) as district
 from _orgunitstructure as oustr
 join organisationunit as ou on oustr.organisationunitid=ou.organisationunitid
 join _organisationunitgroupsetstructure as gsstr on ou.organisationunitid=gsstr.organisationunitid
-where oustr.level >= 5;
+where oustr.level >= 5
+order by province, county, district, type, ownership, ou.name;