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

Merge branch 'main' into new_credentials

This commit is contained in:
Cayo Puigdefabregas 2024-01-12 20:09:33 +01:00
parent 16ea7631dc d018c46bf4
commit bf68d7e741
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
examples/membership-card.ods Normal file
View File

Binary file not shown.

BIN
examples/membership-card.xls Normal file
View File

Binary file not shown.

3
idhub/admin/forms.py
View File

@ -80,7 +80,8 @@ class ImportForm(forms.Form):
if File_datas.objects.filter(file_name=self.file_name, success=True).exists(): if File_datas.objects.filter(file_name=self.file_name, success=True).exists():
raise ValidationError("This file already exists!") raise ValidationError("This file already exists!")
df = pd.read_csv (data, delimiter="\t", quotechar='"', quoting=csv.QUOTE_ALL) # df = pd.read_csv (data, delimiter="\t", quotechar='"', quoting=csv.QUOTE_ALL)
df = pd.read_excel(data)
data_pd = df.fillna('').to_dict() data_pd = df.fillna('').to_dict()
if not data_pd: if not data_pd:

6
idhub/models.py
View File

@ -542,8 +542,12 @@ class VerificableCredential(models.Model):
format = "%Y-%m-%dT%H:%M:%SZ" format = "%Y-%m-%dT%H:%M:%SZ"
issuance_date = self.issued_on.strftime(format) issuance_date = self.issued_on.strftime(format)
url_id = "{}/credentials/{}".format(
settings.DOMAIN.strip("/"),
self.id
)
context = { context = {
'vc_id': self.id, 'vc_id': url_id,
'issuer_did': self.issuer_did.did, 'issuer_did': self.issuer_did.did,
'subject_did': self.subject_did and self.subject_did.did or '', 'subject_did': self.subject_did and self.subject_did.did or '',
'issuance_date': issuance_date, 'issuance_date': issuance_date,

2
idhub/templates/auth/login.html
View File

@ -4,8 +4,6 @@
{% block login_content %} {% block login_content %}
<form action="{% url 'idhub:login' %}" role="form" method="post"> <form action="{% url 'idhub:login' %}" role="form" method="post">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="next" value="{{ next }}" />
<div id="div_id_username" <div id="div_id_username"
class="clearfix control-group {% if form.username.errors %}error{% endif %}"> class="clearfix control-group {% if form.username.errors %}error{% endif %}">
<div class="form-group"> <div class="form-group">

8
idhub/views.py
View File

@ -13,16 +13,16 @@ class LoginView(auth_views.LoginView):
} }
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
if request.GET.get('next'): self.extra_context['success_url'] = request.GET.get(
self.extra_context['success_url'] = request.GET.get('next') 'next',
reverse_lazy('idhub:user_dashboard')
)
return super().get(request, *args, **kwargs) return super().get(request, *args, **kwargs)
def form_valid(self, form): def form_valid(self, form):
user = form.get_user() user = form.get_user()
if not user.is_anonymous and user.is_admin: if not user.is_anonymous and user.is_admin:
user_dashboard = reverse_lazy('idhub:user_dashboard')
admin_dashboard = reverse_lazy('idhub:admin_dashboard') admin_dashboard = reverse_lazy('idhub:admin_dashboard')
if self.extra_context['success_url'] == user_dashboard:
self.extra_context['success_url'] = admin_dashboard self.extra_context['success_url'] = admin_dashboard
auth_login(self.request, user) auth_login(self.request, user)
return HttpResponseRedirect(self.extra_context['success_url']) return HttpResponseRedirect(self.extra_context['success_url'])