All: Apply Black coding rules

This commit is contained in:
2018-10-04 21:29:19 +02:00
parent 0581c667de
commit cb58b00b6e
204 changed files with 13173 additions and 6376 deletions

View File

@ -38,7 +38,14 @@ from datetime import date
from trombi.models import Trombi, TrombiUser, TrombiComment, TrombiClubMembership
from core.views.forms import SelectDate
from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, TabedViewMixin, CanCreateMixin, QuickNotifMixin
from core.views import (
CanViewMixin,
CanEditMixin,
CanEditPropMixin,
TabedViewMixin,
CanCreateMixin,
QuickNotifMixin,
)
from core.models import User
from club.models import Club
@ -49,29 +56,35 @@ class TrombiTabsMixin(TabedViewMixin):
def get_list_of_tabs(self):
tab_list = []
tab_list.append({
'url': reverse('trombi:user_tools'),
'slug': 'tools',
'name': _("Tools"),
})
tab_list.append({
'url': reverse('trombi:profile'),
'slug': 'profile',
'name': _("My profile"),
})
tab_list.append({
'url': reverse('trombi:pictures'),
'slug': 'pictures',
'name': _("My pictures"),
})
tab_list.append(
{"url": reverse("trombi:user_tools"), "slug": "tools", "name": _("Tools")}
)
tab_list.append(
{
"url": reverse("trombi:profile"),
"slug": "profile",
"name": _("My profile"),
}
)
tab_list.append(
{
"url": reverse("trombi:pictures"),
"slug": "pictures",
"name": _("My pictures"),
}
)
try:
trombi = self.request.user.trombi_user.trombi
if self.request.user.is_owner(trombi):
tab_list.append({
'url': reverse('trombi:detail', kwargs={'trombi_id': trombi.id}),
'slug': 'admin_tools',
'name': _("Admin tools"),
})
tab_list.append(
{
"url": reverse(
"trombi:detail", kwargs={"trombi_id": trombi.id}
),
"slug": "admin_tools",
"name": _("Admin tools"),
}
)
except:
pass
return tab_list
@ -80,20 +93,23 @@ class TrombiTabsMixin(TabedViewMixin):
class TrombiForm(forms.ModelForm):
class Meta:
model = Trombi
fields = ['subscription_deadline', 'comments_deadline', 'max_chars', 'show_profiles']
widgets = {
'subscription_deadline': SelectDate,
'comments_deadline': SelectDate,
}
fields = [
"subscription_deadline",
"comments_deadline",
"max_chars",
"show_profiles",
]
widgets = {"subscription_deadline": SelectDate, "comments_deadline": SelectDate}
class TrombiCreateView(CanCreateMixin, CreateView):
"""
Create a trombi for a club
"""
model = Trombi
form_class = TrombiForm
template_name = 'core/create.jinja'
template_name = "core/create.jinja"
def post(self, request, *args, **kwargs):
"""
@ -101,7 +117,7 @@ class TrombiCreateView(CanCreateMixin, CreateView):
"""
form = self.get_form()
if form.is_valid():
club = get_object_or_404(Club, id=self.kwargs['club_id'])
club = get_object_or_404(Club, id=self.kwargs["club_id"])
form.instance.club = club
ret = self.form_valid(form)
return ret
@ -112,8 +128,8 @@ class TrombiCreateView(CanCreateMixin, CreateView):
class TrombiEditView(CanEditPropMixin, TrombiTabsMixin, UpdateView):
model = Trombi
form_class = TrombiForm
template_name = 'core/edit.jinja'
pk_url_kwarg = 'trombi_id'
template_name = "core/edit.jinja"
pk_url_kwarg = "trombi_id"
current_tab = "admin_tools"
def get_success_url(self):
@ -121,12 +137,15 @@ class TrombiEditView(CanEditPropMixin, TrombiTabsMixin, UpdateView):
class AddUserForm(forms.Form):
user = AutoCompleteSelectField('users', required=True, label=_("Select user"), help_text=None)
user = AutoCompleteSelectField(
"users", required=True, label=_("Select user"), help_text=None
)
class TrombiDetailView(CanEditMixin, QuickNotifMixin, TrombiTabsMixin, DetailView):
model = Trombi
template_name = 'trombi/detail.jinja'
pk_url_kwarg = 'trombi_id'
template_name = "trombi/detail.jinja"
pk_url_kwarg = "trombi_id"
current_tab = "admin_tools"
def post(self, request, *args, **kwargs):
@ -134,43 +153,51 @@ class TrombiDetailView(CanEditMixin, QuickNotifMixin, TrombiTabsMixin, DetailVie
form = AddUserForm(request.POST)
if form.is_valid():
try:
TrombiUser(user=form.cleaned_data['user'], trombi=self.object).save()
TrombiUser(user=form.cleaned_data["user"], trombi=self.object).save()
self.quick_notif_list.append("qn_success")
except: # We don't care about duplicate keys
except: # We don't care about duplicate keys
self.quick_notif_list.append("qn_fail")
return super(TrombiDetailView, self).get(request, *args, **kwargs)
def get_context_data(self, **kwargs):
kwargs = super(TrombiDetailView, self).get_context_data(**kwargs)
kwargs['form'] = AddUserForm()
kwargs["form"] = AddUserForm()
return kwargs
class TrombiExportView(CanEditMixin, TrombiTabsMixin, DetailView):
model = Trombi
template_name = 'trombi/export.jinja'
pk_url_kwarg = 'trombi_id'
template_name = "trombi/export.jinja"
pk_url_kwarg = "trombi_id"
current_tab = "admin_tools"
class TrombiDeleteUserView(CanEditPropMixin, TrombiTabsMixin, DeleteView):
model = TrombiUser
pk_url_kwarg = 'user_id'
template_name = 'core/delete_confirm.jinja'
pk_url_kwarg = "user_id"
template_name = "core/delete_confirm.jinja"
current_tab = "admin_tools"
def get_success_url(self):
return reverse('trombi:detail', kwargs={'trombi_id': self.object.trombi.id}) + "?qn_success"
return (
reverse("trombi:detail", kwargs={"trombi_id": self.object.trombi.id})
+ "?qn_success"
)
class TrombiModerateCommentsView(CanEditPropMixin, QuickNotifMixin, TrombiTabsMixin, DetailView):
class TrombiModerateCommentsView(
CanEditPropMixin, QuickNotifMixin, TrombiTabsMixin, DetailView
):
model = Trombi
template_name = 'trombi/comment_moderation.jinja'
pk_url_kwarg = 'trombi_id'
template_name = "trombi/comment_moderation.jinja"
pk_url_kwarg = "trombi_id"
current_tab = "admin_tools"
def get_context_data(self, **kwargs):
kwargs = super(TrombiModerateCommentsView, self).get_context_data(**kwargs)
kwargs['comments'] = TrombiComment.objects.filter(is_moderated=False,
author__trombi__id=self.object.id).exclude(target__user__id=self.request.user.id)
kwargs["comments"] = TrombiComment.objects.filter(
is_moderated=False, author__trombi__id=self.object.id
).exclude(target__user__id=self.request.user.id)
return kwargs
@ -181,8 +208,8 @@ class TrombiModerateForm(forms.Form):
class TrombiModerateCommentView(DetailView):
model = TrombiComment
template_name = 'core/edit.jinja'
pk_url_kwarg = 'comment_id'
template_name = "core/edit.jinja"
pk_url_kwarg = "comment_id"
def dispatch(self, request, *args, **kwargs):
self.object = self.get_object()
@ -192,79 +219,107 @@ class TrombiModerateCommentView(DetailView):
def post(self, request, *args, **kwargs):
if "action" in request.POST:
if request.POST['action'] == "accept":
if request.POST["action"] == "accept":
self.object.is_moderated = True
self.object.save()
return redirect(reverse('trombi:moderate_comments', kwargs={'trombi_id': self.object.author.trombi.id}) + "?qn_success")
elif request.POST['action'] == "reject":
return super(TrombiModerateCommentView, self).get(request, *args, **kwargs)
elif request.POST['action'] == "delete" and "reason" in request.POST.keys():
return redirect(
reverse(
"trombi:moderate_comments",
kwargs={"trombi_id": self.object.author.trombi.id},
)
+ "?qn_success"
)
elif request.POST["action"] == "reject":
return super(TrombiModerateCommentView, self).get(
request, *args, **kwargs
)
elif request.POST["action"] == "delete" and "reason" in request.POST.keys():
self.object.author.user.email_user(
subject="[%s] %s" % (settings.SITH_NAME, _("Rejected comment")),
message=_("Your comment to %(target)s on the Trombi \"%(trombi)s\" was rejected for the following "
"reason: %(reason)s\n\n"
"Your comment was:\n\n%(content)s"
) % {
'target': self.object.target.user.get_display_name(),
'trombi': self.object.author.trombi,
'reason': request.POST["reason"],
'content': self.object.content,
message=_(
'Your comment to %(target)s on the Trombi "%(trombi)s" was rejected for the following '
"reason: %(reason)s\n\n"
"Your comment was:\n\n%(content)s"
)
% {
"target": self.object.target.user.get_display_name(),
"trombi": self.object.author.trombi,
"reason": request.POST["reason"],
"content": self.object.content,
},
)
self.object.delete()
return redirect(reverse('trombi:moderate_comments', kwargs={'trombi_id': self.object.author.trombi.id}) + "?qn_success")
return redirect(
reverse(
"trombi:moderate_comments",
kwargs={"trombi_id": self.object.author.trombi.id},
)
+ "?qn_success"
)
raise Http404
def get_context_data(self, **kwargs):
kwargs = super(TrombiModerateCommentView, self).get_context_data(**kwargs)
kwargs['form'] = TrombiModerateForm()
kwargs["form"] = TrombiModerateForm()
return kwargs
# User side
class TrombiModelChoiceField(forms.ModelChoiceField):
def label_from_instance(self, obj):
return _("%(name)s (deadline: %(date)s)") % {'name': str(obj), 'date': str(obj.subscription_deadline)}
return _("%(name)s (deadline: %(date)s)") % {
"name": str(obj),
"date": str(obj.subscription_deadline),
}
class UserTrombiForm(forms.Form):
trombi = TrombiModelChoiceField(Trombi.availables.all(), required=False, label=_("Select trombi"),
help_text=_("This allows you to subscribe to a Trombi. "
"Be aware that you can subscribe only once, so don't play with that, "
"or you will expose yourself to the admins' wrath!"))
trombi = TrombiModelChoiceField(
Trombi.availables.all(),
required=False,
label=_("Select trombi"),
help_text=_(
"This allows you to subscribe to a Trombi. "
"Be aware that you can subscribe only once, so don't play with that, "
"or you will expose yourself to the admins' wrath!"
),
)
class UserTrombiToolsView(QuickNotifMixin, TrombiTabsMixin, TemplateView):
"""
Display a user's trombi tools
"""
template_name = "trombi/user_tools.jinja"
current_tab = "tools"
def post(self, request, *args, **kwargs):
self.form = UserTrombiForm(request.POST)
if self.form.is_valid():
trombi_user = TrombiUser(user=request.user,
trombi=self.form.cleaned_data['trombi'])
trombi_user = TrombiUser(
user=request.user, trombi=self.form.cleaned_data["trombi"]
)
trombi_user.save()
self.quick_notif_list += ['qn_success']
self.quick_notif_list += ["qn_success"]
return super(UserTrombiToolsView, self).get(request, *args, **kwargs)
def get_context_data(self, **kwargs):
kwargs = super(UserTrombiToolsView, self).get_context_data(**kwargs)
kwargs['user'] = self.request.user
if not hasattr(self.request.user, 'trombi_user'):
kwargs['subscribe_form'] = UserTrombiForm()
kwargs["user"] = self.request.user
if not hasattr(self.request.user, "trombi_user"):
kwargs["subscribe_form"] = UserTrombiForm()
else:
kwargs['trombi'] = self.request.user.trombi_user.trombi
kwargs['date'] = date
kwargs["trombi"] = self.request.user.trombi_user.trombi
kwargs["date"] = date
return kwargs
class UserTrombiEditPicturesView(TrombiTabsMixin, UpdateView):
model = TrombiUser
fields = ['profile_pict', 'scrub_pict']
fields = ["profile_pict", "scrub_pict"]
template_name = "core/edit.jinja"
current_tab = "pictures"
@ -272,19 +327,27 @@ class UserTrombiEditPicturesView(TrombiTabsMixin, UpdateView):
return self.request.user.trombi_user
def get_success_url(self):
return reverse('trombi:user_tools') + "?qn_success"
return reverse("trombi:user_tools") + "?qn_success"
class UserTrombiEditProfileView(QuickNotifMixin, TrombiTabsMixin, UpdateView):
model = User
form_class = modelform_factory(User,
fields=['second_email', 'phone', 'department', 'dpt_option',
'quote', 'parent_address'],
labels={
'second_email': _("Personal email (not UTBM)"),
'phone': _("Phone"),
'parent_address': _("Native town"),
})
form_class = modelform_factory(
User,
fields=[
"second_email",
"phone",
"department",
"dpt_option",
"quote",
"parent_address",
],
labels={
"second_email": _("Personal email (not UTBM)"),
"phone": _("Phone"),
"parent_address": _("Native town"),
},
)
template_name = "trombi/edit_profile.jinja"
current_tab = "profile"
@ -292,7 +355,7 @@ class UserTrombiEditProfileView(QuickNotifMixin, TrombiTabsMixin, UpdateView):
return self.request.user
def get_success_url(self):
return reverse('trombi:user_tools') + "?qn_success"
return reverse("trombi:user_tools") + "?qn_success"
class UserTrombiResetClubMembershipsView(RedirectView):
@ -304,29 +367,34 @@ class UserTrombiResetClubMembershipsView(RedirectView):
return redirect(self.get_success_url())
def get_success_url(self):
return reverse('trombi:profile') + "?qn_success"
return reverse("trombi:profile") + "?qn_success"
class UserTrombiDeleteMembershipView(TrombiTabsMixin, CanEditMixin, DeleteView):
model = TrombiClubMembership
pk_url_kwarg = "membership_id"
template_name = "core/delete_confirm.jinja"
success_url = reverse_lazy('trombi:profile')
success_url = reverse_lazy("trombi:profile")
current_tab = "profile"
def get_success_url(self):
return super(UserTrombiDeleteMembershipView, self).get_success_url() + "?qn_success"
return (
super(UserTrombiDeleteMembershipView, self).get_success_url()
+ "?qn_success"
)
class UserTrombiEditMembershipView(CanEditMixin, TrombiTabsMixin, UpdateView):
model = TrombiClubMembership
pk_url_kwarg = "membership_id"
fields = ['role', 'start', 'end']
fields = ["role", "start", "end"]
template_name = "core/edit.jinja"
current_tab = "profile"
def get_success_url(self):
return super(UserTrombiEditMembershipView, self).get_success_url() + "?qn_success"
return (
super(UserTrombiEditMembershipView, self).get_success_url() + "?qn_success"
)
class UserTrombiProfileView(TrombiTabsMixin, DetailView):
@ -338,52 +406,69 @@ class UserTrombiProfileView(TrombiTabsMixin, DetailView):
def get(self, request, *args, **kwargs):
self.object = self.get_object()
if (self.object.trombi.id != request.user.trombi_user.trombi.id or
self.object.user.id == request.user.id or
not self.object.trombi.show_profiles):
if (
self.object.trombi.id != request.user.trombi_user.trombi.id
or self.object.user.id == request.user.id
or not self.object.trombi.show_profiles
):
raise Http404()
return super(UserTrombiProfileView, self).get(request, *args, **kwargs)
class TrombiCommentFormView():
class TrombiCommentFormView:
"""
Create/edit a trombi comment
"""
model = TrombiComment
fields = ['content']
template_name = 'trombi/comment.jinja'
fields = ["content"]
template_name = "trombi/comment.jinja"
def get_form_class(self):
self.trombi = self.request.user.trombi_user.trombi
if date.today() <= self.trombi.subscription_deadline:
raise Http404(_("You can not yet write comment, you must wait for "
"the subscription deadline to be passed."))
raise Http404(
_(
"You can not yet write comment, you must wait for "
"the subscription deadline to be passed."
)
)
if self.trombi.comments_deadline < date.today():
raise Http404(_("You can not write comment anymore, the deadline is "
"already passed."))
return modelform_factory(self.model, fields=self.fields,
widgets={
'content': forms.widgets.Textarea(attrs={'maxlength': self.trombi.max_chars})
},
help_texts={
'content': _("Maximum characters: %(max_length)s") % {'max_length': self.trombi.max_chars}
})
raise Http404(
_(
"You can not write comment anymore, the deadline is "
"already passed."
)
)
return modelform_factory(
self.model,
fields=self.fields,
widgets={
"content": forms.widgets.Textarea(
attrs={"maxlength": self.trombi.max_chars}
)
},
help_texts={
"content": _("Maximum characters: %(max_length)s")
% {"max_length": self.trombi.max_chars}
},
)
def get_success_url(self):
return reverse('trombi:user_tools') + "?qn_success"
return reverse("trombi:user_tools") + "?qn_success"
def get_context_data(self, **kwargs):
kwargs = super(TrombiCommentFormView, self).get_context_data(**kwargs)
if 'user_id' in self.kwargs.keys():
kwargs['target'] = get_object_or_404(TrombiUser, id=self.kwargs['user_id'])
if "user_id" in self.kwargs.keys():
kwargs["target"] = get_object_or_404(TrombiUser, id=self.kwargs["user_id"])
else:
kwargs['target'] = self.object.target
kwargs["target"] = self.object.target
return kwargs
class TrombiCommentCreateView(TrombiCommentFormView, CreateView):
def form_valid(self, form):
target = get_object_or_404(TrombiUser, id=self.kwargs['user_id'])
target = get_object_or_404(TrombiUser, id=self.kwargs["user_id"])
author = self.request.user.trombi_user
form.instance.author = author
form.instance.target = target