1 files changed, 10 insertions, 4 deletions
diff --git a/extensions/MyDashboard/web/js/flags.js b/extensions/MyDashboard/web/js/flags.js
index 1ba6bd696..3ac51acac 100644
--- a/extensions/MyDashboard/web/js/flags.js
+++ b/extensions/MyDashboard/web/js/flags.js
@@ -140,8 +140,7 @@ YUI({
     dataTable.requestee.plug(Y.Plugin.DataTableSort);
 
     dataTable.requestee.plug(Y.Plugin.DataTableDataSource, {
-        datasource: dataSource,
-        initialRequest: updateFlagTable("requestee"),
+        datasource: dataSource.requestee
     });
 
     dataSource.requestee.plug(Y.Plugin.DataSourceJSONSchema, {
@@ -185,8 +184,7 @@ YUI({
     dataTable.requester.plug(Y.Plugin.DataTableSort);
 
     dataTable.requester.plug(Y.Plugin.DataTableDataSource, {
-        datasource: dataSource,
-        initialRequest: updateFlagTable("requester"),
+        datasource: dataSource.requester
     });
 
     dataSource.requester.plug(Y.Plugin.DataSourceJSONSchema, {
@@ -197,6 +195,14 @@ YUI({
         }
     });
 
+    // Initial load
+    Y.on("contentready", function (e) {
+        updateFlagTable("requestee");
+    }, "#requestee_table");
+    Y.on("contentready", function (e) {
+        updateFlagTable("requester");
+    }, "#requester_table");
+
     Y.one('#requester_refresh').on('click', function(e) {
         updateFlagTable('requester');
     });