diff --git a/idhub/admin/forms.py b/idhub/admin/forms.py index dc6a1da..cefc18b 100644 --- a/idhub/admin/forms.py +++ b/idhub/admin/forms.py @@ -234,7 +234,7 @@ class ImportForm(forms.Form): for n in range(df.last_valid_index()+1): row = {} for k in data_pd.keys(): - if data_pd[k][n]: + if data_pd[k][n] or data_pd[k][n] == 0: row[k] = data_pd[k][n] user = self.validate_jsonld(n, row) diff --git a/idhub/templates/idhub/admin/issue_credentials.html b/idhub/templates/idhub/admin/issue_credentials.html index 51d14ba..216690e 100644 --- a/idhub/templates/idhub/admin/issue_credentials.html +++ b/idhub/templates/idhub/admin/issue_credentials.html @@ -51,7 +51,7 @@ {% if object.issued_on %}
- {% trans 'View in JSON format' %} + {% trans 'Download in JSON format' %}
{% endif %} diff --git a/idhub/templates/idhub/user/credential.html b/idhub/templates/idhub/user/credential.html index b78e81b..ac5c14e 100644 --- a/idhub/templates/idhub/user/credential.html +++ b/idhub/templates/idhub/user/credential.html @@ -38,7 +38,7 @@ - {% if object.issued_on %} + {% if object.get_status == 'Issued' %}
{% if object.eidas1_did and admin_validated %}
@@ -46,7 +46,12 @@
{% endif %}
- {% trans 'View credential in JSON format' %} + {% trans 'Download credential in JSON format' %} +
+ {% endif %} + {% if object.get_status == 'Enabled' %} +
+ {% trans 'Request credential' %}
{% endif %}