dashboard: fix node activity

circle/dashboard/templates/dashboard/node-detail.html

@@ -9,7 +9,7 @@
   <div class="row">
   <div class="row">
     <div class="col-md-4" id="node-info-pane">
     <div class="col-md-4" id="node-info-pane">
       <div id="node-info-data" class="big">
       <div id="node-info-data" class="big">
-	      <span id="node-status-label" class="label {% if node.state == 'Online' %}label-success
+      <span id="node-details-state" class="label {% if node.state == 'Online' %}label-success
 			{% elif node.state == 'Missing' %}label-danger
 			{% elif node.state == 'Missing' %}label-danger
 			{% elif node.state == 'Disabled' %}label-warning
 			{% elif node.state == 'Disabled' %}label-warning
 			{% elif node.state == 'Offline' %}label-warning
 			{% elif node.state == 'Offline' %}label-warning

circle/dashboard/views.py

@@ -35,7 +35,7 @@ from .tables import (VmListTable, NodeListTable, NodeVmListTable,
                      TemplateListTable, LeaseListTable, GroupListTable,)
                      TemplateListTable, LeaseListTable, GroupListTable,)
 from vm.models import (Instance, InstanceTemplate, InterfaceTemplate,
 from vm.models import (Instance, InstanceTemplate, InterfaceTemplate,
                        InstanceActivity, Node, instance_activity, Lease,
                        InstanceActivity, Node, instance_activity, Lease,
-                       Interface)
+                       Interface, NodeActivity)
 from firewall.models import Vlan, Host, Rule
 from firewall.models import Vlan, Host, Rule
 from dashboard.models import Favourite
 from dashboard.models import Favourite
 
 
@@ -444,6 +444,10 @@ class NodeDetailView(LoginRequiredMixin, SuperuserRequiredMixin, DetailView):
         context = super(NodeDetailView, self).get_context_data(**kwargs)
         context = super(NodeDetailView, self).get_context_data(**kwargs)
         instances = Instance.active.filter(node=self.object)
         instances = Instance.active.filter(node=self.object)
         context['table'] = NodeVmListTable(instances)
         context['table'] = NodeVmListTable(instances)
+        na = NodeActivity.objects.filter(
+            node=self.object, parent=None
+        ).order_by('-started').select_related()
+        context['activities'] = na
         return context
         return context
 
 
     def post(self, request, *args, **kwargs):
     def post(self, request, *args, **kwargs):