klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trombi: fix some 500 errors when accessing page without being in a trombi

This commit is contained in:
Antoine Bartuccio 2019-09-29 12:09:03 +02:00
parent b7db969f08
commit fcb3035b67
Signed by: klmp200
GPG Key ID: E7245548C53F904B
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trombi/templates/trombi/edit_profile.jinja
View File

@ -40,5 +40,3 @@
</table> </table>
{% endblock %} {% endblock %}

52
trombi/views.py
View File

@ -25,7 +25,7 @@
from django.http import Http404, HttpResponseRedirect from django.http import Http404, HttpResponseRedirect
from django.shortcuts import get_object_or_404, redirect from django.shortcuts import get_object_or_404, redirect
from django.core.urlresolvers import reverse_lazy, reverse from django.core.urlresolvers import reverse_lazy, reverse
from django.views.generic import DetailView, RedirectView, TemplateView from django.views.generic import DetailView, RedirectView, TemplateView, View
from django.views.generic.edit import UpdateView, CreateView, DeleteView from django.views.generic.edit import UpdateView, CreateView, DeleteView
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django import forms from django import forms
@ -59,20 +59,21 @@ class TrombiTabsMixin(TabedViewMixin):
tab_list.append( tab_list.append(
{"url": reverse("trombi:user_tools"), "slug": "tools", "name": _("Tools")} {"url": reverse("trombi:user_tools"), "slug": "tools", "name": _("Tools")}
) )
tab_list.append( if hasattr(self.request.user, "trombi_user"):
{ tab_list.append(
"url": reverse("trombi:profile"), {
"slug": "profile", "url": reverse("trombi:profile"),
"name": _("My profile"), "slug": "profile",
} "name": _("My profile"),
) }
tab_list.append( )
{ tab_list.append(
"url": reverse("trombi:pictures"), {
"slug": "pictures", "url": reverse("trombi:pictures"),
"name": _("My pictures"), "slug": "pictures",
} "name": _("My pictures"),
) }
)
try: try:
trombi = self.request.user.trombi_user.trombi trombi = self.request.user.trombi_user.trombi
if self.request.user.is_owner(trombi): if self.request.user.is_owner(trombi):
@ -90,6 +91,19 @@ class TrombiTabsMixin(TabedViewMixin):
return tab_list return tab_list
class UserIsInATrombiMixin(View):
"""
This view check if the requested user has a trombi_user attribute
"""
def dispatch(self, request, *args, **kwargs):
if not hasattr(self.request.user, "trombi_user"):
raise Http404()
return super(UserIsInATrombiMixin, self).dispatch(request, *args, **kwargs)
class TrombiForm(forms.ModelForm): class TrombiForm(forms.ModelForm):
class Meta: class Meta:
model = Trombi model = Trombi
@ -317,7 +331,7 @@ class UserTrombiToolsView(QuickNotifMixin, TrombiTabsMixin, TemplateView):
return kwargs return kwargs
class UserTrombiEditPicturesView(TrombiTabsMixin, UpdateView): class UserTrombiEditPicturesView(TrombiTabsMixin, UserIsInATrombiMixin, UpdateView):
model = TrombiUser model = TrombiUser
fields = ["profile_pict", "scrub_pict"] fields = ["profile_pict", "scrub_pict"]
template_name = "core/edit.jinja" template_name = "core/edit.jinja"
@ -330,7 +344,9 @@ class UserTrombiEditPicturesView(TrombiTabsMixin, UpdateView):
return reverse("trombi:user_tools") + "?qn_success" return reverse("trombi:user_tools") + "?qn_success"
class UserTrombiEditProfileView(QuickNotifMixin, TrombiTabsMixin, UpdateView): class UserTrombiEditProfileView(
QuickNotifMixin, TrombiTabsMixin, UserIsInATrombiMixin, UpdateView
):
model = User model = User
form_class = modelform_factory( form_class = modelform_factory(
User, User,
@ -358,7 +374,7 @@ class UserTrombiEditProfileView(QuickNotifMixin, TrombiTabsMixin, UpdateView):
return reverse("trombi:user_tools") + "?qn_success" return reverse("trombi:user_tools") + "?qn_success"
class UserTrombiResetClubMembershipsView(RedirectView): class UserTrombiResetClubMembershipsView(UserIsInATrombiMixin, RedirectView):
permanent = False permanent = False
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):