diff --git a/circle/dashboard/static/dashboard/vm-details.js b/circle/dashboard/static/dashboard/vm-details.js index 848fee6..238314c 100644 --- a/circle/dashboard/static/dashboard/vm-details.js +++ b/circle/dashboard/static/dashboard/vm-details.js @@ -209,8 +209,10 @@ function checkNewActivity(only_state, runs) { url: '/dashboard/vm/' + instance + '/activity/', data: {'only_state': only_state}, success: function(data) { + console.log(data['activities']); if(!only_state) { $("#activity-timeline").html(data['activities']); + $("[title]").tooltip(); } $("#vm-details-state").html(data['state']); diff --git a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html index aebed13..7c4a7a4 100644 --- a/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html +++ b/circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html @@ -12,7 +12,7 @@ <div class="sub-timeline"> {% for s in a.children.all %} <div data-activity-id="{{ s.pk }}" class="sub-activity{% if s.has_failed %} sub-activity-failed{% endif %}"> - <span{% if user.is_superuser and s.result %} title="{{ s.result }}"{% endif %}> + <span{% if user.is_superuser and s.result %} title="{{ s.result }}"{% endif %}> {{ s.get_readable_name }}</span> – {% if s.finished %} {{ s.finished|time:"H:i:s" }} diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py index 8d72452..420bfd5 100644 --- a/circle/dashboard/views.py +++ b/circle/dashboard/views.py @@ -24,6 +24,7 @@ from django.contrib import messages from django.utils.translation import ugettext as _ from django.template.defaultfilters import title from django.template.loader import render_to_string +from django.template import RequestContext from django.forms.models import inlineformset_factory from django_tables2 import SingleTableView @@ -1470,12 +1471,15 @@ def vm_activity(request, pk): response['state'] = instance.state if only_state is not None and only_state == "false": # instance activity - print "Sdsa" + context = { + 'activities': InstanceActivity.objects.filter( + instance=instance, parent=None + ).order_by('-started').select_related() + } + activities = render_to_string( "dashboard/vm-detail/_activity-timeline.html", - {'activities': InstanceActivity.objects.filter( - instance=instance, parent=None - ).order_by('-started').select_related()} + RequestContext(request, context), ) response['activities'] = activities