dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17843
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-12-30 17:20:40 +0100
message:
  SQL view, outdated code
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/ResourceTableNameMap.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties


--
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/sqlview/ResourceTableNameMap.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/ResourceTableNameMap.java	2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/ResourceTableNameMap.java	2014-12-30 16:20:40 +0000
@@ -35,24 +35,13 @@
  * @version $Id ResourceTableNameMap.java Aug 10, 2010$
  */
 public class ResourceTableNameMap
-{
-    private static Map<String, String> resourceNameMap;
-    
+{    
     private static Map<String, String> ignoredNameMap;
 
     static
     {
-        resourceNameMap = new HashMap<>();
         ignoredNameMap = new HashMap<>();
 
-        resourceNameMap.put( "_cocn", "_categoryoptioncomboname" );
-        resourceNameMap.put( "_cs", "_categorystructure" );
-        resourceNameMap.put( "_degss", "_dataelementgroupsetstructure" );
-        resourceNameMap.put( "_icgss", "_indicatorgroupsetstructure" );
-        resourceNameMap.put( "_ous", "_orgunitstructure" );
-        resourceNameMap.put( "_ougss", "_orgunitgroupsetstructure" );
-        resourceNameMap.put( "_oustgss", "_organisationunitgroupsetstructure" );
-
         ignoredNameMap.put( "_users", "users" );
         ignoredNameMap.put( "_uinfo", "userinfo" );
         ignoredNameMap.put( "_trackedentityinstance", "trackedentityinstance" );
@@ -61,11 +50,6 @@
         ignoredNameMap.put( "_caseaggrcondition", "caseaggregationcondition" );
     }
 
-    public static String getResourceNameByAlias( String alias )
-    {
-        return resourceNameMap.get( alias );
-    }
-    
     public static String getIgnoredNameByAlias( String alias )
     {
         return ignoredNameMap.get( alias );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-12-23 17:19:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-12-30 16:20:40 +0000
@@ -223,7 +223,7 @@
 patient_data_archive=Person Data Archive
 intro__patient_data_archive=Archive person data which is not currently relevant to your system in order to improve performance. Data can also be unarchived.
 pruning_interrupted=You must choose the organisation unit has parent to prune. Please try again!
-sqlquery_is_not_allowed=Not allowance to query in the special tables!
+sqlquery_is_not_allowed=Restricted user tables cannot be referenced in query
 sections_with_invalid_category_combinations=Sections with invalid category combinations
 confirm_delete_sqlview=Do you want to delete this SQL view object ?
 clear_data_mart=Clear data mart