=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java 2013-08-13 12:03:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java 2013-08-22 17:09:11 +0000
@@ -28,6 +28,7 @@
*/
import org.hisp.dhis.chart.Chart;
+import org.hisp.dhis.dashboard.Dashboard;
import org.hisp.dhis.datadictionary.DataDictionary;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.document.Document;
@@ -107,6 +108,8 @@
addType( org.hisp.dhis.mapping.Map.class, "map", "F_MAP_EXTERNAL", "F_MAP_PUBLIC_ADD", null );
addType( Chart.class, "chart", "F_CHART_EXTERNAL", "F_CHART_PUBLIC_ADD", null );
addType( ReportTable.class, "reportTable", "F_REPORTTABLE_EXTERNAL", "F_REPORTTABLE_PUBLIC_ADD", null );
+
+ addType( Dashboard.class, "dashboard", null, "F_DASHBOARD_PUBLIC_ADD", null );
}
public static boolean isSupported( String type )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2013-08-13 16:43:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2013-08-22 17:09:11 +0000
@@ -625,6 +625,8 @@
executeSql( "alter table validationrulegroup rename column validationgroupid to validationrulegroupid" );
executeSql( "alter table sqlview rename column viewid to sqlviewid" );
+ executeSql( "UPDATE dashboard SET publicaccess='--------' WHERE publicaccess is null" );
+
executeSql( "UPDATE optionset SET version=1 WHERE version IS NULL" );
log.info( "Tables updated" );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/Dashboard.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/Dashboard.hbm.xml 2013-07-22 21:08:05 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/Dashboard.hbm.xml 2013-08-22 17:09:11 +0000
@@ -16,12 +16,24 @@
&identifiableProperties;
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2013-08-22 11:57:33 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2013-08-22 17:09:11 +0000
@@ -281,7 +281,9 @@
@SuppressWarnings( "unchecked" )
@RequestMapping( value = { "/assignedPrograms" }, produces = { "application/json", "text/*" } )
- public void getPrograms( HttpServletResponse response, @RequestParam Map parameters ) throws IOException, NotAuthenticatedException
+ public void getPrograms( HttpServletResponse response, @RequestParam Map parameters,
+ @RequestParam( defaultValue = "1" ) Integer type )
+ throws IOException, NotAuthenticatedException
{
User currentUser = currentUserService.getCurrentUser();
@@ -293,7 +295,7 @@
Set userOrganisationUnits = new HashSet();
Set organisationUnits = new HashSet();
Set programs = new HashSet();
- Map> programAssociations = new HashMap>();
+ Map> programAssociations = new HashMap>();
if ( currentUser.getOrganisationUnits().isEmpty() && currentUser.getUserCredentials().getAllAuthorities().contains( "ALL" ) )
{
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2013-08-13 11:06:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2013-08-22 17:09:11 +0000
@@ -259,6 +259,7 @@
ALL
+ F_DASHBOARD_PUBLIC_ADD
F_CHART_PUBLIC_ADD
F_MAP_PUBLIC_ADD
F_USERGROUP_PUBLIC_ADD
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm 2013-08-18 18:54:32 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm 2013-08-22 17:09:11 +0000
@@ -1,3 +1,6 @@
+
+#sharingDialog()
+