=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/ProvideContentAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/ProvideContentAction.java 2011-04-07 08:52:20 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/ProvideContentAction.java 2011-04-11 09:14:35 +0000
@@ -37,6 +37,7 @@
import org.hisp.dhis.chart.ChartService;
import org.hisp.dhis.chart.comparator.ChartTitleComparator;
import org.hisp.dhis.dashboard.DashboardManager;
+import org.hisp.dhis.message.MessageService;
import org.hisp.dhis.options.UserSettingManager;
import com.opensymphony.xwork2.Action;
@@ -74,6 +75,13 @@
this.userSettingManager = userSettingManager;
}
+ private MessageService messageService;
+
+ public void setMessageService( MessageService messageService )
+ {
+ this.messageService = messageService;
+ }
+
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
@@ -98,6 +106,13 @@
{
return chartAreas;
}
+
+ private long messageCount;
+
+ public long getMessageCount()
+ {
+ return messageCount;
+ }
// -------------------------------------------------------------------------
// Action implementation
@@ -122,6 +137,8 @@
chartAreas.add( content.get( DashboardManager.CHART_AREA_PREFIX + i ) );
}
+ messageCount = messageService.getUnreadMessageCount();
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml 2011-04-06 11:39:06 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml 2011-04-11 09:14:35 +0000
@@ -12,6 +12,7 @@
+
#end
-$i18n.getString( "dashboard" )
+