X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Ftemplates%2Fmanagement-tab-requests.html;h=db4ace23b85ab223d93af7ccc2d37122439ad27d;hb=012e4fea839c48e95dc8a174c256494f9b596537;hp=bdac9797dd999b78886b8bb0a914121e44db539d;hpb=0f8fc6ba7a5d7d9a9c99ea8efb60143b833ee40b;p=unfold.git
diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index bdac9797..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 %}
-
-
{% for request in requests %}
-
-
+
+ {% if request.type == 'user' %}
+
+ {% elif request.type == 'slice' %}
+
+ {% else %}
+
+ {% endif %}
{{ request.id }} |
{% if request.allowed == 'allowed' %}
@@ -109,6 +139,10 @@
{{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 %}
@@ -121,20 +155,24 @@
|
{% 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}}
@@ -167,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 %}
@@ -182,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}}
@@ -226,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 %}
@@ -241,10 +280,6 @@
{% endfor %}
-{% else %}
-
- There is no pending request waiting for validation.
-
{% endif %}