{% for user in users %}
- | {{ user.last_name }} |
- {{ user.first_name }} |
+ {{ user.last_name|default:'' }} |
+ {{ user.first_name|default:'' }} |
{{ user.email }} |
-
- {% for m in user.memberships.all %}
- {{ m.get_type }}
- {% endfor %}
+ |
+ {{ user.get_memberships }}
|
-
- {% for r in user.roles.all %}
- {{ r.service.get_roles }}
- {% endfor %}
+ |
+ {{ user.get_roles }}
|
{% trans 'View' %} |
diff --git a/idhub/templates/idhub/admin/user.html b/idhub/templates/idhub/admin/user.html
index bad25c7..71b5828 100644
--- a/idhub/templates/idhub/admin/user.html
+++ b/idhub/templates/idhub/admin/user.html
@@ -24,7 +24,7 @@
First Name:
- {{ object.first_name }}
+ {{ object.first_name|default:'' }}
@@ -32,7 +32,7 @@
Last Name:
- {{ object.last_name }}
+ {{ object.last_name|default:'' }}
diff --git a/idhub_auth/forms.py b/idhub_auth/forms.py
new file mode 100644
index 0000000..1bc1881
--- /dev/null
+++ b/idhub_auth/forms.py
@@ -0,0 +1,32 @@
+import re
+
+from django import forms
+from django.utils.translation import gettext_lazy as _
+from idhub_auth.models import User
+
+
+class ProfileForm(forms.ModelForm):
+ first_name = forms.CharField(required=True)
+ last_name = forms.CharField(required=True)
+
+ class Meta:
+ model = User
+ fields = ['first_name', 'last_name', 'email']
+
+ def clean_first_name(self):
+ first_name = super().clean()['first_name']
+ if not re.match(r'^[a-zA-Z\s]+$', first_name):
+ txt = _("The string must contain only characters and spaces")
+ raise forms.ValidationError(txt)
+
+ return first_name
+
+ def clean_last_name(self):
+ last_name = super().clean()['last_name']
+ if not re.match(r'^[a-zA-Z\s]+$', last_name):
+ txt = _("The string must contain only characters and spaces")
+ raise forms.ValidationError(txt)
+
+ return last_name
+
+
diff --git a/idhub_auth/models.py b/idhub_auth/models.py
index 64f5491..ccda94c 100644
--- a/idhub_auth/models.py
+++ b/idhub_auth/models.py
@@ -72,3 +72,16 @@ class User(AbstractBaseUser):
def username(self):
"Is the email of the user"
return self.email
+
+ def get_memberships(self):
+ members = set(
+ str(dict(x.Types.choices)[x.type]) for x in self.memberships.all()
+ )
+ return ", ".join(members)
+
+ def get_roles(self):
+ roles = []
+ for s in self.roles.all():
+ for r in s.service.rol.all():
+ roles.append(r.name)
+ return ", ".join(set(roles))