Commit 2ba8a031 authored by Daniele Venzano's avatar Daniele Venzano

Show the ZApp name in the web interface

parent 4ffa2f1b
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<h2>Detailed information for execution {{ e.name }} ({{ e.id }})</h2> <h2>Detailed information for execution {{ e.name }} ({{ e.id }})</h2>
<div id="contents"> <div id="contents">
<ul> <ul>
<li>Application name: {{ e.description['name'] }}</li> <li>Application name: {{ e.app_name }}</li>
{% if user.role.can_operate_others %} {% if user.role.can_operate_others %}
<li>Owner: {{ e.owner.username }}</li> <li>Owner: {{ e.owner.username }}</li>
{% endif %} {% endif %}
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>ZApp</th>
<th>Execution name</th> <th>Execution name</th>
{% if user.role.can_operate_others %} {% if user.role.can_operate_others %}
<th>User</th> <th>User</th>
...@@ -47,6 +48,7 @@ ...@@ -47,6 +48,7 @@
{% for e in executions %} {% for e in executions %}
<tr> <tr>
<td>{{ e.id }}</td> <td>{{ e.id }}</td>
<td class="exec-name">{{ e.app_name }}</td>
<td class="exec-name"><a href="{{ reverse_url("execution_inspect", e.id) }}">{{ e.name }}</a></td> <td class="exec-name"><a href="{{ reverse_url("execution_inspect", e.id) }}">{{ e.name }}</a></td>
{% if user.role.can_operate_others %} {% if user.role.can_operate_others %}
<td>{{ e.owner.username }}</td> <td>{{ e.owner.username }}</td>
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>ZApp</th>
<th>Execution name</th> <th>Execution name</th>
<th>Status</th> <th>Status</th>
<th>Started</th> <th>Started</th>
...@@ -47,6 +48,7 @@ ...@@ -47,6 +48,7 @@
{% for e in running_executions %} {% for e in running_executions %}
<tr> <tr>
<td>{{ e.id }}</td> <td>{{ e.id }}</td>
<td class="exec-name">{{ e.app_name }}</td>
<td><a href="{{ reverse_url("execution_inspect", e.id) }}">{{ e.name }}</a></td> <td><a href="{{ reverse_url("execution_inspect", e.id) }}">{{ e.name }}</a></td>
<td>{{ e.status }}</td> <td>{{ e.status }}</td>
{% if e.time_start == None %} {% if e.time_start == None %}
...@@ -76,6 +78,7 @@ ...@@ -76,6 +78,7 @@
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>ZApp</th>
<th>Execution name</th> <th>Execution name</th>
<th>Status</th> <th>Status</th>
<th>Started</th> <th>Started</th>
...@@ -87,6 +90,7 @@ ...@@ -87,6 +90,7 @@
{% for e in last_executions %} {% for e in last_executions %}
<tr> <tr>
<td>{{ e.id }}</td> <td>{{ e.id }}</td>
<td class="exec-name">{{ e.app_name }}</td>
<td><a href="{{ reverse_url("execution_inspect", e.id) }}">{{ e.name }}</a></td> <td><a href="{{ reverse_url("execution_inspect", e.id) }}">{{ e.name }}</a></td>
<td>{{ e.status }}</td> <td>{{ e.status }}</td>
{% if e.time_start == None %} {% if e.time_start == None %}
......
...@@ -82,6 +82,8 @@ class Execution(BaseRecord): ...@@ -82,6 +82,8 @@ class Execution(BaseRecord):
except KeyError: except KeyError:
self.size = self.description['priority'] # zapp format v2 self.size = self.description['priority'] # zapp format v2
self.app_name = self.description['name']
def serialize(self): def serialize(self):
"""Generates a dictionary that can be serialized in JSON.""" """Generates a dictionary that can be serialized in JSON."""
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment