X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fmanagement-tab-requests.html;h=db4ace23b85ab223d93af7ccc2d37122439ad27d;hb=1dc51fa1e2a0ac2b5e3fa4af5bef7077deaad079;hp=2270a3b983023d2b21f23cfae3d08c2cfe502aa6;hpb=4ad6b9d025e7dd31df32cf9f187e6b29287750bd;p=unfold.git
diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index 2270a3b9..db4ace23 100644
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -1,6 +1,18 @@
+
From your authorities
{% if my_authorities %}
-
+
+
+
+
+ ID |
+ |
+ Type |
+ Authority |
+ Info |
+ Date |
+ Status |
+
+
+
{% for authority, requests in my_authorities.items %}
-
-
{{authority}}
-
-
-
-
+
+ {{ request.type }} |
+ {{authority}}{{request.site_authority}} |
+
+ {% if request.type == 'user' %}
+ {{request.first_name}} {{request.last_name}} <{{request.email}}>
+ {% elif request.type == 'slice' %}
+ {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
+ {% elif request.type == 'project' %}
+ {{request.project_name}} -- {{ request.user_hrn }} -- Purpose: {{request.purpose}}
+ {% elif request.type == 'join' %}
+ {{request.user_hrn}} -- to join {{ request.authority_hrn }}
+ {% else %}
+ {{request.site_name}} ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}}
+ {% endif %}
+ |
+ {{ request.timestamp }} |
+
+ |
+
+
+
+
+ {% endfor %}
+
{% endfor %}
-
+
+
+
{% else %}
There is no pending request waiting for validation.
{% endif %}
+
+
+{% if sub_authorities %}
From your sub-authorities
-{% if sub_authorities %}
-
+
{% for authority, requests in sub_authorities.items %}
{{authority}}
@@ -144,6 +205,10 @@
{% else %}
{% if request.type == 'slice' %}
Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
+ {% elif request.type == 'project' %}
+ {{request.project_name}} -- {{ request.user_hrn }} -- Purpose: {{request.purpose}}
+ {% elif request.type == 'join' %}
+ {{request.user_hrn}} -- to join {{ request.authority_hrn }}
{% else %} {# authority #}
Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}}
{% endif %}
@@ -159,18 +224,13 @@
{% endfor %}
-{% else %}
-
- There is no pending request waiting for validation.
-
{% endif %}
+{% if delegation_authorities %}
From your authorities with delegation
-{% if delegation_authorities %}
-
{% for authority, requests in delegation_authorities.items %}
{{authority}}
@@ -203,6 +263,8 @@
{% else %}
{% if request.type == 'slice' %}
Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
+ {% elif request.type == 'project' %}
+ {{request.project_name}} -- {{ request.user_hrn }} -- Purpose: {{request.purpose}}
{% else %} {# authority #}
Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}}
{% endif %}
@@ -218,12 +280,9 @@
{% endfor %}
-{% else %}
-
- There is no pending request waiting for validation.
-
{% endif %}
+