------------------------------------------------------------
revno: 10686
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Wed 2013-04-24 16:11:57 +0200
message:
Bypassing sharing for png version of charts for now to avoid confusion for
dashboards/interpretation rendering
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.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-api/src/main/java/org/hisp/dhis/chart/ChartService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2013-02-06 14:45:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2013-04-24 14:11:57 +0000
@@ -86,6 +86,8 @@
Chart getChart( int id );
Chart getChart( String uid );
+
+ Chart getChartNoAcl( String uid );
void deleteChart( Chart chart );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2013-03-21 14:07:18 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2013-04-24 14:11:57 +0000
@@ -748,6 +748,11 @@
{
return chartStore.getByUid( uid );
}
+
+ public Chart getChartNoAcl( String uid )
+ {
+ return chartStore.getByUidNoAcl( uid );
+ }
public void deleteChart( Chart chart )
{
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java 2013-03-14 17:35:51 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java 2013-04-24 14:11:57 +0000
@@ -175,7 +175,7 @@
@RequestParam( value = "height", defaultValue = "500", required = false ) int height,
HttpServletResponse response ) throws IOException, I18nManagerException
{
- Chart chart = chartService.getChart( uid );
+ Chart chart = chartService.getChartNoAcl( uid );
OrganisationUnit unit = ou != null ? organisationUnitService.getOrganisationUnit( ou ) : null;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java 2013-03-14 08:04:13 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java 2013-04-24 14:11:57 +0000
@@ -457,7 +457,7 @@
private Grid getReportTableGrid( String uid, String organisationUnitUid, String period )
throws Exception
{
- ReportTable reportTable = reportTableService.getReportTable( uid );
+ ReportTable reportTable = reportTableService.getReportTableNoAcl( uid );
if ( organisationUnitUid == null && reportTable.hasReportParams() && reportTable.getReportParams().isOrganisationUnitSet() )
{
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
