=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportConfigurationAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportConfigurationAction.java 2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportConfigurationAction.java 2009-12-09 15:55:44 +0000
@@ -27,8 +27,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.hisp.dhis.report.Report.TYPE_BIRT;
+import static org.hisp.dhis.report.Report.TYPE_DEFAULT;
+
import org.hisp.dhis.external.configuration.NoConfigurationFoundException;
import org.hisp.dhis.i18n.I18n;
+import org.hisp.dhis.options.SystemSettingManager;
import org.hisp.dhis.report.ReportManager;
import org.hisp.dhis.report.manager.ReportConfiguration;
@@ -70,6 +74,13 @@
return reportConfiguration;
}
+ private SystemSettingManager systemSettingManager;
+
+ public void setSystemSettingManager( SystemSettingManager systemSettingManager )
+ {
+ this.systemSettingManager = systemSettingManager;
+ }
+
private String message;
public String getMessage()
@@ -83,15 +94,20 @@
public String execute()
{
- try
- {
- reportConfiguration = reportManager.getConfiguration();
- }
- catch ( NoConfigurationFoundException ex )
- {
- message = i18n.getString( "set_configuration" );
-
- return NONE;
+ String framework = (String) systemSettingManager.getSystemSetting( SystemSettingManager.KEY_REPORT_FRAMEWORK, TYPE_DEFAULT );
+
+ if ( framework.equals( TYPE_BIRT ) )
+ {
+ try
+ {
+ reportConfiguration = reportManager.getConfiguration();
+ }
+ catch ( NoConfigurationFoundException ex )
+ {
+ message = i18n.getString( "set_configuration" );
+
+ return NONE;
+ }
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-11-16 10:32:46 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-12-09 15:55:44 +0000
@@ -364,6 +364,8 @@
scope="prototype">
+