=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java' --- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2014-08-24 21:04:36 +0000 +++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2014-08-26 07:44:39 +0000 @@ -461,7 +461,7 @@ values.add( day.getStartDate() ); for ( PeriodType periodType : periodTypes ) - { + { values.add( periodCache.getIsoPeriod( periodType, day.getStartDate(), calendar ) ); } === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/GetExpandedTreeAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/GetExpandedTreeAction.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/GetExpandedTreeAction.java 2014-08-26 07:44:39 +0000 @@ -99,8 +99,7 @@ public String execute() throws Exception - { - + { roots = new ArrayList<>( selectionTreeManager.getRootOrganisationUnits() ); Collections.sort( roots, IdentifiableObjectNameComparator.INSTANCE ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java 2014-08-26 07:05:04 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java 2014-08-26 07:44:39 +0000 @@ -241,12 +241,6 @@ systemSettingManager.saveSystemSetting( KEY_CALENDAR, calendar ); systemSettingManager.saveSystemSetting( KEY_DATE_FORMAT, dateFormat ); systemSettingManager.saveSystemSetting( KEY_ANALYTICS_MAINTENANCE_MODE, analyticsMaintenanceMode ); - - if( helpPageLink.isEmpty() ) - { - helpPageLink = (String) systemSettingManager.getSystemSetting( KEY_HELP_PAGE_LINK, DEFAULT_HELP_PAGE_LINK ); - } - systemSettingManager.saveSystemSetting( KEY_HELP_PAGE_LINK, helpPageLink ); Configuration configuration = configurationService.getConfiguration();