Revision

12752

Author

wsanchez@apple.com

Date

2014-02-25 14:29:11 -0800 (Tue, 25 Feb 2014)

Log Message

re-arrange the deck chairs

Modified Paths

• CalendarServer/trunk/calendarserver/webadmin/landing.py
• CalendarServer/trunk/calendarserver/webadmin/work.xhtml

Diff

--- CalendarServer/trunk/calendarserver/webadmin/landing.py	2014-02-25 22:24:02 UTC (rev 12751)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.py	2014-02-25 22:29:11 UTC (rev 12752)
@@ -70,7 +70,7 @@
 
         self.putChild(u"logs", LogsResource())
         self.putChild(u"principals", PrincipalsResource(directory))
-        self.putChild(u"work", WorkMonitorResource(store))
+        # self.putChild(u"work", WorkMonitorResource(store))
 
         self.putChild(
             u"old",

--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml	2014-02-25 22:24:02 UTC (rev 12751)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml	2014-02-25 22:29:11 UTC (rev 12752)
@@ -33,7 +33,7 @@
 
         var chart = d3.select("#work_queues_chart")
                       .selectAll("div")
-                        .data(data)
+                        .data(data);
 
         var bars = chart.enter().append("div");
 
@@ -48,8 +48,11 @@
 
         var chart = d3.select("#work_queues_chart")
                      .selectAll("div")
-                       .data(data)
+                       .data(data);
 
+        chart.enter();
+        chart.exit().remove();
+
         /* http://stackoverflow.com/questions/14958825/dynamically-update-chart-data-in-d3 */
 
       }