X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fvalidate_pending.html;h=cef58ea9d862bab26ba621acf643e4e474aef960;hb=350a118a4f8e3329f39fe7f245cb27388a3756f0;hp=74176ea329d4785e6142e3dc0c7daef8173fd1ec;hpb=26d84333b968352f844b47740021dd2a2fcafa41;p=myslice.git diff --git a/portal/templates/validate_pending.html b/portal/templates/validate_pending.html index 74176ea3..cef58ea9 100644 --- a/portal/templates/validate_pending.html +++ b/portal/templates/validate_pending.html @@ -6,7 +6,7 @@ function on_click_event() { var ids = []; $('.portal__validate__checkbox').each(function(i, el) { - if ($(el).attr('checked')) { + if ($(el).prop('checked')) { // portal__validate__checkbox__slice__2 var id_array = $(el).attr('id').split('__'); // push(slice__2) @@ -28,10 +28,10 @@ status_str += ' -- '; if (result.status) { - status_str += '' + name + ''; + status_str += 'OK'; $('#portal__validate__checkbox__' + request_type__id).hide(); } else { - status_str += '' + name + ' (' + result.description + ')'; + status_str += 'ERROR: ' + result.description + ''; } }); $('#portal__status__' + request_type__id).html(status_str) @@ -45,33 +45,85 @@ {% endblock %} -{% block unfold1_main %} - +{% block unfold_main %} +
+ | type | +id | +details | +timestamp | +status | + {% for request in requests %} -
---|---|---|---|---|---|
+ {% if request.allowed == 'allowed' %} + + {% else %} + {% if request.allowed == 'expired' %} + expired + {% else %} {# denied #} + denied + {% endif %} + {% endif %} + | +{{ request.type }} | +{{ request.id }} | +{% if request.type == 'user' %} - First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} + Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} {% else %} {% if request.type == 'slice' %} - Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} + Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} {% else %} {# authority #} - TODO + Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} {% endif %} {% endif %} + | +{{ request.timestamp }} | + ++ + + |
+ | type | +id | +details | +timestamp | +status | + + {% for request in requests %} +
---|---|---|---|---|---|
{% if request.allowed == 'allowed' %} {% else %} @@ -81,26 +133,51 @@ denied {% endif %} {% endif %} - - + | +{{ request.type }} | +{{ request.id }} | ++ {% if request.type == 'user' %} + Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} + {% 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}} + {% else %} {# authority #} + Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} + {% endif %} + {% endif %} + | +{{ request.timestamp }} | + ++ + + |
+ | type | +id | +details | +timestamp | +status | + {% for request in requests %} -
---|---|---|---|---|---|
{% if request.allowed == 'allowed' %} {% else %} @@ -110,13 +187,34 @@ denied {% endif %} {% endif %} - - + | +{{ request.type }} | +{{ request.id }} | ++ {% if request.type == 'user' %} + Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} + {% 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}} + {% else %} {# authority #} + Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} + {% endif %} + {% endif %} + | +{{ request.timestamp }} | + ++ + + |