From bed2e7b12ba20a9f4dfd0751ab3e949839018ae2 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 26 Aug 2020 17:55:50 +0200
Subject: [PATCH] Display profile transitions in profile lists
---
hiboo/profile/templates/profile_details.html | 3 +--
hiboo/profile/templates/profile_list.html | 3 +--
hiboo/templates/macros.html | 10 ++++++++++
hiboo/user/templates/user_details.html | 2 +-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/hiboo/profile/templates/profile_details.html b/hiboo/profile/templates/profile_details.html
index 1c446eb..1c9c883 100644
--- a/hiboo/profile/templates/profile_details.html
+++ b/hiboo/profile/templates/profile_details.html
@@ -18,9 +18,8 @@
<dt>{% trans %}UUID{% endtrans %}</dt>
<dd><pre>{{ profile.uuid }}</pre></dd>
- {% set status = profile.STATUSES[profile.status] %}
<dt>{% trans %}Status{% endtrans %}</dt>
- <dd><span class="badge bg-{{ status[0] }}">{{ status[1] }}</span></dd>
+ <dd>{{ macros.profile_status(profile) }}</dd>
<dt>{% trans %}Created at{% endtrans %}</dt>
<dd>{{ profile.created_at }}</dd>
diff --git a/hiboo/profile/templates/profile_list.html b/hiboo/profile/templates/profile_list.html
index 11626ef..347d80d 100644
--- a/hiboo/profile/templates/profile_list.html
+++ b/hiboo/profile/templates/profile_list.html
@@ -29,7 +29,6 @@
<th>{% trans %}Actions{% endtrans %}</th>
</tr>
{% for profile in profiles %}
- {% set status = profile.STATUSES[profile.status] %}
<tr>
{% if not service %}
<td>{{ profile.service.name }}</td>
@@ -42,7 +41,7 @@
<td>-</td>
{% endif %}
<td>{{ profile.uuid }}</td>
- <td><span class="badge bg-{{ status[0] }}">{{ status[1] }}</span></td>
+ <td>{{ macros.profile_status(profile) }}</td>
<td>{{ profile.created_at.date() }}</td>
<td>
{% if profile.status == "active" %}
diff --git a/hiboo/templates/macros.html b/hiboo/templates/macros.html
index c5c9a81..d3ce477 100644
--- a/hiboo/templates/macros.html
+++ b/hiboo/templates/macros.html
@@ -31,6 +31,16 @@
</ul>
{% endmacro %}
+{% macro profile_status(profile) %}
+ {% set status = profile.STATUSES[profile.status] %}
+ <span class="badge bg-{{ status[0] }}">{{ status[1] }}</span>
+ {% if profile.transition %}
+ {% set transition = profile.STATUSES[profile.transition] %}
+ <i class="fa fa-arrow-right"></i>
+ <span class="badge bg-{{ transition[0] }}">{{ transition[1] }}</span>
+ {% endif %}
+{% endmacro %}
+
{% macro infobox(title, text, color, icon) %}
<div class="info-box">
<span class="info-box-icon bg-{{ color }}"><i class="fa fa-{{ icon }}"></i></span>
diff --git a/hiboo/user/templates/user_details.html b/hiboo/user/templates/user_details.html
index cabc8cd..3dba768 100644
--- a/hiboo/user/templates/user_details.html
+++ b/hiboo/user/templates/user_details.html
@@ -49,7 +49,7 @@
<tr>
<td><a href="{{ url_for("service.details", service_uuid=profile.service.uuid) }}">{{ profile.service.name }}</a></td>
<td><a href="{{ url_for("profile.details", profile_uuid=profile.uuid) }}">{{ profile.username }}</a></td>
- <td>{{ profile.status }}</td>
+ <td>{{ macros.profile_status(profile) }}</td>
</tr>
{% endfor %}
</table>
--
GitLab