Skip to content
Snippets Groups Projects
Commit f7c7d3f7 authored by Jean-Baptiste's avatar Jean-Baptiste
Browse files

update: fix validators import

parent 90a25179
No related branches found
No related tags found
1 merge request!96Resolve "Federated Model"
Pipeline #1162 passed with stage
in 1 minute and 25 seconds
import validators
from django.conf import settings from django.conf import settings
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.db import models from django.db import models
from django.utils.datetime_safe import date
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.utils.datetime_safe import date
import validators
from djangoldp.models import Model from djangoldp.models import Model
...@@ -173,6 +171,7 @@ class Circle(Model): ...@@ -173,6 +171,7 @@ class Circle(Model):
rdf_type = 'hd:circle' rdf_type = 'hd:circle'
depth = 1 depth = 1
def webid(self): def webid(self):
# hack : We user webid as username for external user (since it's an uniq identifier too) # hack : We user webid as username for external user (since it's an uniq identifier too)
if validators.url(self.username): if validators.url(self.username):
...@@ -181,7 +180,8 @@ def webid(self): ...@@ -181,7 +180,8 @@ def webid(self):
webid = '{0}{1}'.format(settings.BASE_URL, reverse_lazy('user-detail', kwargs={'pk': self.pk})) webid = '{0}{1}'.format(settings.BASE_URL, reverse_lazy('user-detail', kwargs={'pk': self.pk}))
return webid return webid
get_user_model()._meta.serializer_fields = ['@id', 'username', 'first_name', 'last_name', 'email', 'userprofile', get_user_model()._meta.serializer_fields = ['@id', 'username', 'first_name', 'last_name', 'email', 'userprofile',
'conversation_set', 'circle_set'] 'conversation_set', 'circle_set']
get_user_model().webid = webid get_user_model().webid = webid
get_user_model()._meta.anonymous_perms=['view', 'add'] get_user_model()._meta.anonymous_perms = ['view', 'add']
...@@ -20,6 +20,7 @@ install_requires = ...@@ -20,6 +20,7 @@ install_requires =
[options.extras_require] [options.extras_require]
dev = dev =
validators
factory_boy>=2.11.0 factory_boy>=2.11.0
[semantic_release] [semantic_release]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment