dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16903
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-10-01 12:47:10 +0200
message:
  Help manager, minor fix
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/help/DefaultHelpManager.java
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.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/help/DefaultHelpManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/help/DefaultHelpManager.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/help/DefaultHelpManager.java	2014-10-01 10:47:10 +0000
@@ -109,8 +109,8 @@
 
     private ClassPathResource resolveHelpFileResource( Locale locale )
     {
-
         String helpFile;
+        
         ClassPathResource classPathResource;
 
         if ( locale != null && locale.getDisplayLanguage() != null )
@@ -130,11 +130,11 @@
 
         if ( !classPathResource.exists() )
         {
+            log.warn( "Help file: " + helpFile + " not available on classpath, falling back to defaul" );
+            
             helpFile = "help_content.xml";
 
             classPathResource = new ClassPathResource( helpFile );
-
-            log.warn( "Help file: " + helpFile + " not available on classpath" );
         }
 
         return classPathResource;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.java	2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.java	2014-10-01 10:47:10 +0000
@@ -71,7 +71,7 @@
         dataSet = createDataSet( 'A', new MonthlyPeriodType() );
         dataSetService.addDataSet( dataSet );
         
-        DataElementCategoryCombo categoryCombo = categoryService.getDataElementCategoryComboByName( DataElementCategoryCombo.DEFAULT_CATEGORY_COMBO_NAME );
+        DataElementCategoryCombo categoryCombo = categoryService.getDefaultDataElementCategoryCombo();
         
         DataElement dataElementA = createDataElement( 'A', categoryCombo );
         DataElement dataElementB = createDataElement( 'B', categoryCombo );