------------------------------------------------------------ revno: 2641 committer: Lars Helge Overland <larshe...@gmail.com> branch nick: dhis2 timestamp: Wed 2011-01-19 14:31:29 +0100 message: Removed outdated system setting for forum integration modified: dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSystemSettingsAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSettings.vm
-- 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-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2011-01-07 11:37:47 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2011-01-19 13:31:29 +0000 @@ -27,19 +27,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.options.SystemSettingManager.*; -import static org.hisp.dhis.options.SystemSettingManager.DEFAULT_MAX_NUMBER_OF_ATTEMPTS; -import static org.hisp.dhis.options.SystemSettingManager.DEFAULT_TIMEFRAME_MINUTES; +import static org.hisp.dhis.options.SystemSettingManager.DEFAULT_AGGREGATION_STRATEGY; +import static org.hisp.dhis.options.SystemSettingManager.DEFAULT_FACTOR_OF_DEVIATION; +import static org.hisp.dhis.options.SystemSettingManager.KEY_AGGREGATION_STRATEGY; import static org.hisp.dhis.options.SystemSettingManager.KEY_APPLICATION_TITLE; import static org.hisp.dhis.options.SystemSettingManager.KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED; import static org.hisp.dhis.options.SystemSettingManager.KEY_FACTOR_OF_DEVIATION; import static org.hisp.dhis.options.SystemSettingManager.KEY_FLAG; -import static org.hisp.dhis.options.SystemSettingManager.KEY_FORUM_INTEGRATION; -import static org.hisp.dhis.options.SystemSettingManager.KEY_MAX_NUMBER_OF_ATTEMPTS; import static org.hisp.dhis.options.SystemSettingManager.KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART; import static org.hisp.dhis.options.SystemSettingManager.KEY_REPORT_FRAMEWORK; import static org.hisp.dhis.options.SystemSettingManager.KEY_START_MODULE; -import static org.hisp.dhis.options.SystemSettingManager.KEY_TIMEFRAME_MINUTES; import java.util.HashMap; import java.util.Map; @@ -86,12 +83,9 @@ Map<String, Object> map = new HashMap<String, Object>(); map.put( KEY_APPLICATION_TITLE, systemSettingManager.getSystemSetting( KEY_APPLICATION_TITLE ) ); - map.put( KEY_MAX_NUMBER_OF_ATTEMPTS, systemSettingManager.getSystemSetting( KEY_MAX_NUMBER_OF_ATTEMPTS, DEFAULT_MAX_NUMBER_OF_ATTEMPTS ) ); - map.put( KEY_TIMEFRAME_MINUTES, systemSettingManager.getSystemSetting( KEY_TIMEFRAME_MINUTES, DEFAULT_TIMEFRAME_MINUTES ) ); map.put( KEY_FLAG, systemSettingManager.getSystemSetting( KEY_FLAG ) ); map.put( KEY_START_MODULE, systemSettingManager.getSystemSetting( KEY_START_MODULE ) ); map.put( KEY_REPORT_FRAMEWORK, systemSettingManager.getSystemSetting( KEY_REPORT_FRAMEWORK, Report.TYPE_DEFAULT ) ); - map.put( KEY_FORUM_INTEGRATION, systemSettingManager.getSystemSetting( KEY_FORUM_INTEGRATION, false ) ); map.put( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, systemSettingManager.getSystemSetting( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, false ) ); map.put( KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED, systemSettingManager.getSystemSetting( KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED, false ) ); map.put( KEY_FACTOR_OF_DEVIATION, systemSettingManager.getSystemSetting( KEY_FACTOR_OF_DEVIATION, DEFAULT_FACTOR_OF_DEVIATION ) ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2011-01-17 17:03:05 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2011-01-19 13:31:29 +0000 @@ -33,7 +33,7 @@ <thead> <tr> <th colspan="3" >$i18n.getString( "name" )</th> - <th class="{sorter: false}" style="width:128px">$i18n.getString( "operations" )</th> + <th class="{sorter: false}" style="width:100px">$i18n.getString( "operations" )</th> </tr> </thead> <tbody id="list"> @@ -45,11 +45,6 @@ <a href="javascript:translate( 'DataElement', '$dataElement.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a> <a href="javascript:removeDataElement( $dataElement.id, '$encoder.jsEncode( $dataElement.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a> <a href="javascript:showDataElementDetails( $dataElement.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a> - #if ( $forumIntegration ) - <a href="$dataElement.url" title="$i18n.getString( 'forum' )" target="_blank"><img src="../images/forum.png" alt="$i18n.getString( 'forum' )"/></a> - #else - <img src="../images/forum_denied.png" alt="$i18n.getString( 'forum' )" title="$i18n.getString( 'forum' )"/> - #end </td> </tr> #end @@ -107,13 +102,9 @@ var i18n_edit = '$encoder.jsEscape( $i18n.getString( "edit" ) , "'")'; var i18n_remove = '$encoder.jsEscape( $i18n.getString( "remove" ) , "'")'; var i18n_show_details = '$encoder.jsEscape( $i18n.getString( "show_details" ) , "'")'; - var i18n_forum = '$encoder.jsEscape( $i18n.getString( "forum" ) , "'")'; var i18n_name = '$encoder.jsEscape( $i18n.getString( "name" ) , "'")'; var i18n_operations = '$encoder.jsEscape( $i18n.getString( "operations" ) , "'")'; - - var dataDictionaryMode = '$dataDictionaryMode'; - var forumIntegration = '$forumIntegration'; - + jQuery(document).ready(function(){ tableSorter( 'dataElementList' ); }); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSystemSettingsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSystemSettingsAction.java 2011-01-19 09:20:53 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSystemSettingsAction.java 2011-01-19 13:31:29 +0000 @@ -32,7 +32,6 @@ import static org.hisp.dhis.options.SystemSettingManager.KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED; import static org.hisp.dhis.options.SystemSettingManager.KEY_FACTOR_OF_DEVIATION; import static org.hisp.dhis.options.SystemSettingManager.KEY_FLAG; -import static org.hisp.dhis.options.SystemSettingManager.KEY_FORUM_INTEGRATION; import static org.hisp.dhis.options.SystemSettingManager.KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART; import static org.hisp.dhis.options.SystemSettingManager.KEY_REPORT_FRAMEWORK; import static org.hisp.dhis.options.SystemSettingManager.KEY_START_MODULE; @@ -100,13 +99,6 @@ this.reportFramework = reportFramework; } - private Boolean forumIntegration; - - public void setForumIntegration( Boolean forumIntegration ) - { - this.forumIntegration = forumIntegration; - } - private Boolean omitIndicatorsZeroNumeratorDataMart; public void setOmitIndicatorsZeroNumeratorDataMart( Boolean omitIndicatorsZeroNumeratorDataMart ) @@ -164,7 +156,6 @@ systemSettingManager.saveSystemSetting( KEY_FLAG, flag ); systemSettingManager.saveSystemSetting( KEY_START_MODULE, startModule ); systemSettingManager.saveSystemSetting( KEY_REPORT_FRAMEWORK, reportFramework ); - systemSettingManager.saveSystemSetting( KEY_FORUM_INTEGRATION, forumIntegration ); systemSettingManager.saveSystemSetting( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, omitIndicatorsZeroNumeratorDataMart ); systemSettingManager.saveSystemSetting( KEY_DISABLE_DATAENTRYFORM_WHEN_COMPLETED, disableDataEntryWhenCompleted ); systemSettingManager.saveSystemSetting( KEY_FACTOR_OF_DEVIATION, factorDeviation ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSettings.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSettings.vm 2011-01-19 09:20:53 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSettings.vm 2011-01-19 13:31:29 +0000 @@ -56,12 +56,6 @@ </select> </p> -<h4>$i18n.getString( "forum_integration" )</h4> - -<p> - <input type="checkbox" id="forumIntegration" name="forumIntegration" value="true" #if( $forumIntegration )checked="checked"#end/> -</p> - <h4>$i18n.getString( "omit_indicators_zero_numerator_data_mart" )</h4> <p>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp