dashboard: allow showing activity details for everyone

circle/dashboard/templates/dashboard/instanceactivity_detail.html

@@ -5,7 +5,12 @@
 <div class="body-content">
   <div class="page-header">
     <h1>
-        {{ object.instance.name }}: {{ object.readable_name.get_user_text }}
+        {{ object.instance.name }}:
+            {% if user.is_superuser %}
+            {{object.readable_name.get_admin_text}}
+            {% else %}
+            {{object.readable_name.get_user_text}}
+            {% endif %}
     </h1>
   </div>
   <div class="row">
@@ -53,7 +58,7 @@
 
 
             <dt>{% trans "result" %}</dt>
-            <dd><textarea class="form-control">{{object.result}}</textarea></dd>
+            <dd><textarea class="form-control">{% if user.is_superuser %}{{object.result.get_admin_text}}{% else %}{{object.result.get_admin_text}}{% endif %}</textarea></dd>
 
             <dt>{% trans "resultant state" %}</dt>
             <dd>{{object.resultant_state|default:'n/a'}}</dd>

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

@@ -5,13 +5,20 @@
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
   <i class="fa{% if not a.finished %}fa-refresh fa-spin {% else %}fa fa-plus{% endif %}"></i>
 </span>
-<strong>{{ a.readable_name.get_user_text }}</strong>
+<strong>{% if user.is_superuser %}
+    {{ a.readable_name.get_admin_text }}
+    {% else %}
+    {{ a.readable_name.get_user_text }}{% endif %}</strong>
 {{ a.started|date:"Y-m-d H:i" }}, {{ a.user }}
   {% if a.children.count > 0 %}
     <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 %}">
-        {{ s.readable_name.get_user_text }} - 
+    {% if user.is_superuser %}
+    {{ s.readable_name.get_admin_text }}
+    {% else %}
+    {{ s.readable_name.get_user_text }}{% endif %}
+         &ndash;
         {% if s.finished %}
           {{ s.finished|time:"H:i:s" }}
         {% else %}

circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html

@@ -4,10 +4,10 @@
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
   <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-plus{% endif %}"></i>
 </span>
-<strong{% if user.is_superuser and a.result %} title="{{ a.result.get_admin_text }}"{% endif %}>
-  {% if user.is_superuser %}<a href="{{ a.get_absolute_url }}">{% endif %}
+<strong{% if a.result %} title="{{ a.result.get_user_text }}"{% endif %}>
+  <a href="{{ a.get_absolute_url }}">
     {% if a.times > 1 %}({{ a.times }}x){% endif %}
-    {{ a.readable_name.get_user_text }}{% if user.is_superuser %}</a>{% endif %}
+    {{ a.readable_name.get_user_text }}</a>
 
 {% if a.has_percent %}
   - {{ a.percentage }}%
@@ -30,9 +30,9 @@
     <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 %}{% if s.pk == active.pk %} sub-activity-active{% endif %}">
-        <span{% if user.is_superuser and s.result %} title="{{ s.result.get_admin_text }}"{% endif %}>
-          {% if user.is_superuser %}<a href="{{ s.get_absolute_url }}">{% endif %}
-              {{ s.readable_name.get_user_text }}{% if user.is_superuser %}</a>{% endif %}</span> &ndash;
+        <span{% if s.result %} title="{{ s.result.get_user_text }}"{% endif %}>
+          <a href="{{ s.get_absolute_url }}">
+              {{ s.readable_name.get_user_text }}</a></span> &ndash;
         {% if s.finished %}
           {{ s.finished|time:"H:i:s" }}
         {% else %}

circle/dashboard/views.py

@@ -2822,11 +2822,14 @@ def get_disk_download_status(request, pk):
     )
 
 
-class InstanceActivityDetail(SuperuserRequiredMixin, DetailView):
+class InstanceActivityDetail(CheckedDetailView):
     model = InstanceActivity
     context_object_name = 'instanceactivity'  # much simpler to mock object
     template_name = 'dashboard/instanceactivity_detail.html'
 
+    def get_has_level(self):
+        return self.object.instance.has_level
+
     def get_context_data(self, **kwargs):
         ctx = super(InstanceActivityDetail, self).get_context_data(**kwargs)
         ctx['activities'] = self.object.instance.get_activities(