ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Linting

This commit is contained in:
Nicolas Margulies 2021-10-04 20:45:05 +02:00 committed by Yohann D'ANELLO
parent e29b42eecc
commit 633ab88b04
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/member/views.py
View File

@ -251,7 +251,7 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
model = User model = User
template_name = 'member/profile_trust.html' template_name = 'member/profile_trust.html'
context_object_name = 'user_object' context_object_name = 'user_object'
extra_context = {"title":_("Note friendships")} extra_context = {"title": _("Note friendships")}
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
@ -262,20 +262,21 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
trusting=context["object"].note, trusting=context["object"].note,
trusted=context["object"].note trusted=context["object"].note
)) ))
context["widget"] = {"name": "trusted", context["widget"] = {
"attrs": { "model_pk": ContentType.objects.get_for_model(Alias).pk, "name": "trusted",
"attrs": {
"model_pk": ContentType.objects.get_for_model(Alias).pk,
"class": "autocomplete form-control", "class": "autocomplete form-control",
"id": "trusted", "id": "trusted",
"resetable": True, "resetable": True,
"api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser", "api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser",
"name_field": "name", "name_field": "name",
"placeholder": "" "placeholder": ""
}
} }
}
return context return context
class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
""" """
View and manage user aliases. View and manage user aliases.

4
apps/note/api/views.py
View File

@ -67,8 +67,8 @@ class TrustViewSet(ReadProtectedModelViewSet):
serializer_class = TrustSerializer serializer_class = TrustSerializer
filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter] filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter]
search_fields = ['$trusting__alias__name', '$trusting__alias__normalized_name', search_fields = ['$trusting__alias__name', '$trusting__alias__normalized_name',
'$trusted__alias__name', '$trusted__alias__normalized_name'] '$trusted__alias__name', '$trusted__alias__normalized_name']
filterset_fields = ['trusting', 'trusting__noteuser__user', 'trusted', 'trusted__noteuser__user',] filterset_fields = ['trusting', 'trusting__noteuser__user', 'trusted', 'trusted__noteuser__user']
ordering_fields = ['trusting', 'trusted', ] ordering_fields = ['trusting', 'trusted', ]
def get_serializer_class(self): def get_serializer_class(self):

4
apps/note/models/notes.py
View File

@ -244,6 +244,10 @@ class Trust(models.Model):
verbose_name_plural = _("friendships") verbose_name_plural = _("friendships")
unique_together = ("trusting", "trusted") unique_together = ("trusting", "trusted")
def __str__(self):
return _("Friendship between {trusting} and{trusted}").format(
trusting=str(self.trusting), trusted=str(self.trusted))
class Alias(models.Model): class Alias(models.Model):
""" """

16
apps/note/tables.py
View File

@ -161,12 +161,16 @@ class TrustTable(tables.Table):
show_header = False show_header = False
trusted = tables.Column(attrs={'td': {'class': 'text_center'}}) trusted = tables.Column(attrs={'td': {'class': 'text_center'}})
delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE, delete_col = tables.TemplateColumn(
extra_context={"delete_trans": _('delete')}, template_code=DELETE_TEMPLATE,
attrs={'td': {'class': lambda record: 'col-sm-1' + (' d-none' extra_context={"delete_trans": _('delete')},
if not PermissionBackend.check_perm(get_current_request(), attrs={
"note.delete_trust", record) else '')}}, 'td': {
verbose_name =_("Delete"), ) 'class': lambda record: 'col-sm-1'
+ (' d-none' if not PermissionBackend.check_perm(
get_current_request(), "note.delete_trust", record)
else '')}},
verbose_name=_("Delete"),)
class AliasTable(tables.Table): class AliasTable(tables.Table):