ereuse
/
IdHub
8
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'features/132-navegabilidad-credenciales' (#153) from features/132-navegabilidad-credenciales into release 

Reviewed-on: https://gitea.pangea.org/trustchain-oc1-orchestral/IdHub/pulls/153
This commit is contained in:
cayop 2024-02-26 17:38:29 +00:00
parent 120b1e0c69 5f9e7ce46d
commit 276a5a75a3
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
idhub/admin/forms.py
View File

@ -234,7 +234,7 @@ class ImportForm(forms.Form):
for n in range(df.last_valid_index()+1): for n in range(df.last_valid_index()+1):
row = {} row = {}
for k in data_pd.keys(): 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] row[k] = data_pd[k][n]
user = self.validate_jsonld(n, row) user = self.validate_jsonld(n, row)

2
idhub/templates/idhub/admin/issue_credentials.html
View File

@ -51,7 +51,7 @@
{% if object.issued_on %} {% if object.issued_on %}
<div class="row mt-3"> <div class="row mt-3">
<div class="col text-center"> <div class="col text-center">
<a class="btn btn-green-admin" href="{% url 'idhub:admin_credential_json' object.id %}">{% trans 'View in JSON format' %}</a> <a class="btn btn-green-admin" href="{% url 'idhub:admin_credential_json' object.id %}">{% trans 'Download in JSON format' %}</a>
</div> </div>
</div> </div>
{% endif %} {% endif %}

9
idhub/templates/idhub/user/credential.html
View File

@ -38,7 +38,7 @@
</div> </div>
</div> </div>
</div> </div>
{% if object.issued_on %} {% if object.get_status == 'Issued' %}
<div class="row mt-3"> <div class="row mt-3">
{% if object.eidas1_did and admin_validated %} {% if object.eidas1_did and admin_validated %}
<div class="col text-center"> <div class="col text-center">
@ -46,7 +46,12 @@
</div> </div>
{% endif %} {% endif %}
<div class="col text-center"> <div class="col text-center">
<a class="btn btn-green-user" href="{% url 'idhub:user_credential_json' object.id %}">{% trans 'View credential in JSON format' %}</a> <a class="btn btn-green-user" href="{% url 'idhub:user_credential_json' object.id %}">{% trans 'Download credential in JSON format' %}</a>
</div>
{% endif %}
{% if object.get_status == 'Enabled' %}
<div class="col text-center">
<a class="btn btn-green-user" href="{% url 'idhub:user_credentials_request' %}">{% trans 'Request credential' %}</a>
</div> </div>
{% endif %} {% endif %}
</div> </div>